move viper functions out of class

Author: K4zuki

micropython/RaspberryScpiPico.py

@@ -281,6 +281,50 @@ class SpiConfig(namedtuple("SpiConfig", ["freq", "mode", "cspol", "sck", "mosi",
     """
 
 
+@viper
+def vp_set_pin_hi(pin: int) -> None:
+    """ Viper code to set pin high
+    :param int pin: IO pin 0-29
+    """
+    gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
+    gpio_out_set_p = ptr32(_REG_GPIO_OUT_SET)
+
+    gpio_oe_set_p[0] = 1 << pin
+    gpio_out_set_p[0] = 1 << pin
+
+
+@viper
+def vp_set_pin_lo(pin: int) -> None:
+    """ Viper code to set pin low
+    :param int pin: IO pin 0-29
+    """
+    gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
+    gpio_out_clr_p = ptr32(_REG_GPIO_OUT_CLR)
+
+    gpio_oe_set_p[0] = 1 << pin
+    gpio_out_clr_p[0] = 1 << pin
+
+
+@viper
+def vp_set_pin_mode_in(pin: int) -> None:
+    """ Viper code to set a pin input mode
+    :param int pin: IO pin 0-29
+    """
+    gpio_oe_clr_p = ptr32(_REG_GPIO_OE_CLR)
+
+    gpio_oe_clr_p[0] = 1 << pin
+
+
+@viper
+def vp_set_pin_mode_out(pin: int) -> None:
+    """ Viper code to set a pin output mode
+    :param int pin: IO pin 0-29
+    """
+    gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
+
+    gpio_oe_set_p[0] = 1 << pin
+
+
 class RaspberryScpiPico(MicroScpiDevice):
     kw_machine = ScpiKeyword("MACHINE", "MACHINE", None)
     kw_pin = ScpiKeyword("PIN", "PIN", ["14", "15", "16", "17", "18", "19", "20", "21", "22", "25", "?"])
@@ -572,46 +616,6 @@ def cb_pin_status(self, param="", opt=None):
         else:
             self.error_push(E_SYNTAX)
 
-    @viper
-    def set_pin_hi(self, pin: int) -> None:
-        """ Viper code to set pin high
-        :param int pin: IO pin 0-29
-        """
-        gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
-        gpio_out_set_p = ptr32(_REG_GPIO_OUT_SET)
-
-        gpio_oe_set_p[0] = 1 << pin
-        gpio_out_set_p[0] = 1 << pin
-
-    @viper
-    def set_pin_lo(self, pin: int) -> None:
-        """ Viper code to set pin low
-        :param int pin: IO pin 0-29
-        """
-        gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
-        gpio_out_clr_p = ptr32(_REG_GPIO_OUT_CLR)
-
-        gpio_oe_set_p[0] = 1 << pin
-        gpio_out_clr_p[0] = 1 << pin
-
-    @viper
-    def set_pin_mode_in(self, pin: int) -> None:
-        """ Viper code to set a pin input mode
-        :param int pin: IO pin 0-29
-        """
-        gpio_oe_clr_p = ptr32(_REG_GPIO_OE_CLR)
-
-        gpio_oe_clr_p[0] = 1 << pin
-
-    @viper
-    def set_pin_mode_out(self, pin: int) -> None:
-        """ Viper code to set a pin output mode
-        :param int pin: IO pin 0-29
-        """
-        gpio_oe_set_p = ptr32(_REG_GPIO_OE_SET)
-
-        gpio_oe_set_p[0] = 1 << pin
-
     def cb_pin_val(self, param="", opt=None):
         """
         - PIN[14|15|16|17|18|19|20|21|22|25]:VALue[?] 0|1|OFF|ON
@@ -633,10 +637,10 @@ def cb_pin_val(self, param="", opt=None):
         elif param is not None:
             # print("cb_pin_val", pin_number, param)
             if param == str(IO_ON) or self.kw_on.match(param).match:
-                self.set_pin_hi(pin_number)
+                vp_set_pin_hi(pin_number)
                 self.pin_conf[pin_number] = PinConfig(machine.Pin.OUT, IO_ON, conf.pull)
             elif param == str(IO_OFF) or self.kw_off.match(param).match:
-                self.set_pin_lo(pin_number)
+                vp_set_pin_lo(pin_number)
                 self.pin_conf[pin_number] = PinConfig(machine.Pin.OUT, IO_OFF, conf.pull)
             else:
                 self.error_push(E_INVALID_PARAMETER)
@@ -666,8 +670,10 @@ def cb_pin_mode(self, param="", opt=None):
             # print("cb_pin_mode", pin_number, param)
             if self.kw_in.match(param).match:
                 mode = machine.Pin.IN
+                vp_set_pin_mode_in(pin_number)
             elif self.kw_out.match(param).match:
                 mode = machine.Pin.OUT
+                vp_set_pin_mode_out(pin_number)
             elif self.kw_od.match(param).match:
                 mode = machine.Pin.OPEN_DRAIN
             elif self.kw_pwm.match(param).match: