Merge branch 'master' of ssh://git.geekify.de:1421/sqozz/sem6000

example.py

@@ -11,22 +11,25 @@ while True:
     time.sleep(1)
     try:
         if socket == None:
-            print("Connecting...")
+            print("Connecting... ", end="")
-
-            # auto_reconnect_timeout enabled auto reconnect if sending a command fails. Valid values:
-            # None (default): everything that fails throws NotConnectedException's
-            # -1: infinite retries
-            # integer: seconds before exception is thrown
-
             socket = SEMSocket('f0:c7:7f:0d:e7:17')
-            print("Connected.")
+            print("Success!")
-
+            print("You're now connected to: {} (Icon: {})".format(socket.name, socket.icons[0]))
-            #socket.login("1337")
+            if socket.login("1234") and socket.authenticated:
-            #socket.changePassword("1234")
+                print("Login successful!")
-            #socket.login("1234")
+                socket.getSynConfig()
+                print()
+                print("=== Tariff settings ===")
+                print("Default charge:", socket.default_charge)
+                print("Night charge:", socket.night_charge)
+                print("Night tariff from {} to {}".format(socket.night_charge_start_time.tm_hour, socket.night_charge_end_time.tm_hour))
+                print()
+                print("=== Other settings ===")
+                print("Night mode:", "active" if socket.night_mode else "inactive")
+                print("Power protection:", socket.power_protect)
+                print()
 
         socket.getStatus()
-        socket.setStatus(True)
         print("=== {} ({}) ===".format(socket.mac_address, "on" if socket.powered else "off"))
         print("\t{}V {}A → {}W@{}Hz (PF: {})".format(socket.voltage, socket.current, socket.power, socket.frequency, socket.power_factor))
     except (SEMSocket.NotConnectedException, bluepy.btle.BTLEDisconnectError, BrokenPipeError):

sem6000.py

@@ -97,17 +97,19 @@ class SEMSocket():
         self.authenticated = self.authenticated and success
         return success
 
-    def clearHistory(self):
+    def setIcon(self, iconIdx):
-        cmd = bytearray([0x15])
+        cmd = bytearray([0x0f])
-        payload = bytearray([0x00, 0x02, 0x00, 0x00, 0x00, 0x00, 0x00])
+        payload = bytearray([0x00, 0x03, iconIdx, 0x00, 0x00, 0x00, 0x00])
         msg = self.BTLEMessage(self, cmd, payload)
+
         success = msg.send()
         return success
 
-    def factoryReset(self):
+    def enableLED(self, status):
-        cmd = bytearray([0x15])
+        cmd = bytearray([0x0f])
-        payload = bytearray([0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00])
+        payload = bytearray([0x00, 0x05, status, 0x00, 0x00, 0x00, 0x00])
         msg = self.BTLEMessage(self, cmd, payload)
+
         success = msg.send()
         return success
 
@@ -315,7 +317,13 @@ class SEMSocket():
                 else:
                     print("5th byte of login-response is > 1:", data)
             elif message_type == 0x0f: #set icon response
-                if not data[3:] == b'\x00\x03\x00\x13\xff\xff':
+                if data[3:6] == b'\x00\x03\x00':
+                    # LED set successfully
+                    pass
+                elif data[3:6] == b'\x00\x05\x00':
+                    # Icon set successfully
+                    pass
+                else:
                     print("Unknown response for setting icon: ", end="")
                     print(data[3:])
             else: