Merge branch 'touch'

# Conflicts:
#	rotary_controller_python/network/__init__.py

rotary_controller_python/components/coordbar.py

@@ -38,10 +38,9 @@ class CoordBar(BoxLayout, SavingDispatcher):
 
     _skip_save = ["position", "new_position", "formatted_axis_speed", "syncEnable"]
 
-    def __init__(self, input_index, **kv):
+    def __init__(self, **kv):
         self.app = App.get_running_app()
         super().__init__(**kv)
-        self.inputIndex = input_index
 
         self.speed_history = collections.deque(maxlen=5)
         self.previous_axis_time: float = 0
@@ -50,6 +49,9 @@ def __init__(self, input_index, **kv):
         Clock.schedule_interval(self.speed_task, 1.0/25.0)
 
     def upload(self):
+        if self.device is None:
+            return
+
         if not self.device.dm.connected:
             log.error(f"Unable to upload scale {self.inputIndex} connection is down!")
             return
@@ -114,7 +116,7 @@ def speed_task(self, *args, **kv):
             self.speed = float(average * 60 / 25.4 / 12)
         else:
             # Speed in mt/minute
-            self.speed = float(average * 60 / 1000)
+            self.speed = float(average * 60 / 1000 / 1000)
 
         self.previous_axis_time = current_time
         self.previous_axis_pos = Decimal(self.position)

rotary_controller_python/components/forms/boolean_item.kv

@@ -0,0 +1,21 @@
+<BooleanItem>:
+  height: 36
+  size_hint_y: None
+  BoxLayout:
+    orientation: "horizontal"
+    Button:
+      size_hint_x: None
+      width: self.height
+      font_name: "fonts/Font Awesome 6 Free-Solid-900.otf"
+      font_size: 21
+      text: "\uf129"
+    Label:
+      size_hint_x: 0.7
+      text: root.name
+    ToggleButton:
+      size_hint_x: None
+      width: 250
+      multiline: False
+      text: 'ON' if root.value else 'OFF'
+      state: 'down' if root.value else 'normal'
+      on_release: root.value = True if self.state == 'down' else False

rotary_controller_python/components/forms/boolean_item.py

@@ -0,0 +1,17 @@
+import os
+
+from kivy.lang import Builder
+from kivy.logger import Logger
+from kivy.properties import StringProperty, BooleanProperty
+from kivy.uix.boxlayout import BoxLayout
+
+log = Logger.getChild(__name__)
+kv_file = os.path.join(os.path.dirname(__file__), __file__.replace(".py", ".kv"))
+if os.path.exists(kv_file):
+    log.info(f"Loading KV file: {kv_file}")
+    Builder.load_file(kv_file)
+
+
+class BooleanItem(BoxLayout):
+    name = StringProperty("")
+    value = BooleanProperty(False)

rotary_controller_python/components/forms/string_item.kv

@@ -18,4 +18,5 @@
       width: 250
       multiline: False
       text: root.value
+      disabled: root.disabled
       on_text_validate: root.value = self.text

rotary_controller_python/components/forms/string_item.py

@@ -2,7 +2,7 @@
 
 from kivy.lang import Builder
 from kivy.logger import Logger
-from kivy.properties import StringProperty
+from kivy.properties import StringProperty, BooleanProperty
 from kivy.uix.boxlayout import BoxLayout
 
 log = Logger.getChild(__name__)
@@ -14,4 +14,5 @@
 
 class StringItem(BoxLayout):
     name = StringProperty("")
-    value = StringProperty("")
+    value = StringProperty("")
+    disabled = BooleanProperty(False)

rotary_controller_python/components/home/home_page.py

@@ -40,12 +40,12 @@ def __init__(self, device, **kv):
         self.bars_container.add_widget(self.status_bar)
         coord_bars = []
         for i in range(4):
-            bar = CoordBar(input_index=i, device=self.device)
+            bar = CoordBar(inputIndex=i, device=self.device, id_override=f"{i}")
             coord_bars.append(bar)
             self.bars_container.add_widget(bar)
 
         self.coord_bars = coord_bars
-        self.servo = ServoBar(device=self.device)
+        self.servo = ServoBar(device=self.device, id_override="0")
         self.bars_container.add_widget(self.servo)
 
         self._keyboard = Window._system_keyboard

rotary_controller_python/components/home/home_toolbar.kv

@@ -2,7 +2,6 @@
 #: import Keypad components.keypad
 #: import AppSettings components.appsettings
 #: import ToolbarButton components.toolbars.toolbar_button
-#: import NetworkPopup components.network.network_popup
 #: import SetupPopup components.setup.setup_popup
 #: import ScenePopup components.plot.scene_popup
 
@@ -12,13 +11,6 @@
   width: 80
   orientation: "vertical"
 
-  ToolbarButton:
-    font_name: "fonts/Font Awesome 6 Free-Solid-900.otf"
-    # Network Settings
-    text: "\uf1eb"
-    background_color: "#04FF00"
-    on_release: Factory.NetworkPopup().open()
-
   ToolbarButton:
     # TOOL
     text: "T{:d}".format(int(app.tool))