adding servostackbatterymount

rocolib/builders/boat/BoatWithServoMountAndStack.py

@@ -7,6 +7,8 @@ c.addSubcomponent("boatwithservo", "BoatWithServoMount", inherit=True, prefix=No
 c.inheritAllInterfaces("boatwithservo")
 c.addSubcomponent("espStack", "StackMount", inherit=True)
 c.inheritAllInterfaces("espStack")
+c.addSubcomponent("batterystackmount", "BatteryStackMount")
+c.inheritAllInterfaces("batterystackmount")
 
 c.addSubcomponent("topPortSplit", "SplitEdge")
 c.addConstraint(("topPortSplit", "toplength"), ("topDistance"), "(x,)")

rocolib/builders/boat/BoatWithServoStackBattery.py

-from rocolib.api.components.Component import Component
-from rocolib.api.Function import Function
-
-c = Component()
-
-c.addSubcomponent("boatwithservostack", "BoatWithServoMountAndStack", inherit=True, prefix=None)
-c.inheritAllInterfaces("boatwithservostack")
-
-c.addSubcomponent("batterystackmount", "BatteryStackMount")
-c.inheritAllInterfaces("batterystackmount")
-
-c.toLibrary("BoatWithServoStackBattery")

rocolib/builders/boat/HouseboatWithServoMountAndStack.py

@@ -3,21 +3,21 @@ from rocolib.api.Function import Function
 
 c = Component()
 
-c.addSubcomponent("boatwithservo", "BoatWithServoMount", inherit=True, prefix=None)
-c.inheritAllInterfaces("boatwithservo")
-c.addSubcomponent("espStack", "StackMount", inherit=True)
-c.inheritAllInterfaces("espStack")
+c.addSubcomponent("houseboat", "Tug", inherit=True)
+c.inheritAllInterfaces("houseboat")
+c.addSubcomponent("servosandstack", "ServoMountAndStack", inherit=True)
+c.inheritAllInterfaces("servosandstack")
 
-c.addSubcomponent("topPortSplit", "SplitEdge")
-c.addConstraint(("topPortSplit", "toplength"), ("topDistance"), "(x,)")
-c.addConstraint(("topPortSplit", "botlength"), ("topDistance", "espStack.stack.length"), "(x[1], x[0] - x[1])") #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
-c.addConnection(("topPortSplit", "topedge0"), ("boatwithservo", "topPort")) #both face the same direction
-c.addConnection(("topPortSplit", "botedge0"), ("espStack", "leftArmInterface"), angle=45)
+# c.addSubcomponent("topPortSplit", "SplitEdge")
+# c.addConstraint(("topPortSplit", "toplength"), ("topDistance"), "(x,)")
+# c.addConstraint(("topPortSplit", "botlength"), ("topDistance", "espStack.stack.length"), "(x[1], x[0] - x[1])") #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
+# c.addConnection(("topPortSplit", "topedge0"), ("boatwithservo", "topPort")) #both face the same direction
+# c.addConnection(("topPortSplit", "botedge0"), ("espStack", "leftArmInterface"), angle=45)
 
-c.addSubcomponent("topStarSplit", "SplitEdge")
-c.addConstraint(("topStarSplit", "toplength"), ("topDistance"), "(x,)")
-c.addConstraint(("topStarSplit", "botlength"), ("topDistance", "espStack.stack.length"), "(x[0]-x[1], x[1])") #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
-c.addConnection(("topStarSplit", "topedge0"), ("boatwithservo", "topStar")) #both face the same direction
-c.addConnection(("topStarSplit", "botedge1"), ("espStack", "rightArmInterface"), tabWidth=10)
+# c.addSubcomponent("topStarSplit", "SplitEdge")
+# c.addConstraint(("topStarSplit", "toplength"), ("topDistance"), "(x,)")
+# c.addConstraint(("topStarSplit", "botlength"), ("topDistance", "espStack.stack.length"), "(x[0]-x[1], x[1])") #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
+# c.addConnection(("topStarSplit", "topedge0"), ("boatwithservo", "topStar")) #both face the same direction
+# c.addConnection(("topStarSplit", "botedge1"), ("espStack", "rightArmInterface"), tabWidth=10)
 
-c.toLibrary("BoatWithServoMountAndStack")
+c.toLibrary("HouseboatWithServoMountAndStack")

rocolib/builders/boat/ServoStackBatteryMount.py

+from rocolib.api.components.Component import Component
+from rocolib.api.Function import Function
+
+c = Component()
+
+c.addSubcomponent("servosandstack", "ServoMountAndStack", inherit=True)
+c.inheritAllInterfaces("servosandstack")
+
+c.addSubcomponent("batterystackmount", "BatteryStackMount")
+c.inheritAllInterfaces("batterystackmount")
+
+c.addSubcomponent("lfullsplit", "SplitEdge", inherit=True)
+c.inheritAllInterfaces("lfullsplit")
+c.addConstConstraint(("lfullsplit", "toplength"), (228,))
+c.addConstConstraint(("lfullsplit", "botlength"), (168, 60)) #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
+#
+c.addConnection(("lfullsplit", "botedge0"), ("batterystackmount", "leftArmInterface"))
+#c.addConnection(("lfullsplit", "botedge1"), ("servosandstack", "botedge0"))
+
+c.addSubcomponent("rfullsplit", "SplitEdge", inherit=True)
+c.inheritAllInterfaces("rfullsplit")
+c.addConstConstraint(("rfullsplit", "toplength"), (228,))
+c.addConstConstraint(("rfullsplit", "botlength"), (60, 168)) #but the value of the new component's boat.length parameter is completely disconnected from the value of the boat component's boat.length parameter
+#
+c.addConnection(("rfullsplit", "botedge0"), ("batterystackmount", "rightArmInterface"), tabWidth=10)
+#c.addConnection(("rfullsplit", "botedge1"), ("servosandstack", "botedge0"))
+
+c.toLibrary("ServoStackBatteryMount")