From c47fb2326ace42a0b434550bdba55ca67df0a895 Mon Sep 17 00:00:00 2001
From: Andrey Pokhilko <apc4@ya.ru>
Date: Sat, 7 Mar 2020 09:36:30 +0300
Subject: [PATCH] Offer alternative fix for start_power commands (#53)

* Offer alternative fix

* Fix test

* Dummy commit

* fix

* Decrease coverage

* fix test

* turn into comments

* Empty it

* Rollback experiment
---
 pylgbst/peripherals.py    | 11 +++++------
 tests/test_peripherals.py |  2 +-
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pylgbst/peripherals.py b/pylgbst/peripherals.py
index 2f7a822..2f352ec 100644
--- a/pylgbst/peripherals.py
+++ b/pylgbst/peripherals.py
@@ -240,8 +240,8 @@ class LEDRGB(Peripheral):
 
 
 class Motor(Peripheral):
-    SUBCMD_START_POWER = 0x00
-    SUBCMD_START_POWER_GROUPED = 0x03
+    SUBCMD_START_POWER = 0x01
+    SUBCMD_START_POWER_GROUPED = 0x02
     SUBCMD_SET_ACC_TIME = 0x05
     SUBCMD_SET_DEC_TIME = 0x06
     SUBCMD_START_SPEED = 0x07
@@ -254,8 +254,7 @@ class Motor(Peripheral):
     END_STATE_FLOAT = 0
 
     def _speed_abs(self, relative):
-        if relative == Motor.END_STATE_BRAKE \
-            or relative == Motor.END_STATE_HOLD:
+        if relative == Motor.END_STATE_BRAKE or relative == Motor.END_STATE_HOLD:
             # special value for BRAKE
             # https://lego.github.io/lego-ble-wireless-protocol-docs/index.html#output-sub-command-startpower-power
             return relative
@@ -291,7 +290,7 @@ class Motor(Peripheral):
             power_secondary = power_primary
 
         if self.virtual_ports:
-            cmd = self.SUBCMD_START_POWER_GROUPED
+            cmd = self.SUBCMD_START_POWER_GROUPED - 1  # because _send_cmd will do +1
         else:
             cmd = self.SUBCMD_START_POWER
 
@@ -300,7 +299,7 @@ class Motor(Peripheral):
         if self.virtual_ports:
             params += pack("<b", self._speed_abs(power_secondary))
 
-        self._write_direct_mode(cmd, params)
+        self._send_cmd(cmd, params)
 
     def stop(self):
         self.timed(0)
diff --git a/tests/test_peripherals.py b/tests/test_peripherals.py
index c54ff95..f17912e 100644
--- a/tests/test_peripherals.py
+++ b/tests/test_peripherals.py
@@ -151,7 +151,7 @@ class PeripheralsTest(unittest.TestCase):
 
         hub.connection.notification_delayed('050082030a', 0.1)
         motor.start_power(1.0)
-        self.assertEqual(b"0800810311510064", hub.writes.pop(1)[1])
+        self.assertEqual(b"07008103110164", hub.writes.pop(1)[1])
 
         hub.connection.notification_delayed('050082030a', 0.1)
         motor.stop()