diff --git a/CONN_Degson.SchLib b/CONN_Degson.SchLib index d6e16f8..91a1ed0 100644 Binary files a/CONN_Degson.SchLib and b/CONN_Degson.SchLib differ diff --git a/Controller.SchDoc b/Controller.SchDoc index 9cdc499..1370e6e 100644 Binary files a/Controller.SchDoc and b/Controller.SchDoc differ diff --git a/Controller.ioc b/Controller.ioc index 29dbc3c..1a132f7 100644 --- a/Controller.ioc +++ b/Controller.ioc @@ -37,62 +37,64 @@ Mcu.Pin15=PA6 Mcu.Pin16=PA7 Mcu.Pin17=PC4 Mcu.Pin18=PC5 -Mcu.Pin19=PE8 +Mcu.Pin19=PE7 Mcu.Pin2=PE4 -Mcu.Pin20=PE9 -Mcu.Pin21=PE10 -Mcu.Pin22=PE11 -Mcu.Pin23=PE12 -Mcu.Pin24=PE13 -Mcu.Pin25=PE14 -Mcu.Pin26=PB12 -Mcu.Pin27=PB13 -Mcu.Pin28=PB14 -Mcu.Pin29=PB15 +Mcu.Pin20=PE8 +Mcu.Pin21=PE9 +Mcu.Pin22=PE10 +Mcu.Pin23=PE11 +Mcu.Pin24=PE12 +Mcu.Pin25=PE13 +Mcu.Pin26=PE14 +Mcu.Pin27=PB12 +Mcu.Pin28=PB13 +Mcu.Pin29=PB14 Mcu.Pin3=PE5 -Mcu.Pin30=PD8 -Mcu.Pin31=PD9 -Mcu.Pin32=PD12 -Mcu.Pin33=PD13 -Mcu.Pin34=PC7 -Mcu.Pin35=PA11 -Mcu.Pin36=PA12 -Mcu.Pin37=PA13 -Mcu.Pin38=PA14 -Mcu.Pin39=PC10 +Mcu.Pin30=PB15 +Mcu.Pin31=PD8 +Mcu.Pin32=PD9 +Mcu.Pin33=PD12 +Mcu.Pin34=PD13 +Mcu.Pin35=PC7 +Mcu.Pin36=PA10 +Mcu.Pin37=PA11 +Mcu.Pin38=PA12 +Mcu.Pin39=PA13 Mcu.Pin4=PE6 -Mcu.Pin40=PC11 -Mcu.Pin41=PC12 -Mcu.Pin42=PD4 -Mcu.Pin43=PD6 -Mcu.Pin44=PD7 -Mcu.Pin45=PB3 -Mcu.Pin46=PB4 -Mcu.Pin47=PB5 -Mcu.Pin48=PB7 -Mcu.Pin49=PB8 +Mcu.Pin40=PA14 +Mcu.Pin41=PC10 +Mcu.Pin42=PC11 +Mcu.Pin43=PC12 +Mcu.Pin44=PD4 +Mcu.Pin45=PD6 +Mcu.Pin46=PD7 +Mcu.Pin47=PB3 +Mcu.Pin48=PB4 +Mcu.Pin49=PB5 Mcu.Pin5=PC13 -Mcu.Pin50=PB9 -Mcu.Pin51=PE0 -Mcu.Pin52=PE1 -Mcu.Pin53=VP_FREERTOS_VS_CMSIS_V2 -Mcu.Pin54=VP_IWDG_VS_IWDG -Mcu.Pin55=VP_SYS_VS_tim7 -Mcu.Pin56=VP_TIM1_VS_OPM -Mcu.Pin57=VP_TIM6_VS_ClockSourceINT -Mcu.Pin58=VP_TIM8_VS_OPM -Mcu.Pin59=VP_TIM15_VS_OPM +Mcu.Pin50=PB7 +Mcu.Pin51=PB8 +Mcu.Pin52=PB9 +Mcu.Pin53=PE0 +Mcu.Pin54=PE1 +Mcu.Pin55=VP_FREERTOS_VS_CMSIS_V2 +Mcu.Pin56=VP_IWDG_VS_IWDG +Mcu.Pin57=VP_SYS_VS_tim7 +Mcu.Pin58=VP_TIM1_VS_OPM +Mcu.Pin59=VP_TIM6_VS_ClockSourceINT Mcu.Pin6=PC14-OSC32_IN -Mcu.Pin60=VP_TIM16_VS_ClockSourceINT -Mcu.Pin61=VP_TIM16_VS_OPM -Mcu.Pin62=VP_TIM17_VS_ClockSourceINT -Mcu.Pin63=VP_TIM17_VS_OPM -Mcu.Pin64=VP_TIM20_VS_OPM -Mcu.Pin65=VP_USB_DEVICE_VS_USB_DEVICE_CUSTOM_HID_FS +Mcu.Pin60=VP_TIM8_VS_OPM +Mcu.Pin61=VP_TIM15_VS_OPM +Mcu.Pin62=VP_TIM16_VS_ClockSourceINT +Mcu.Pin63=VP_TIM16_VS_OPM +Mcu.Pin64=VP_TIM17_VS_ClockSourceINT +Mcu.Pin65=VP_TIM17_VS_OPM +Mcu.Pin66=VP_TIM20_VS_OPM +Mcu.Pin67=VP_USB_DEVICE_VS_USB_DEVICE_CUSTOM_HID_FS Mcu.Pin7=PC15-OSC32_OUT Mcu.Pin8=PF9 Mcu.Pin9=PF0-OSC_IN -Mcu.PinsNb=66 +Mcu.PinsNb=68 Mcu.ThirdPartyNb=0 Mcu.UserConstants= Mcu.UserName=STM32F303VDTx @@ -117,6 +119,10 @@ PA0.GPIOParameters=GPIO_Label PA0.GPIO_Label=SPINDLE PA0.Locked=true PA0.Signal=S_TIM2_CH1_ETR +PA10.GPIOParameters=GPIO_Label +PA10.GPIO_Label=USB_EN +PA10.Locked=true +PA10.Signal=GPIO_Output PA11.Locked=true PA11.Mode=Device PA11.Signal=USB_DM @@ -299,6 +305,10 @@ PE6.GPIOParameters=GPIO_Label PE6.GPIO_Label=ESTOP PE6.Locked=true PE6.Signal=GPXTI6 +PE7.GPIOParameters=GPIO_Label +PE7.GPIO_Label=SPIN_EN +PE7.Locked=true +PE7.Signal=GPIO_Output PE8.GPIOParameters=GPIO_Label PE8.GPIO_Label=STEP_EN PE8.Locked=true diff --git a/DisysCNC.Annotation b/DisysCNC.Annotation index 5285511..d9b88f1 100644 --- a/DisysCNC.Annotation +++ b/DisysCNC.Annotation @@ -1,5 +1,5 @@ [DesignatorManager] -LogicalDesignator0=R7 +LogicalDesignator0=R10 LogicalPartID0=1 DocumentName0=Connector_out.SchDoc ChannelName0=Designator @@ -13,14 +13,14 @@ ChannelName1=Opto_isolator_OUTPUT10 UniqueID1=\BPXYAMLZ\EZFBFANN\KWLMOYXQ PhysicalDesignator1=OK21 PhysicalDesignatorLocked1=0 -LogicalDesignator2=R11 +LogicalDesignator2=R14 LogicalPartID2=1 DocumentName2=Opto_isolator_OUTPUT.SchDoc ChannelName2=Opto_isolator_OUTPUT10 UniqueID2=\BPXYAMLZ\EZFBFANN\PUNIQLKF PhysicalDesignator2=R51 PhysicalDesignatorLocked2=0 -LogicalDesignator3=R12 +LogicalDesignator3=R15 LogicalPartID3=1 DocumentName3=Opto_isolator_OUTPUT.SchDoc ChannelName3=Opto_isolator_OUTPUT10 @@ -34,14 +34,14 @@ ChannelName4=Opto_isolator_OUTPUT3 UniqueID4=\BPXYAMLZ\IZSHSRRX\KWLMOYXQ PhysicalDesignator4=OK10 PhysicalDesignatorLocked4=0 -LogicalDesignator5=R11 +LogicalDesignator5=R14 LogicalPartID5=1 DocumentName5=Opto_isolator_OUTPUT.SchDoc ChannelName5=Opto_isolator_OUTPUT3 UniqueID5=\BPXYAMLZ\IZSHSRRX\PUNIQLKF PhysicalDesignator5=R27 PhysicalDesignatorLocked5=0 -LogicalDesignator6=R12 +LogicalDesignator6=R15 LogicalPartID6=1 DocumentName6=Opto_isolator_OUTPUT.SchDoc ChannelName6=Opto_isolator_OUTPUT3 @@ -55,28 +55,28 @@ ChannelName7=Opto_isolator_OUTPUT6 UniqueID7=\BPXYAMLZ\KFXCXOSQ\KWLMOYXQ PhysicalDesignator7=OK13 PhysicalDesignatorLocked7=0 -LogicalDesignator8=R11 +LogicalDesignator8=R14 LogicalPartID8=1 DocumentName8=Opto_isolator_OUTPUT.SchDoc ChannelName8=Opto_isolator_OUTPUT6 UniqueID8=\BPXYAMLZ\KFXCXOSQ\PUNIQLKF PhysicalDesignator8=R33 PhysicalDesignatorLocked8=0 -LogicalDesignator9=R12 +LogicalDesignator9=R15 LogicalPartID9=1 DocumentName9=Opto_isolator_OUTPUT.SchDoc ChannelName9=Opto_isolator_OUTPUT6 UniqueID9=\BPXYAMLZ\KFXCXOSQ\UOYEJCPY PhysicalDesignator9=R34 PhysicalDesignatorLocked9=0 -LogicalDesignator10=U7 +LogicalDesignator10=U9 LogicalPartID10=1 DocumentName10=Connector_out.SchDoc ChannelName10=Designator UniqueID10=\BPXYAMLZ\LJOPPVEU PhysicalDesignator10=U1 PhysicalDesignatorLocked10=0 -LogicalDesignator11=R8 +LogicalDesignator11=R11 LogicalPartID11=1 DocumentName11=Connector_out.SchDoc ChannelName11=Designator @@ -90,7 +90,7 @@ ChannelName12=Designator UniqueID12=\BPXYAMLZ\NDFQYYHL PhysicalDesignator12=C1 PhysicalDesignatorLocked12=0 -LogicalDesignator13=R10 +LogicalDesignator13=R13 LogicalPartID13=1 DocumentName13=Opto_isolator_INPUT.SchDoc ChannelName13=Opto_isolator_INPUT11 @@ -104,7 +104,7 @@ ChannelName14=Opto_isolator_INPUT11 UniqueID14=\BPXYAMLZ\NZNMVOSA\XNDBZCEP PhysicalDesignator14=OK8 PhysicalDesignatorLocked14=0 -LogicalDesignator15=R9 +LogicalDesignator15=R12 LogicalPartID15=1 DocumentName15=Opto_isolator_INPUT.SchDoc ChannelName15=Opto_isolator_INPUT11 @@ -118,14 +118,14 @@ ChannelName16=Opto_isolator_OUTPUT4 UniqueID16=\BPXYAMLZ\OIPOXSGF\KWLMOYXQ PhysicalDesignator16=OK11 PhysicalDesignatorLocked16=0 -LogicalDesignator17=R11 +LogicalDesignator17=R14 LogicalPartID17=1 DocumentName17=Opto_isolator_OUTPUT.SchDoc ChannelName17=Opto_isolator_OUTPUT4 UniqueID17=\BPXYAMLZ\OIPOXSGF\PUNIQLKF PhysicalDesignator17=R29 PhysicalDesignatorLocked17=0 -LogicalDesignator18=R12 +LogicalDesignator18=R15 LogicalPartID18=1 DocumentName18=Opto_isolator_OUTPUT.SchDoc ChannelName18=Opto_isolator_OUTPUT4 @@ -139,28 +139,28 @@ ChannelName19=Opto_isolator_OUTPUT5 UniqueID19=\BPXYAMLZ\PESAFFAA\KWLMOYXQ PhysicalDesignator19=OK12 PhysicalDesignatorLocked19=0 -LogicalDesignator20=R11 +LogicalDesignator20=R14 LogicalPartID20=1 DocumentName20=Opto_isolator_OUTPUT.SchDoc ChannelName20=Opto_isolator_OUTPUT5 UniqueID20=\BPXYAMLZ\PESAFFAA\PUNIQLKF PhysicalDesignator20=R31 PhysicalDesignatorLocked20=0 -LogicalDesignator21=R12 +LogicalDesignator21=R15 LogicalPartID21=1 DocumentName21=Opto_isolator_OUTPUT.SchDoc ChannelName21=Opto_isolator_OUTPUT5 UniqueID21=\BPXYAMLZ\PESAFFAA\UOYEJCPY PhysicalDesignator21=R32 PhysicalDesignatorLocked21=0 -LogicalDesignator22=P7 +LogicalDesignator22=P6 LogicalPartID22=1 DocumentName22=Connector_out.SchDoc ChannelName22=Designator UniqueID22=\BPXYAMLZ\POYLHFMM PhysicalDesignator22=P2 PhysicalDesignatorLocked22=0 -LogicalDesignator23=P1 +LogicalDesignator23=P7 LogicalPartID23=1 DocumentName23=Connector_out.SchDoc ChannelName23=Designator @@ -174,14 +174,14 @@ ChannelName24=Opto_isolator_OUTPUT2 UniqueID24=\BPXYAMLZ\QIQMTRNL\KWLMOYXQ PhysicalDesignator24=OK9 PhysicalDesignatorLocked24=0 -LogicalDesignator25=R11 +LogicalDesignator25=R14 LogicalPartID25=1 DocumentName25=Opto_isolator_OUTPUT.SchDoc ChannelName25=Opto_isolator_OUTPUT2 UniqueID25=\BPXYAMLZ\QIQMTRNL\PUNIQLKF PhysicalDesignator25=R25 PhysicalDesignatorLocked25=0 -LogicalDesignator26=R12 +LogicalDesignator26=R15 LogicalPartID26=1 DocumentName26=Opto_isolator_OUTPUT.SchDoc ChannelName26=Opto_isolator_OUTPUT2 @@ -195,21 +195,21 @@ ChannelName27=Opto_isolator_OUTPUT8 UniqueID27=\BPXYAMLZ\SJLJUKOH\KWLMOYXQ PhysicalDesignator27=OK19 PhysicalDesignatorLocked27=0 -LogicalDesignator28=R11 +LogicalDesignator28=R14 LogicalPartID28=1 DocumentName28=Opto_isolator_OUTPUT.SchDoc ChannelName28=Opto_isolator_OUTPUT8 UniqueID28=\BPXYAMLZ\SJLJUKOH\PUNIQLKF PhysicalDesignator28=R47 PhysicalDesignatorLocked28=0 -LogicalDesignator29=R12 +LogicalDesignator29=R15 LogicalPartID29=1 DocumentName29=Opto_isolator_OUTPUT.SchDoc ChannelName29=Opto_isolator_OUTPUT8 UniqueID29=\BPXYAMLZ\SJLJUKOH\UOYEJCPY PhysicalDesignator29=R48 PhysicalDesignatorLocked29=0 -LogicalDesignator30=R6 +LogicalDesignator30=R9 LogicalPartID30=1 DocumentName30=Connector_out.SchDoc ChannelName30=Designator @@ -223,21 +223,21 @@ ChannelName31=Opto_isolator_OUTPUT9 UniqueID31=\BPXYAMLZ\XTKUGUHT\KWLMOYXQ PhysicalDesignator31=OK20 PhysicalDesignatorLocked31=0 -LogicalDesignator32=R11 +LogicalDesignator32=R14 LogicalPartID32=1 DocumentName32=Opto_isolator_OUTPUT.SchDoc ChannelName32=Opto_isolator_OUTPUT9 UniqueID32=\BPXYAMLZ\XTKUGUHT\PUNIQLKF PhysicalDesignator32=R49 PhysicalDesignatorLocked32=0 -LogicalDesignator33=R12 +LogicalDesignator33=R15 LogicalPartID33=1 DocumentName33=Opto_isolator_OUTPUT.SchDoc ChannelName33=Opto_isolator_OUTPUT9 UniqueID33=\BPXYAMLZ\XTKUGUHT\UOYEJCPY PhysicalDesignator33=R50 PhysicalDesignatorLocked33=0 -LogicalDesignator34=P6 +LogicalDesignator34=P5 LogicalPartID34=1 DocumentName34=Connector_out.SchDoc ChannelName34=Designator @@ -251,14 +251,14 @@ ChannelName35=Opto_isolator_OUTPUT7 UniqueID35=\BPXYAMLZ\ZCPQGHVN\KWLMOYXQ PhysicalDesignator35=OK18 PhysicalDesignatorLocked35=0 -LogicalDesignator36=R11 +LogicalDesignator36=R14 LogicalPartID36=1 DocumentName36=Opto_isolator_OUTPUT.SchDoc ChannelName36=Opto_isolator_OUTPUT7 UniqueID36=\BPXYAMLZ\ZCPQGHVN\PUNIQLKF PhysicalDesignator36=R45 PhysicalDesignatorLocked36=0 -LogicalDesignator37=R12 +LogicalDesignator37=R15 LogicalPartID37=1 DocumentName37=Opto_isolator_OUTPUT.SchDoc ChannelName37=Opto_isolator_OUTPUT7 @@ -286,14 +286,14 @@ ChannelName40=Designator UniqueID40=\CSNUPCDW\BEDHFLEM PhysicalDesignator40=L2 PhysicalDesignatorLocked40=0 -LogicalDesignator41=R5 +LogicalDesignator41=R8 LogicalPartID41=1 DocumentName41=Power.SchDoc ChannelName41=Designator UniqueID41=\CSNUPCDW\BZMRBJBP PhysicalDesignator41=R36 PhysicalDesignatorLocked41=0 -LogicalDesignator42=U4 +LogicalDesignator42=U6 LogicalPartID42=1 DocumentName42=Power.SchDoc ChannelName42=Designator @@ -321,7 +321,7 @@ ChannelName45=Designator UniqueID45=\CSNUPCDW\EKTZLEYG PhysicalDesignator45=D3 PhysicalDesignatorLocked45=0 -LogicalDesignator46=U6 +LogicalDesignator46=U8 LogicalPartID46=1 DocumentName46=Power.SchDoc ChannelName46=Designator @@ -356,7 +356,7 @@ ChannelName50=Designator UniqueID50=\CSNUPCDW\KDRNVQHD PhysicalDesignator50=C24 PhysicalDesignatorLocked50=0 -LogicalDesignator51=U3 +LogicalDesignator51=U5 LogicalPartID51=1 DocumentName51=Power.SchDoc ChannelName51=Designator @@ -391,7 +391,7 @@ ChannelName55=Designator UniqueID55=\CSNUPCDW\RPCZILXG PhysicalDesignator55=TF1 PhysicalDesignatorLocked55=0 -LogicalDesignator56=R4 +LogicalDesignator56=R7 LogicalPartID56=1 DocumentName56=Power.SchDoc ChannelName56=Designator @@ -405,7 +405,7 @@ ChannelName57=Designator UniqueID57=\CSNUPCDW\TGRVKOGH PhysicalDesignator57=D2 PhysicalDesignatorLocked57=0 -LogicalDesignator58=U5 +LogicalDesignator58=U7 LogicalPartID58=1 DocumentName58=Power.SchDoc ChannelName58=Designator @@ -440,14 +440,14 @@ ChannelName62=Designator UniqueID62=\CSNUPCDW\YHOPFQTF PhysicalDesignator62=C21 PhysicalDesignatorLocked62=0 -LogicalDesignator63=P5 +LogicalDesignator63=P4 LogicalPartID63=1 DocumentName63=Power.SchDoc ChannelName63=Designator UniqueID63=\CSNUPCDW\YOYVYQSY PhysicalDesignator63=P16 PhysicalDesignatorLocked63=0 -LogicalDesignator64=R10 +LogicalDesignator64=R13 LogicalPartID64=1 DocumentName64=Opto_isolator_INPUT.SchDoc ChannelName64=Opto_isolator_INPUT2 @@ -461,14 +461,14 @@ ChannelName65=Opto_isolator_INPUT2 UniqueID65=\JANKFIMP\CKHULMWR\XNDBZCEP PhysicalDesignator65=OK2 PhysicalDesignatorLocked65=0 -LogicalDesignator66=R9 +LogicalDesignator66=R12 LogicalPartID66=1 DocumentName66=Opto_isolator_INPUT.SchDoc ChannelName66=Opto_isolator_INPUT2 UniqueID66=\JANKFIMP\CKHULMWR\ZTYPGICR PhysicalDesignator66=R11 PhysicalDesignatorLocked66=0 -LogicalDesignator67=R10 +LogicalDesignator67=R13 LogicalPartID67=1 DocumentName67=Opto_isolator_INPUT.SchDoc ChannelName67=Opto_isolator_INPUT6 @@ -482,14 +482,14 @@ ChannelName68=Opto_isolator_INPUT6 UniqueID68=\JANKFIMP\CNMDFGEL\XNDBZCEP PhysicalDesignator68=OK6 PhysicalDesignatorLocked68=0 -LogicalDesignator69=R9 +LogicalDesignator69=R12 LogicalPartID69=1 DocumentName69=Opto_isolator_INPUT.SchDoc ChannelName69=Opto_isolator_INPUT6 UniqueID69=\JANKFIMP\CNMDFGEL\ZTYPGICR PhysicalDesignator69=R19 PhysicalDesignatorLocked69=0 -LogicalDesignator70=R10 +LogicalDesignator70=R13 LogicalPartID70=1 DocumentName70=Opto_isolator_INPUT.SchDoc ChannelName70=Opto_isolator_INPUT3 @@ -503,21 +503,21 @@ ChannelName71=Opto_isolator_INPUT3 UniqueID71=\JANKFIMP\COGFWRKA\XNDBZCEP PhysicalDesignator71=OK3 PhysicalDesignatorLocked71=0 -LogicalDesignator72=R9 +LogicalDesignator72=R12 LogicalPartID72=1 DocumentName72=Opto_isolator_INPUT.SchDoc ChannelName72=Opto_isolator_INPUT3 UniqueID72=\JANKFIMP\COGFWRKA\ZTYPGICR PhysicalDesignator72=R13 PhysicalDesignatorLocked72=0 -LogicalDesignator73=R14 +LogicalDesignator73=R17 LogicalPartID73=1 DocumentName73=Connector_sensor.SchDoc ChannelName73=Designator UniqueID73=\JANKFIMP\CRQCUVRO PhysicalDesignator73=R5 PhysicalDesignatorLocked73=0 -LogicalDesignator74=R10 +LogicalDesignator74=R13 LogicalPartID74=1 DocumentName74=Opto_isolator_INPUT.SchDoc ChannelName74=Opto_isolator_INPUT8 @@ -531,7 +531,7 @@ ChannelName75=Opto_isolator_INPUT8 UniqueID75=\JANKFIMP\GXVLWJSB\XNDBZCEP PhysicalDesignator75=OK14 PhysicalDesignatorLocked75=0 -LogicalDesignator76=R9 +LogicalDesignator76=R12 LogicalPartID76=1 DocumentName76=Opto_isolator_INPUT.SchDoc ChannelName76=Opto_isolator_INPUT8 @@ -552,7 +552,7 @@ ChannelName78=Designator UniqueID78=\JANKFIMP\HPCUVHVH PhysicalDesignator78=P7 PhysicalDesignatorLocked78=0 -LogicalDesignator79=R10 +LogicalDesignator79=R13 LogicalPartID79=1 DocumentName79=Opto_isolator_INPUT.SchDoc ChannelName79=Opto_isolator_INPUT5 @@ -566,14 +566,14 @@ ChannelName80=Opto_isolator_INPUT5 UniqueID80=\JANKFIMP\NAIFGAPM\XNDBZCEP PhysicalDesignator80=OK5 PhysicalDesignatorLocked80=0 -LogicalDesignator81=R9 +LogicalDesignator81=R12 LogicalPartID81=1 DocumentName81=Opto_isolator_INPUT.SchDoc ChannelName81=Opto_isolator_INPUT5 UniqueID81=\JANKFIMP\NAIFGAPM\ZTYPGICR PhysicalDesignator81=R17 PhysicalDesignatorLocked81=0 -LogicalDesignator82=R10 +LogicalDesignator82=R13 LogicalPartID82=1 DocumentName82=Opto_isolator_INPUT.SchDoc ChannelName82=Opto_isolator_INPUT7 @@ -587,7 +587,7 @@ ChannelName83=Opto_isolator_INPUT7 UniqueID83=\JANKFIMP\QFLYQMAS\XNDBZCEP PhysicalDesignator83=OK7 PhysicalDesignatorLocked83=0 -LogicalDesignator84=R9 +LogicalDesignator84=R12 LogicalPartID84=1 DocumentName84=Opto_isolator_INPUT.SchDoc ChannelName84=Opto_isolator_INPUT7 @@ -601,7 +601,7 @@ ChannelName85=Designator UniqueID85=\JANKFIMP\VHSEBPGZ PhysicalDesignator85=P6 PhysicalDesignatorLocked85=0 -LogicalDesignator86=R10 +LogicalDesignator86=R13 LogicalPartID86=1 DocumentName86=Opto_isolator_INPUT.SchDoc ChannelName86=Opto_isolator_INPUT4 @@ -615,14 +615,14 @@ ChannelName87=Opto_isolator_INPUT4 UniqueID87=\JANKFIMP\WICSGKDS\XNDBZCEP PhysicalDesignator87=OK4 PhysicalDesignatorLocked87=0 -LogicalDesignator88=R9 +LogicalDesignator88=R12 LogicalPartID88=1 DocumentName88=Opto_isolator_INPUT.SchDoc ChannelName88=Opto_isolator_INPUT4 UniqueID88=\JANKFIMP\WICSGKDS\ZTYPGICR PhysicalDesignator88=R15 PhysicalDesignatorLocked88=0 -LogicalDesignator89=R10 +LogicalDesignator89=R13 LogicalPartID89=1 DocumentName89=Opto_isolator_INPUT.SchDoc ChannelName89=Opto_isolator_INPUT12 @@ -636,42 +636,42 @@ ChannelName90=Opto_isolator_INPUT12 UniqueID90=\JANKFIMP\XHEDVTGS\XNDBZCEP PhysicalDesignator90=OK1 PhysicalDesignatorLocked90=0 -LogicalDesignator91=R9 +LogicalDesignator91=R12 LogicalPartID91=1 DocumentName91=Opto_isolator_INPUT.SchDoc ChannelName91=Opto_isolator_INPUT12 UniqueID91=\JANKFIMP\XHEDVTGS\ZTYPGICR PhysicalDesignator91=R9 PhysicalDesignatorLocked91=0 -LogicalDesignator92=R13 +LogicalDesignator92=R16 LogicalPartID92=1 DocumentName92=Connector_sensor.SchDoc ChannelName92=Designator UniqueID92=\JANKFIMP\YFYNBMFB PhysicalDesignator92=R4 PhysicalDesignatorLocked92=0 -LogicalDesignator93=C6 +LogicalDesignator93=C2 LogicalPartID93=1 DocumentName93=Controller.SchDoc ChannelName93=Designator UniqueID93=\PCYNFSRK\BITWGHQO PhysicalDesignator93=C7 PhysicalDesignatorLocked93=0 -LogicalDesignator94=C15 +LogicalDesignator94=C13 LogicalPartID94=1 DocumentName94=Controller.SchDoc ChannelName94=Designator UniqueID94=\PCYNFSRK\BLHBSATK PhysicalDesignator94=C16 PhysicalDesignatorLocked94=0 -LogicalDesignator95=P2 +LogicalDesignator95=P1 LogicalPartID95=1 DocumentName95=Controller.SchDoc ChannelName95=Designator UniqueID95=\PCYNFSRK\BNBALDVA PhysicalDesignator95=P13 PhysicalDesignatorLocked95=0 -LogicalDesignator96=C7 +LogicalDesignator96=C8 LogicalPartID96=1 DocumentName96=Controller.SchDoc ChannelName96=Designator @@ -692,21 +692,21 @@ ChannelName98=Designator UniqueID98=\PCYNFSRK\CEAMMSEK PhysicalDesignator98=LD1 PhysicalDesignatorLocked98=0 -LogicalDesignator99=C14 +LogicalDesignator99=C12 LogicalPartID99=1 DocumentName99=Controller.SchDoc ChannelName99=Designator UniqueID99=\PCYNFSRK\CNAABKCR PhysicalDesignator99=C15 PhysicalDesignatorLocked99=0 -LogicalDesignator100=U11 +LogicalDesignator100=U3 LogicalPartID100=1 DocumentName100=Controller.SchDoc ChannelName100=Designator UniqueID100=\PCYNFSRK\CXVIPDRK PhysicalDesignator100=U11 PhysicalDesignatorLocked100=0 -LogicalDesignator101=C5 +LogicalDesignator101=C7 LogicalPartID101=1 DocumentName101=Controller.SchDoc ChannelName101=Designator @@ -720,42 +720,42 @@ ChannelName102=Designator UniqueID102=\PCYNFSRK\FVYDMLGR PhysicalDesignator102=Y1 PhysicalDesignatorLocked102=0 -LogicalDesignator103=C13 +LogicalDesignator103=C10 LogicalPartID103=1 DocumentName103=Controller.SchDoc ChannelName103=Designator UniqueID103=\PCYNFSRK\KTVECPTV PhysicalDesignator103=C14 PhysicalDesignatorLocked103=0 -LogicalDesignator104=C12 +LogicalDesignator104=C16 LogicalPartID104=1 DocumentName104=Controller.SchDoc ChannelName104=Designator UniqueID104=\PCYNFSRK\MGDCNHCY PhysicalDesignator104=C13 PhysicalDesignatorLocked104=0 -LogicalDesignator105=C16 +LogicalDesignator105=C15 LogicalPartID105=1 DocumentName105=Controller.SchDoc ChannelName105=Designator UniqueID105=\PCYNFSRK\MSPGQLUM PhysicalDesignator105=C17 PhysicalDesignatorLocked105=0 -LogicalDesignator106=C10 +LogicalDesignator106=C5 LogicalPartID106=1 DocumentName106=Controller.SchDoc ChannelName106=Designator UniqueID106=\PCYNFSRK\MUISPKMG PhysicalDesignator106=C11 PhysicalDesignatorLocked106=0 -LogicalDesignator107=C1 +LogicalDesignator107=C3 LogicalPartID107=1 DocumentName107=Controller.SchDoc ChannelName107=Designator UniqueID107=\PCYNFSRK\MYHPXGEU PhysicalDesignator107=C2 PhysicalDesignatorLocked107=0 -LogicalDesignator108=C4 +LogicalDesignator108=C6 LogicalPartID108=1 DocumentName108=Controller.SchDoc ChannelName108=Designator @@ -783,35 +783,35 @@ ChannelName111=Designator UniqueID111=\PCYNFSRK\OZWPFWPA PhysicalDesignator111=LD2 PhysicalDesignatorLocked111=0 -LogicalDesignator112=C9 +LogicalDesignator112=C11 LogicalPartID112=1 DocumentName112=Controller.SchDoc ChannelName112=Designator UniqueID112=\PCYNFSRK\PVQEUNGM PhysicalDesignator112=C10 PhysicalDesignatorLocked112=0 -LogicalDesignator113=R17 +LogicalDesignator113=R5 LogicalPartID113=1 DocumentName113=Controller.SchDoc ChannelName113=Designator UniqueID113=\PCYNFSRK\QCAEFZLP PhysicalDesignator113=R41 PhysicalDesignatorLocked113=0 -LogicalDesignator114=P3 +LogicalDesignator114=P2 LogicalPartID114=1 DocumentName114=Controller.SchDoc ChannelName114=Designator UniqueID114=\PCYNFSRK\QINHTCMS PhysicalDesignator114=P14 PhysicalDesignatorLocked114=0 -LogicalDesignator115=R16 +LogicalDesignator115=R4 LogicalPartID115=1 DocumentName115=Controller.SchDoc ChannelName115=Designator UniqueID115=\PCYNFSRK\QJXADSII PhysicalDesignator115=R40 PhysicalDesignatorLocked115=0 -LogicalDesignator116=R15 +LogicalDesignator116=R2 LogicalPartID116=1 DocumentName116=Controller.SchDoc ChannelName116=Designator @@ -832,125 +832,139 @@ ChannelName118=Designator UniqueID118=\PCYNFSRK\TNYIAXZH PhysicalDesignator118=U5 PhysicalDesignatorLocked118=0 -LogicalDesignator119=C8 +LogicalDesignator119=C9 LogicalPartID119=1 DocumentName119=Controller.SchDoc ChannelName119=Designator UniqueID119=\PCYNFSRK\UADFUYWT PhysicalDesignator119=C9 PhysicalDesignatorLocked119=0 -LogicalDesignator120=C11 +LogicalDesignator120=C14 LogicalPartID120=1 DocumentName120=Controller.SchDoc ChannelName120=Designator UniqueID120=\PCYNFSRK\USYDFDQA PhysicalDesignator120=C12 PhysicalDesignatorLocked120=0 -LogicalDesignator121=U10 +LogicalDesignator121=P17 LogicalPartID121=1 DocumentName121=Controller.SchDoc ChannelName121=Designator -UniqueID121=\PCYNFSRK\VGXLDVRF -PhysicalDesignator121=U10 +UniqueID121=\PCYNFSRK\USZLXXMD +PhysicalDesignator121=P17 PhysicalDesignatorLocked121=0 -LogicalDesignator122=R3 +LogicalDesignator122=U4 LogicalPartID122=1 DocumentName122=Controller.SchDoc ChannelName122=Designator -UniqueID122=\PCYNFSRK\VOPKIPHH -PhysicalDesignator122=R8 +UniqueID122=\PCYNFSRK\VGXLDVRF +PhysicalDesignator122=U10 PhysicalDesignatorLocked122=0 -LogicalDesignator123=C3 +LogicalDesignator123=R6 LogicalPartID123=1 DocumentName123=Controller.SchDoc ChannelName123=Designator -UniqueID123=\PCYNFSRK\VSEXMCSD -PhysicalDesignator123=C4 +UniqueID123=\PCYNFSRK\VOPKIPHH +PhysicalDesignator123=R8 PhysicalDesignatorLocked123=0 -LogicalDesignator124=C2 +LogicalDesignator124=C1 LogicalPartID124=1 DocumentName124=Controller.SchDoc ChannelName124=Designator -UniqueID124=\PCYNFSRK\WVZXVLCH -PhysicalDesignator124=C3 +UniqueID124=\PCYNFSRK\VSEXMCSD +PhysicalDesignator124=C4 PhysicalDesignatorLocked124=0 -LogicalDesignator125=R2 +LogicalDesignator125=U12 LogicalPartID125=1 DocumentName125=Controller.SchDoc ChannelName125=Designator -UniqueID125=\PCYNFSRK\XMNYIEVH -PhysicalDesignator125=R7 +UniqueID125=\PCYNFSRK\WOZFNSUS +PhysicalDesignator125=U12 PhysicalDesignatorLocked125=0 -LogicalDesignator126=P4 +LogicalDesignator126=C4 LogicalPartID126=1 DocumentName126=Controller.SchDoc ChannelName126=Designator -UniqueID126=\PCYNFSRK\YNFJLBYM -PhysicalDesignator126=P15 +UniqueID126=\PCYNFSRK\WVZXVLCH +PhysicalDesignator126=C3 PhysicalDesignatorLocked126=0 -LogicalDesignator127=Q2 +LogicalDesignator127=R3 LogicalPartID127=1 DocumentName127=Controller.SchDoc ChannelName127=Designator -UniqueID127=\PCYNFSRK\YWTMVIQN -PhysicalDesignator127=Q2 +UniqueID127=\PCYNFSRK\XMNYIEVH +PhysicalDesignator127=R7 PhysicalDesignatorLocked127=0 -LogicalDesignator128=U1 +LogicalDesignator128=P3 LogicalPartID128=1 DocumentName128=Controller.SchDoc ChannelName128=Designator -UniqueID128=\PCYNFSRK\ZIWDXHLR -PhysicalDesignator128=U5 +UniqueID128=\PCYNFSRK\YNFJLBYM +PhysicalDesignator128=P15 PhysicalDesignatorLocked128=0 -LogicalDesignator129=P10 +LogicalDesignator129=Q2 LogicalPartID129=1 -DocumentName129=Connector_stepper.SchDoc +DocumentName129=Controller.SchDoc ChannelName129=Designator -UniqueID129=\SDQBEMWM\CNOTFJIR -PhysicalDesignator129=P9 +UniqueID129=\PCYNFSRK\YWTMVIQN +PhysicalDesignator129=Q2 PhysicalDesignatorLocked129=0 -LogicalDesignator130=P11 +LogicalDesignator130=U1 LogicalPartID130=1 -DocumentName130=Connector_stepper.SchDoc +DocumentName130=Controller.SchDoc ChannelName130=Designator -UniqueID130=\SDQBEMWM\CXTVMCFY -PhysicalDesignator130=P10 +UniqueID130=\PCYNFSRK\ZIWDXHLR +PhysicalDesignator130=U5 PhysicalDesignatorLocked130=0 -LogicalDesignator131=U8 +LogicalDesignator131=P10 LogicalPartID131=1 DocumentName131=Connector_stepper.SchDoc ChannelName131=Designator -UniqueID131=\SDQBEMWM\IZZNWMSJ -PhysicalDesignator131=U2 +UniqueID131=\SDQBEMWM\CNOTFJIR +PhysicalDesignator131=P9 PhysicalDesignatorLocked131=0 -LogicalDesignator132=P9 +LogicalDesignator132=P11 LogicalPartID132=1 DocumentName132=Connector_stepper.SchDoc ChannelName132=Designator -UniqueID132=\SDQBEMWM\JVJXYBDD -PhysicalDesignator132=P8 +UniqueID132=\SDQBEMWM\CXTVMCFY +PhysicalDesignator132=P10 PhysicalDesignatorLocked132=0 -LogicalDesignator133=P12 +LogicalDesignator133=U10 LogicalPartID133=1 DocumentName133=Connector_stepper.SchDoc ChannelName133=Designator -UniqueID133=\SDQBEMWM\MDSPIGOU -PhysicalDesignator133=P11 +UniqueID133=\SDQBEMWM\IZZNWMSJ +PhysicalDesignator133=U2 PhysicalDesignatorLocked133=0 -LogicalDesignator134=P13 +LogicalDesignator134=P9 LogicalPartID134=1 DocumentName134=Connector_stepper.SchDoc ChannelName134=Designator -UniqueID134=\SDQBEMWM\PHIDHHFG -PhysicalDesignator134=P12 +UniqueID134=\SDQBEMWM\JVJXYBDD +PhysicalDesignator134=P8 PhysicalDesignatorLocked134=0 -LogicalDesignator135=U9 +LogicalDesignator135=P12 LogicalPartID135=1 DocumentName135=Connector_stepper.SchDoc ChannelName135=Designator -UniqueID135=\SDQBEMWM\ZZBNALNI -PhysicalDesignator135=U3 +UniqueID135=\SDQBEMWM\MDSPIGOU +PhysicalDesignator135=P11 PhysicalDesignatorLocked135=0 +LogicalDesignator136=P13 +LogicalPartID136=1 +DocumentName136=Connector_stepper.SchDoc +ChannelName136=Designator +UniqueID136=\SDQBEMWM\PHIDHHFG +PhysicalDesignator136=P12 +PhysicalDesignatorLocked136=0 +LogicalDesignator137=U11 +LogicalPartID137=1 +DocumentName137=Connector_stepper.SchDoc +ChannelName137=Designator +UniqueID137=\SDQBEMWM\ZZBNALNI +PhysicalDesignator137=U3 +PhysicalDesignatorLocked137=0 [SheetNumberManager] SheetNumberOrder=Display Order diff --git a/DisysCNC.PrjPcb b/DisysCNC.PrjPcb index c8aa8a8..85c8cd0 100644 --- a/DisysCNC.PrjPcb +++ b/DisysCNC.PrjPcb @@ -1192,27 +1192,27 @@ MatchStrictly2=1 PhysicalNamingFormat=$ComponentPrefix$GlobalIndex GlobalIndexSortOrder=3 GlobalIndexSortLocation=0 -UniqueIDPath0=\CSNUPCDW -DocumentName0=Power.SchDoc +UniqueIDPath0=\SDQBEMWM +DocumentName0=Connector_stepper.SchDoc IsEnabled0=1 SelectionScope0=All -Order0=19 +Order0=3 IndexEnabled0=0 IndexStartValue0=1 Suffix0= -UniqueIDPath1=\JANKFIMP\GXVLWJSB -DocumentName1=Opto_isolator_INPUT.SchDoc +UniqueIDPath1=\BPXYAMLZ\QIQMTRNL +DocumentName1=Opto_isolator_OUTPUT.SchDoc IsEnabled1=1 SelectionScope1=All -Order1=20 +Order1=14 IndexEnabled1=0 IndexStartValue1=1 Suffix1= -UniqueIDPath2=\BPXYAMLZ\QIQMTRNL -DocumentName2=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath2=\JANKFIMP\CNMDFGEL +DocumentName2=Opto_isolator_INPUT.SchDoc IsEnabled2=1 SelectionScope2=All -Order2=14 +Order2=11 IndexEnabled2=0 IndexStartValue2=1 Suffix2= @@ -1224,163 +1224,163 @@ Order3=18 IndexEnabled3=0 IndexStartValue3=1 Suffix3= -UniqueIDPath4=\BPXYAMLZ\OIPOXSGF -DocumentName4=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath4=\CSNUPCDW +DocumentName4=Power.SchDoc IsEnabled4=1 SelectionScope4=All -Order4=16 +Order4=19 IndexEnabled4=0 IndexStartValue4=1 Suffix4= -UniqueIDPath5=\JANKFIMP\NAIFGAPM -DocumentName5=Opto_isolator_INPUT.SchDoc +UniqueIDPath5=\JANKFIMP +DocumentName5=Connector_sensor.SchDoc IsEnabled5=1 SelectionScope5=All -Order5=10 +Order5=2 IndexEnabled5=0 IndexStartValue5=1 Suffix5= -UniqueIDPath6=\PCYNFSRK -DocumentName6=Controller.SchDoc +UniqueIDPath6=\JANKFIMP\GXVLWJSB +DocumentName6=Opto_isolator_INPUT.SchDoc IsEnabled6=1 SelectionScope6=All -Order6=4 +Order6=20 IndexEnabled6=0 IndexStartValue6=1 Suffix6= -UniqueIDPath7=\BPXYAMLZ -DocumentName7=Connector_out.SchDoc +UniqueIDPath7=\BPXYAMLZ\SJLJUKOH +DocumentName7=Opto_isolator_OUTPUT.SchDoc IsEnabled7=1 SelectionScope7=All -Order7=1 +Order7=25 IndexEnabled7=0 IndexStartValue7=1 Suffix7= -UniqueIDPath8=\BPXYAMLZ\SJLJUKOH -DocumentName8=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath8=\BPXYAMLZ +DocumentName8=Connector_out.SchDoc IsEnabled8=1 SelectionScope8=All -Order8=25 +Order8=1 IndexEnabled8=0 IndexStartValue8=1 Suffix8= -UniqueIDPath9=\BPXYAMLZ\ZCPQGHVN -DocumentName9=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath9=\PCYNFSRK +DocumentName9=Controller.SchDoc IsEnabled9=1 SelectionScope9=All -Order9=24 +Order9=4 IndexEnabled9=0 IndexStartValue9=1 Suffix9= -UniqueIDPath10=\BPXYAMLZ\XTKUGUHT +UniqueIDPath10=\BPXYAMLZ\ZCPQGHVN DocumentName10=Opto_isolator_OUTPUT.SchDoc IsEnabled10=1 SelectionScope10=All -Order10=26 +Order10=24 IndexEnabled10=0 IndexStartValue10=1 Suffix10= -UniqueIDPath11=\JANKFIMP\CNMDFGEL +UniqueIDPath11=\JANKFIMP\WICSGKDS DocumentName11=Opto_isolator_INPUT.SchDoc IsEnabled11=1 SelectionScope11=All -Order11=11 +Order11=9 IndexEnabled11=0 IndexStartValue11=1 Suffix11= -UniqueIDPath12=\JANKFIMP\COGFWRKA +UniqueIDPath12=\JANKFIMP\QFLYQMAS DocumentName12=Opto_isolator_INPUT.SchDoc IsEnabled12=1 SelectionScope12=All -Order12=8 +Order12=12 IndexEnabled12=0 IndexStartValue12=1 Suffix12= -UniqueIDPath13=\BPXYAMLZ\NZNMVOSA +UniqueIDPath13=\JANKFIMP\XHEDVTGS DocumentName13=Opto_isolator_INPUT.SchDoc IsEnabled13=1 SelectionScope13=All -Order13=28 +Order13=6 IndexEnabled13=0 IndexStartValue13=1 Suffix13= -UniqueIDPath14=\SDQBEMWM -DocumentName14=Connector_stepper.SchDoc +UniqueIDPath14=\BPXYAMLZ\OIPOXSGF +DocumentName14=Opto_isolator_OUTPUT.SchDoc IsEnabled14=1 SelectionScope14=All -Order14=3 +Order14=16 IndexEnabled14=0 IndexStartValue14=1 Suffix14= -UniqueIDPath15=\JANKFIMP\WICSGKDS -DocumentName15=Opto_isolator_INPUT.SchDoc +UniqueIDPath15=\BPXYAMLZ\EZFBFANN +DocumentName15=Opto_isolator_OUTPUT.SchDoc IsEnabled15=1 SelectionScope15=All -Order15=9 +Order15=27 IndexEnabled15=0 IndexStartValue15=1 Suffix15= -UniqueIDPath16=\JANKFIMP\CKHULMWR +UniqueIDPath16=\JANKFIMP\NAIFGAPM DocumentName16=Opto_isolator_INPUT.SchDoc IsEnabled16=1 SelectionScope16=All -Order16=7 +Order16=10 IndexEnabled16=0 IndexStartValue16=1 Suffix16= -UniqueIDPath17=\JANKFIMP\QFLYQMAS +UniqueIDPath17=\BPXYAMLZ\NZNMVOSA DocumentName17=Opto_isolator_INPUT.SchDoc IsEnabled17=1 SelectionScope17=All -Order17=12 +Order17=28 IndexEnabled17=0 IndexStartValue17=1 Suffix17= -UniqueIDPath18=\JANKFIMP -DocumentName18=Connector_sensor.SchDoc +UniqueIDPath18=\BPXYAMLZ\IZSHSRRX +DocumentName18=Opto_isolator_OUTPUT.SchDoc IsEnabled18=1 SelectionScope18=All -Order18=2 +Order18=15 IndexEnabled18=0 IndexStartValue18=1 Suffix18= -UniqueIDPath19=\JANKFIMP\XHEDVTGS -DocumentName19=Opto_isolator_INPUT.SchDoc +UniqueIDPath19=\BPXYAMLZ\XTKUGUHT +DocumentName19=Opto_isolator_OUTPUT.SchDoc IsEnabled19=1 SelectionScope19=All -Order19=6 +Order19=26 IndexEnabled19=0 IndexStartValue19=1 Suffix19= -UniqueIDPath20=\BPXYAMLZ\IZSHSRRX +UniqueIDPath20=\BPXYAMLZ\PESAFFAA DocumentName20=Opto_isolator_OUTPUT.SchDoc IsEnabled20=1 SelectionScope20=All -Order20=15 +Order20=17 IndexEnabled20=0 IndexStartValue20=1 Suffix20= -UniqueIDPath21=\BPXYAMLZ\PESAFFAA -DocumentName21=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath21= +DocumentName21=Main.SchDoc IsEnabled21=1 SelectionScope21=All -Order21=17 +Order21=5 IndexEnabled21=0 IndexStartValue21=1 Suffix21= -UniqueIDPath22= -DocumentName22=Main.SchDoc +UniqueIDPath22=\JANKFIMP\CKHULMWR +DocumentName22=Opto_isolator_INPUT.SchDoc IsEnabled22=1 SelectionScope22=All -Order22=5 +Order22=7 IndexEnabled22=0 IndexStartValue22=1 Suffix22= -UniqueIDPath23=\BPXYAMLZ\EZFBFANN -DocumentName23=Opto_isolator_OUTPUT.SchDoc +UniqueIDPath23=\JANKFIMP\COGFWRKA +DocumentName23=Opto_isolator_INPUT.SchDoc IsEnabled23=1 SelectionScope23=All -Order23=27 +Order23=8 IndexEnabled23=0 IndexStartValue23=1 Suffix23= diff --git a/DisysCNC_PCB.PcbDoc b/DisysCNC_PCB.PcbDoc index 461b339..c7ddffc 100644 Binary files a/DisysCNC_PCB.PcbDoc and b/DisysCNC_PCB.PcbDoc differ diff --git a/Power.SchDoc b/Power.SchDoc index b60f0aa..1315e10 100644 Binary files a/Power.SchDoc and b/Power.SchDoc differ