diff --git a/scripts/remote/controller.py b/scripts/remote/controller.py index 10037b8..b449359 100644 --- a/scripts/remote/controller.py +++ b/scripts/remote/controller.py @@ -73,6 +73,24 @@ elif p_type == BBType.i2c_write_return: logging.debug("received: i2c_write_return") return BBPacketI2cWriteReturn(raw=data) + elif p_type == BBType.gpio_get_value: + logging.debug("received: gpio_get_value") + return BBPacketGpioGetValue(raw=data) + elif p_type == BBType.gpio_get_value_return: + logging.debug("received: gpio_get_value_return") + return BBPacketGpioGetValueReturn(raw=data) + elif p_type == BBType.gpio_set_value: + logging.debug("received: gpio_set_value") + return BBPacketGpioSetValue(raw=data) + elif p_type == BBType.gpio_set_value_return: + logging.debug("received: gpio_set_value_return") + return BBPacketGpioSetValueReturn(raw=data) + elif p_type == BBType.gpio_set_direction: + logging.debug("received: gpio_set_direction") + return BBPacketGpioSetDirection(raw=data) + elif p_type == BBType.gpio_set_direction_return: + logging.debug("received: gpio_set_direction_return") + return BBPacketGpioSetDirectionReturn(raw=data) else: logging.debug("received: UNKNOWN") return BBPacket(raw=data) @@ -163,6 +181,24 @@ logging.info("i2c write return: %r", r) return (r.exit_code,r.written) + def gpio_get_value(self, gpio): + self._send(BBPacketGpioGetValue(gpio=gpio)) + r = self._expect(BBPacketGpioGetValueReturn) + logging.info("gpio get value return: %r", r) + return r.value + + def gpio_set_value(self, gpio, value): + self._send(BBPacketGpioSetValue(gpio=gpio, value=value)) + r = self._expect(BBPacketGpioSetValueReturn) + logging.info("gpio set value return: %r", r) + return 0 + + def gpio_set_direction(self, gpio, direction, value): + self._send(BBPacketGpioSetDirection(gpio=gpio, direction=direction, value=value)) + r = self._expect(BBPacketGpioSetDirectionReturn) + logging.info("gpio set direction return: %r", r) + return r.exit_code + def reset(self, force): self._send(BBPacketReset(force=force)) diff --git a/scripts/remote/main.py b/scripts/remote/main.py index 0f77839..cef5d92 100644 --- a/scripts/remote/main.py +++ b/scripts/remote/main.py @@ -119,6 +119,28 @@ return res +def handle_gpio_get_value(args): + ctrl = get_controller(args) + value = ctrl.gpio_get_value(args.gpio) + print ("%u" % value); + ctrl.close() + return 0 + + +def handle_gpio_set_value(args): + ctrl = get_controller(args) + ctrl.gpio_set_value(args.gpio, args.value) + ctrl.close() + return 0 + + +def handle_gpio_set_direction(args): + ctrl = get_controller(args) + res = ctrl.gpio_set_direction(args.gpio, args.direction, args.value) + ctrl.close() + return res + + def handle_reset(args): ctrl = get_controller(args) ctrl.reset(args.force) @@ -225,6 +247,21 @@ parser_i2c_write.add_argument('data', help="data") parser_i2c_write.set_defaults(func=handle_i2c_write) +parser_gpio_get_value = subparsers.add_parser('gpio-get-value', help="run gpio get value command") +parser_gpio_get_value.add_argument('gpio', type=auto_int, help="gpio") +parser_gpio_get_value.set_defaults(func=handle_gpio_get_value) + +parser_gpio_set_value = subparsers.add_parser('gpio-set-value', help="run gpio set value command") +parser_gpio_set_value.add_argument('gpio', type=auto_int, help="gpio") +parser_gpio_set_value.add_argument('value', type=auto_int, help="value") +parser_gpio_set_value.set_defaults(func=handle_gpio_set_value) + +parser_gpio_set_direction = subparsers.add_parser('gpio-set-direction', help="run gpio set direction command") +parser_gpio_set_direction.add_argument('gpio', type=auto_int, help="gpio") +parser_gpio_set_direction.add_argument('direction', type=auto_int, help="direction (0: input, 1: output)") +parser_gpio_set_direction.add_argument('value', type=auto_int, help="value (if output)") +parser_gpio_set_direction.set_defaults(func=handle_gpio_set_direction) + parser_reset = subparsers.add_parser('reset', help="run reset command") parser_reset_force = parser_reset.add_mutually_exclusive_group(required=False) parser_reset_force.add_argument('--force', dest='force', action='store_true') diff --git a/scripts/remote/messages.py b/scripts/remote/messages.py index bc40cbc..abd331c 100644 --- a/scripts/remote/messages.py +++ b/scripts/remote/messages.py @@ -26,6 +26,12 @@ i2c_read_return = 16 i2c_write = 17 i2c_write_return = 18 + gpio_get_value = 19 + gpio_get_value_return = 20 + gpio_set_value = 21 + gpio_set_value_return = 22 + gpio_set_direction = 23 + gpio_set_direction_return = 24 class BBPacket(object): @@ -343,3 +349,90 @@ def _pack_payload(self): # header size is always 4 bytes (HH) and we have 8 bytes of fixed data (HLH), so buffer offset is 14 return struct.pack("!HLH", 12, self.exit_code, self.written) + + +class BBPacketGpioGetValue(BBPacket): + def __init__(self, raw=None, gpio=None): + self.gpio = gpio + super(BBPacketGpioGetValue, self).__init__(BBType.gpio_get_value, raw=raw) + + def __repr__(self): + return "BBPacketGpioGetValue(gpio=%u)" % (self.gpio) + + def _unpack_payload(self, payload): + self.gpio = struct.unpack("!L", payload[:4]) + + def _pack_payload(self): + return struct.pack("!L", self.gpio) + + +class BBPacketGpioGetValueReturn(BBPacket): + def __init__(self, raw=None, value=None): + self.value = value + super(BBPacketGpioGetValueReturn, self).__init__(BBType.gpio_get_value_return, raw=raw) + + def __repr__(self): + return "BBPacketGpioGetValueReturn(value=%u)" % (self.value) + + def _unpack_payload(self, payload): + self.value = struct.unpack("!B", payload[:1]) + + def _pack_payload(self): + return struct.pack("!B", self.value) + + +class BBPacketGpioSetValue(BBPacket): + def __init__(self, raw=None, gpio=None, value=None): + self.gpio = gpio + self.value = value + super(BBPacketGpioSetValue, self).__init__(BBType.gpio_set_value, raw=raw) + + def __repr__(self): + return "BBPacketGpioSetValue(gpio=%u,value=%u)" % (self.gpio, self.value) + + def _unpack_payload(self, payload): + self.gpio = struct.unpack("!LB", payload[:5]) + + def _pack_payload(self): + return struct.pack("!LB", self.gpio, self.value) + + +class BBPacketGpioSetValueReturn(BBPacket): + def __init__(self, raw=None, value=None): + self.value = value + super(BBPacketGpioSetValueReturn, self).__init__(BBType.gpio_set_value_return, raw=raw) + + def __repr__(self): + return "BBPacketGpioSetValueReturn()" + + +class BBPacketGpioSetDirection(BBPacket): + def __init__(self, raw=None, gpio=None, direction=None, value=None): + self.gpio = gpio + self.direction = direction + self.value = value + super(BBPacketGpioSetDirection, self).__init__(BBType.gpio_set_direction, raw=raw) + + def __repr__(self): + return "BBPacketGpioSetDirection(gpio=%u,direction=%u,value=%u)" % (self.gpio, self.direction, self.value) + + def _unpack_payload(self, payload): + self.gpio = struct.unpack("!LBB", payload[:6]) + + def _pack_payload(self): + return struct.pack("!LBB", self.gpio, self.direction, self.value) + + +class BBPacketGpioSetDirectionReturn(BBPacket): + def __init__(self, raw=None, exit_code=None): + self.exit_code = exit_code + super(BBPacketGpioSetDirectionReturn, self).__init__(BBType.gpio_set_direction_return, raw=raw) + + def __repr__(self): + return "BBPacketGpioSetDirectionReturn(exit_code=%u)" % (self.exit_code) + + def _unpack_payload(self, payload): + self.exit_code = struct.unpack("!L", payload[:4]) + + def _pack_payload(self): + return struct.pack("!L", self.exit_code)