merge

Author: ducky64

edg/abstract_parts/AbstractAntenna.py

@@ -7,7 +7,7 @@
 @abstract_block
 class Antenna(Interface, Block):
   @init_in_parent
-  def __init__(self, frequency: RangeLike, impedance: RangeLike = Range.all(), power: RangeLike = (0, 0*Watt)):
+  def __init__(self, frequency: RangeLike, impedance: RangeLike = Range.all(), power: RangeLike = (0, 0)*Watt):
     super().__init__()
 
     self.frequency = self.ArgParameter(frequency)

edg/electronics_model/KiCadSchematicParser.py

@@ -13,9 +13,9 @@
 
 
 TestCastType = TypeVar('TestCastType')
-def test_cast(x: Any, type: Type[TestCastType]) -> TestCastType:
+def test_cast(x: Any, tpe: Type[TestCastType]) -> TestCastType:
   """Combination of (dynamic) isinstance test and static typing cast."""
-  assert isinstance(x, type)
+  assert isinstance(x, tpe), f"got {x} of type {type(x)}, expected {tpe}"
   return x
 
 def extract_only(x: List[TestCastType]) -> TestCastType:

edg/jlcparts/JlcPartsBase.py

@@ -95,7 +95,7 @@ def config_root_dir(root_dir: str):
         CapacitorsMultilayer_Ceramic_Capacitors_MLCC___SMDakaSMT.json.gz
         This setting is on a JlcPartsBase-wide basis."""
         assert JlcPartsBase._config_parts_root_dir is None, \
-            f"attempted to reassign config_root_dir, was {JlcPartsBase._config_parts_root_dir}, new {root_dir}"
+            f"attempted to reassign configure_root_dir, was {JlcPartsBase._config_parts_root_dir}, new {root_dir}"
         JlcPartsBase._config_parts_root_dir = root_dir
 
     _JLC_PARTS_FILE_NAMES: ClassVar[List[str]]  # set by subclass
@@ -118,14 +118,19 @@ def _entry_to_table_row(cls, row_dict: Dict[PartsTableColumn, Any], filename: st
     @classmethod
     def _parse_table(cls) -> PartsTable:
         """Parses the file to a PartsTable"""
-        assert cls._config_parts_root_dir is not None, "must config_root_dir with jlcparts data folder"
+        jlcparts_dir = os.environ.get("JLCPARTS_DIR")
+        if jlcparts_dir is None:
+            jlcparts_dir = cls._config_parts_root_dir
+        assert jlcparts_dir is not None, "no jlcparts data directory specified, either "\
+                                         "set JLCPARTS_DIR environment variable or call JlcPartsBase.config_root_dir "\
+                                         "with jlcparts data folder"
 
         rows: List[PartsTableRow] = []
 
         for filename in cls._JLC_PARTS_FILE_NAMES:
-            with gzip.open(os.path.join(cls._config_parts_root_dir, filename + kTableFilenamePostfix), 'r') as f:
+            with gzip.open(os.path.join(jlcparts_dir, filename + kTableFilenamePostfix), 'r') as f:
                 data = JlcPartsFile.model_validate_json(f.read())
-            with open(os.path.join(cls._config_parts_root_dir, filename + kStockFilenamePostfix), 'r') as f:
+            with open(os.path.join(jlcparts_dir, filename + kStockFilenamePostfix), 'r') as f:
                 stocking = JlcPartsStockFile.model_validate_json(f.read())
 
             lcsc_index = data.jlcpart_schema.index("lcsc")

edg/parts/Neopixel.py

@@ -201,7 +201,7 @@ def _svgpcb_template(self) -> str:
         assert all([pin is not None for pin in [led_vdd_pin, led_gnd_pin, led_din_pin, led_dout_pin]])
 
         return f"""\
-function {self._svgpcb_fn_name()}(xy, rot=90, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {{
+function {self._svgpcb_fn_name()}(xy, rot=270, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {{
   const kCount = {self._svgpcb_get(self.count)}
 
   // Global params

examples/IotKnob/IotKnob.svgpcb.js

@@ -464,7 +464,7 @@ renderPCB({
   mmPerUnit: 25.4
 })
 
-function NeopixelArrayCircular_4_rgb_knob(xy, rot=90, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
+function NeopixelArrayCircular_4_rgb_knob(xy, rot=270, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
   const kCount = 4
 
   // Global params
@@ -575,7 +575,7 @@ function NeopixelArrayCircular_4_rgb_knob(xy, rot=90, radius=1, startAngle=0, en
   return obj
 }
 
-function NeopixelArrayCircular_24_rgb_ring(xy, rot=90, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
+function NeopixelArrayCircular_24_rgb_ring(xy, rot=270, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
   const kCount = 24
 
   // Global params
@@ -686,7 +686,7 @@ function NeopixelArrayCircular_24_rgb_ring(xy, rot=90, radius=1, startAngle=0, e
   return obj
 }
 
-function NeopixelArrayCircular_6_rgb_sw(xy, rot=90, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
+function NeopixelArrayCircular_6_rgb_sw(xy, rot=270, radius=1, startAngle=0, endAngle=360, powerRadiusOffset=0.2) {
   const kCount = 6
 
   // Global params