diff --git a/.gitmodules b/.gitmodules index 374612768599c4ed5b62e3cf97948d7c3d155f74..414cc3b3e56a1cab3399f2bc61ba8001eb0b9f67 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,12 +1,12 @@ [submodule "firmware/motion-head/src/osape"] path = firmware/motion-head/src/osape - url = git@github.com:jakeread/osape.git + url = https://github.com/jakeread/osape.git [submodule "firmware/motion-head/src/osape_ucbus"] path = firmware/motion-head/src/osape_ucbus - url = git@github.com:jakeread/osape_ucbus.git + url = https://github.com/jakeread/osape_ucbus.git [submodule "firmware/motion-head/src/osape_arduino"] path = firmware/motion-head/src/osape_arduino - url = git@github.com:jakeread/osape_arduino.git + url = https://github.com/jakeread/osape_arduino.git [submodule "firmware/motion-head/src/utils_samd51"] path = firmware/motion-head/src/utils_samd51 - url = git@github.com:jakeread/utils_samd51.git + url = https://github.com/jakeread/utils_samd51.git diff --git a/2020-08_psu-breakout/eagle.epf b/2020-08_psu-breakout/eagle.epf index 4e884dfb15044270ce444c30a3ad7349ce7c7983..b79941902f17a49a3959c8d2ab4136ac4977e170 100644 --- a/2020-08_psu-breakout/eagle.epf +++ b/2020-08_psu-breakout/eagle.epf @@ -16,9 +16,101 @@ UsedLibrary="C:/Dropbox/CBA/circuits/eagle/parts/supply1.lbr" UsedLibrary="C:/Dropbox/CBA/circuits/eagle/parts/SparkFun-Eagle-Libraries/SparkFun-Connectors.lbr" [Win_1] +Type="Schematic Editor" +Number=2 +File="2020-08_psu-breakout.sch" +View="211.347 69.7783 390.043 189.664" +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" +ViaDiameters=" 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 1.05 1.1 1.15 1.2 1.3 0" +ViaDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35" +HoleDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35" +TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778" +PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27" +PolygonIsolates=" 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" +MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0" +DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13" +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 +WireCap=1 +MiterStyle=1 +PadShape=0 +ViaShape=1 +PolygonPour=0 +PolygonRank=0 +PolygonThermals=1 +PolygonOrphans=0 +TextRatio=8 +DimensionUnit=1 +DimensionPrecision=2 +DimensionShowUnit=0 +PinDirection=3 +PinFunction=0 +PinLength=2 +PinVisible=3 +SwapLevel=0 +ArcDirection=0 +AddLevel=2 +PadsSameType=0 +Layer=91 +Views=" 1: 211.347 69.7783 390.043 189.664" +Sheet="1" + +[Win_2] +Type="Board Editor" +Number=1 +File="2020-08_psu-breakout.brd" +View="-17.6895 -14.7179 115.154 124.818" +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" +ViaDiameters=" 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 0.95 1 1.05 1.1 1.15 1.2 1.3 0" +ViaDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35" +HoleDrills=" 0.2 0.25 0.3 0.4 0.45 0.5 0.55 0.6 0.65 0.7 0.75 0.8 0.85 0.9 1 0.35" +TextSizes=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.27 1.4224 1.6764 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.778" +PolygonSpacings=" 0.254 0.3048 0.4064 0.6096 0.8128 1.016 1.4224 1.6764 1.778 1.9304 2.1844 2.54 3.81 5.08 6.4516 1.27" +PolygonIsolates=" 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" +MiterRadiuss=" 0.254 0.3175 0.635 1.27 2.54 1 2 2.5 5 7.5 10 0" +DimensionWidths=" 0 0.127 0.254 0.1 0.26 0.13" +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 +WireCap=1 +MiterStyle=1 +PadShape=0 +ViaShape=1 +PolygonPour=0 +PolygonRank=1 +PolygonThermals=1 +PolygonOrphans=0 +TextRatio=8 +DimensionUnit=1 +DimensionPrecision=2 +DimensionShowUnit=0 +PinDirection=3 +PinFunction=0 +PinLength=2 +PinVisible=3 +SwapLevel=0 +ArcDirection=0 +AddLevel=2 +PadsSameType=0 +Layer=1 + +[Win_3] Type="Control Panel" Number=0 [Desktop] -Screen="2878 2160" +Screen="3210 2520" Window="Win_1" +Window="Win_2" +Window="Win_3" diff --git a/firmware/motion-head/src/osape_ucbus b/firmware/motion-head/src/osape_ucbus index 38e3b4faad9cfc548ddf436e62cf4a7af6a93257..22e4b51bdd4789656baff3a332bd42647b012440 160000 --- a/firmware/motion-head/src/osape_ucbus +++ b/firmware/motion-head/src/osape_ucbus @@ -1 +1 @@ -Subproject commit 38e3b4faad9cfc548ddf436e62cf4a7af6a93257 +Subproject commit 22e4b51bdd4789656baff3a332bd42647b012440 diff --git a/firmware/motion-head/src/ucbus_config.h b/firmware/motion-head/src/ucbus_config.h index 97f9c98e9a4b5d578db2307c6f40ec06b80d901c..2b84fba6edf04a4d5ad1fc9fd5a11bfee67d08f6 100644 --- a/firmware/motion-head/src/ucbus_config.h +++ b/firmware/motion-head/src/ucbus_config.h @@ -24,4 +24,6 @@ no warranty is provided, and users accept all liability. #define UCBUS_IS_D51 // #define UCBUS_IS_D21 +#define UCBUS_ON_OSAP + #endif \ No newline at end of file