Merge branch 'master' into correspondance-tables

Author: abbou169

component_sketch.py

@@ -2015,6 +2015,10 @@ def draw_chip(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZON
         dim["chipWidth"] = kwargs.get("chipWidth", dim["chipWidth"])
         dim["label"] = kwargs.get("label", dim["label"])
         dim["internalFunc"] = kwargs.get("internalFunc", None)
+        dim["pwr"] = kwargs.get("pwr", None)
+
+        logic_function_name = kwargs.get("logicFunctionName", None)
+
         cover_open = kwargs.get("open", NO)
         chip_id = kwargs.get("id", None)
         tags = kwargs.get("tags", [])
@@ -2052,6 +2056,7 @@ def draw_chip(self, x_distance, y_distance, scale=1, width=-1, direction=HORIZON
             params["label"] = label
             params["type"] = chip_type
             params["btnMenu"] = [1, 1, 0]
+            params["pwr"] = dim["pwr"]
             num_pins_per_side = dim["pinCount"] // 2
             tag_base = "base" + chip_id
             tag_menu = "menu" + chip_id

object_model/circuit_object_model.py

@@ -32,7 +32,7 @@
     XnorGate,
     XorGate,
 )
-from .circuit_util_elements import ConnectionPointID, FunctionRepresentation
+from .circuit_util_elements import ConnectionPointID, FunctionRepresentation, Pin
 
 
 @dataclass
@@ -82,6 +82,8 @@ def __init__(
         description: str | None = None,
         pkg: Package | None = None,
         functions: list[ChipFunction] | None = None,
+        vcc: Pin | None = None,
+        gnd: Pin | None = None,
         position: ConnectionPointID | None = None,
         model: Chip | None = None,
     ):
@@ -102,6 +104,8 @@ def __init__(
             and description is not None
             and pkg is not None
             and functions is not None
+            and vcc is not None
+            and gnd is not None
             and model is None
         ):
             self.chip_type = chip_type
@@ -110,6 +114,8 @@ def __init__(
             self.pin_count: int = pkg.pin_count
             self.chip_width: float = pkg.chip_width
             self.functions: list[ChipFunction] = functions
+            self.vcc = vcc
+            self.gnd = gnd
             if position is not None:
                 for fn in self.functions:
                     fn.calculate_pin_pos(position, 1, self.pin_count)
@@ -123,6 +129,8 @@ def __init__(
             self.pin_count = model.pin_count
             self.chip_width = model.chip_width
             self.functions = model.functions
+            self.vcc = model.vcc
+            self.gnd = model.gnd
         else:
             raise ValueError("Invalid parameters provided.")
 
@@ -237,6 +245,8 @@ def from_json(json_data: dict, package_dict: dict[str, Package] | None = None):
                 json_data["description"],
                 package_dict[json_data["package"]],
                 functions,
+                Pin(json_data["vcc_pin"], None),
+                Pin(json_data["gnd_pin"], None),
             )
 
         raise ValueError("The package does not exist in the Components/Packages directory.")
@@ -254,6 +264,7 @@ def to_generic_dict(self) -> dict[str, Any]:
             "packageName": self.package_name,
             "pinCount": self.pin_count,
             "chipWidth": self.chip_width,
+            "pwr": [(self.vcc.pin_num, "+"), (self.gnd.pin_num, "-")],
         }
 
         if self.functions: