diff --git a/.gitmodules b/.gitmodules index 2e8fa466e1275e1fa7926e497f11b1bf55fba408..66af72e93362dd82ebef5ae7a5c401b7cbb158d5 100644 --- a/.gitmodules +++ b/.gitmodules @@ -7,6 +7,3 @@ [submodule "firmware/osape-smoothieroll-drop-stepper/src/osape-d51"] path = firmware/osape-smoothieroll-drop-stepper/src/osape-d51 url = ssh://git@gitlab.cba.mit.edu:846/jakeread/osape-d51.git -[submodule "firmware/stepper-drop/src/osape-d51"] - path = firmware/stepper-drop/src/osape-d51 - url = ssh://git@gitlab.cba.mit.edu:846/jakeread/osape-d51.git diff --git a/2020-06_ucbus-stepper-melted/eagle.epf b/2020-06_ucbus-stepper-melted/eagle.epf index 40d2f7e9ba6cc0385badb035e12aa6690666cd10..eb177651baac784ebe4e8da42aba190a5dea5c91 100644 --- a/2020-06_ucbus-stepper-melted/eagle.epf +++ b/2020-06_ucbus-stepper-melted/eagle.epf @@ -282,10 +282,10 @@ UsedLibrary="C:/Dropbox/CBA/circuits/eagle/parts/tag-connect-2050.lbr" UsedLibrary="C:/Dropbox/CBA/circuits/eagle/parts/usbraw.lbr" [Win_1] -Type="Schematic Editor" -Number=2 -File="2020-06_ucbus-stepper-melted.sch" -View="-12.0464 -0.366016 451.466 255.354" +Type="Board Editor" +Number=1 +File="2020-06_ucbus-stepper-melted.brd" +View="18.2379 23.2596 35.3969 41.4635" WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524" PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6" @@ -301,14 +301,14 @@ DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0" DimensionExtLengths=" 1.27 2.54 1 2 3 0" DimensionExtOffsets=" 1.27 2.54 1 2 3 0" SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635" -WireBend=0 -WireBendSet=31 +WireBend=1 +WireBendSet=0 WireCap=1 MiterStyle=1 PadShape=0 ViaShape=1 PolygonPour=0 -PolygonRank=0 +PolygonRank=1 PolygonThermals=1 PolygonOrphans=0 TextRatio=8 @@ -323,14 +323,13 @@ SwapLevel=0 ArcDirection=0 AddLevel=2 PadsSameType=0 -Layer=91 -Sheet="1" +Layer=16 [Win_2] -Type="Board Editor" -Number=1 -File="2020-06_ucbus-stepper-melted.brd" -View="20.9387 29.9114 29.2137 38.6903" +Type="Schematic Editor" +Number=2 +File="2020-06_ucbus-stepper-melted.sch" +View="127.903 47.8887 283.132 133.529" WireWidths=" 0.0762 0.1016 0.127 0.15 0.2 0.2032 0.254 0.3048 0.4064 0.508 0.6096 0.8128 1.016 1.27 2.54 0.1524" PadDiameters=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 6.4516 0" PadDrills=" 0.2 0.25 0.3 0.35 0.4 0.45 0.5 0.55 0.65 0.7 0.75 0.8 0.85 0.9 1 0.6" @@ -346,14 +345,14 @@ DimensionExtWidths=" 0.127 0.254 0.1 0.13 0.26 0" DimensionExtLengths=" 1.27 2.54 1 2 3 0" DimensionExtOffsets=" 1.27 2.54 1 2 3 0" SmdSizes=" 0.3048 0.1524 0.4064 0.2032 0.6096 0.3048 0.8128 0.4064 1.016 0.508 1.27 0.6604 1.4224 0.7112 1.6764 0.8128 1.778 0.9144 1.9304 0.9652 2.1844 1.0668 2.54 1.27 3.81 1.9304 5.08 2.54 6.4516 3.2512 1.27 0.635" -WireBend=1 -WireBendSet=0 +WireBend=0 +WireBendSet=31 WireCap=1 MiterStyle=1 PadShape=0 ViaShape=1 PolygonPour=0 -PolygonRank=1 +PolygonRank=0 PolygonThermals=1 PolygonOrphans=0 TextRatio=8 @@ -368,14 +367,16 @@ SwapLevel=0 ArcDirection=0 AddLevel=2 PadsSameType=0 -Layer=16 +Layer=91 +Views=" 1: 127.903 47.8887 283.132 133.529" +Sheet="1" [Win_3] Type="Control Panel" Number=0 [Desktop] -Screen="1920 1080" +Screen="3210 2520" Window="Win_1" Window="Win_2" Window="Win_3" diff --git a/firmware/cl-step-controller/.vscode/extensions.json b/firmware/cl-step-controller/.vscode/extensions.json index e80666bfb11e75aafd3600701dc99c10acce341c..080e70d08b9811fa743afe5094658dba0ed6b7c2 100644 --- a/firmware/cl-step-controller/.vscode/extensions.json +++ b/firmware/cl-step-controller/.vscode/extensions.json @@ -3,5 +3,8 @@ // for the documentation about the extensions.json format "recommendations": [ "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" ] } diff --git a/firmware/stepper-drop/.vscode/extensions.json b/firmware/stepper-drop/.vscode/extensions.json index e80666bfb11e75aafd3600701dc99c10acce341c..080e70d08b9811fa743afe5094658dba0ed6b7c2 100644 --- a/firmware/stepper-drop/.vscode/extensions.json +++ b/firmware/stepper-drop/.vscode/extensions.json @@ -3,5 +3,8 @@ // for the documentation about the extensions.json format "recommendations": [ "platformio.platformio-ide" + ], + "unwantedRecommendations": [ + "ms-vscode.cpptools-extension-pack" ] } diff --git a/firmware/stepper-drop/src/osape-d51 b/firmware/stepper-drop/src/osape-d51 deleted file mode 160000 index f33baa5ff96067f3474518abdd5f7d44712c6121..0000000000000000000000000000000000000000 --- a/firmware/stepper-drop/src/osape-d51 +++ /dev/null @@ -1 +0,0 @@ -Subproject commit f33baa5ff96067f3474518abdd5f7d44712c6121