Merge pull request #17 from bpaulin/feature/publish_single

Use publish.single to send to mqtt

README.md

@@ -32,7 +32,7 @@ C4:D3:8C:12:4C:57 MIBCS
 	1. linux/arm32v6
 	1. linux/arm32v7
 	1. linux/arm64v8
-1. Open `docker-compose.yml` (see below) and edit the environment to suit your configuration... 
+1. Open `docker-compose.yml` (see below) and edit the environment to suit your configuration...
 1. Stand up the container - `docker-compose up -d`
 
 ### docker-compose:
@@ -55,7 +55,6 @@ services:
     - MQTT_USERNAME=       # Username for MQTT server (comment out if not required)
     - MQTT_PASSWORD=       # Password for MQTT (comment out if not required)
     - MQTT_PORT=           # Defaults to 1883
-    - MQTT_TIMEOUT=30      # Defaults to 60
     - TIME_INTERVAL=30     # Time in sec between each query to the scale, to allow other applications to use the Bluetooth module. Defaults to 30
 
       # Auto-gender selection/config -- This is used to create the calculations such as BMI, Water/Bone Mass etc...
@@ -116,7 +115,7 @@ Under the `sensor` block, enter as many blocks as users configured in your envir
 
 ![Mi Scale](Screenshots/HA_Lovelace_Card_Details.png)
 
-## Acknowledgements: 
+## Acknowledgements:
 Thanks to @syssi (https://gist.github.com/syssi/4108a54877406dc231d95514e538bde9) and @prototux (https://github.com/wiecosystem/Bluetooth) for their initial code
 
-Special thanks to @ned-kelly (https://github.com/ned-kelly) for his help turning a "simple" python script into a fully fledge docker container
+Special thanks to @ned-kelly (https://github.com/ned-kelly) for his help turning a "simple" python script into a fully fledge docker container

docker-compose.yml

@@ -17,7 +17,6 @@ services:
     - MQTT_USERNAME=      # Username for MQTT server (comment out if not required)
     - MQTT_PASSWORD=      # Password for MQTT (comment out if not required)
     - MQTT_PORT=1883      # Defaults to 1883
-    - MQTT_TIMEOUT=60     # Defaults to 60
     - TIME_INTERVAL=30     # Time in sec between each query to the scale, to allow other applications to use the Bluetooth module. Defaults to 30
 
       # Auto-gender selection/config -- This is used to create the calculations such as BMI, Water/Bone Mass etc...

src/Xiaomi_Scale.py

@@ -25,18 +25,17 @@ import sys
 import subprocess
 from bluepy import btle
 from bluepy.btle import Scanner, BTLEDisconnectError, BTLEManagementError, DefaultDelegate
-import paho.mqtt.client as mqtt
+import paho.mqtt.publish as publish
 from datetime import datetime
 
 import Xiaomi_Scale_Body_Metrics
 
 # Configuraiton...
 MISCALE_MAC = os.getenv('MISCALE_MAC', '')
-MQTT_USERNAME = os.getenv('MQTT_USERNAME', '')
+MQTT_USERNAME = os.getenv('MQTT_USERNAME', 'username')
-MQTT_PASSWORD = os.getenv('MQTT_PASSWORD', '')
+MQTT_PASSWORD = os.getenv('MQTT_PASSWORD', None)
 MQTT_HOST = os.getenv('MQTT_HOST', '127.0.0.1')
 MQTT_PORT = int(os.getenv('MQTT_PORT', 1883))
-MQTT_TIMEOUT = int(os.getenv('MQTT_TIMEOUT', 60))
 MQTT_PREFIX = os.getenv('MQTT_PREFIX', 'miscale')
 TIME_INTERVAL = int(os.getenv('TIME_INTERVAL', 30))
 OLD_MEASURE = ''
@@ -68,12 +67,7 @@ class ScanProcessor():
         return abs((d2 - d1).days)/365
 
     def __init__(self):
-        global MQTT_CONNECTED
         DefaultDelegate.__init__(self)
-        if not MQTT_CONNECTED:
-            self.mqtt_client = None
-            self._start_client()
-
 
     def handleDiscovery(self, dev, isNewDev, isNewData):
         global OLD_MEASURE
@@ -113,32 +107,10 @@ class ScanProcessor():
                             self._publish(round(measured, 2), unit, str(datetime.today().strftime('%Y-%m-%d-%H:%M:%S')), hasImpedance, miimpedance)
                             OLD_MEASURE = round(measured, 2) + int(miimpedance)
 
-            if not dev.scanData:
+            else:
                 print ('\t(no data)')
 
-    def _start_client(self):
-        global MQTT_CONNECTED
-        self.mqtt_client = mqtt.Client()
-        self.mqtt_client.username_pw_set(MQTT_USERNAME, MQTT_PASSWORD)
-
-        def _on_connect(client, _, flags, return_code):
-            global MQTT_CONNECTED
-            MQTT_CONNECTED = True
-            loop_flag = 0
-            sys.stdout.write("MQTT connection: %s\n" % mqtt.connack_string(return_code))
-
-        self.mqtt_client.on_connect = _on_connect
-        self.mqtt_client.connect(MQTT_HOST, MQTT_PORT, MQTT_TIMEOUT)
-        self.mqtt_client.loop_start()
-
-        while not MQTT_CONNECTED: # wait for MQTT connecting Ack
-            time.sleep(.01)
-
     def _publish(self, weight, unit, mitdatetime, hasImpedance, miimpedance):
-        global MQTT_CONNECTED
-        if not MQTT_CONNECTED:
-            sys.stderr.write('Not connected to MQTT server\n')
-            exit()
         if int(weight) > USER1_GT:
             user = USER1_NAME
             height = USER1_HEIGHT
@@ -176,16 +148,21 @@ class ScanProcessor():
         message += ',"TimeStamp":"' + mitdatetime + '"'
         message += '}'
         try:
-          self.mqtt_client.publish(MQTT_PREFIX + '/' + user + '/weight', message, qos=1, retain=True)
+            sys.stdout.write('Sent data to topic %s: %s' % (MQTT_PREFIX + '/' + user + '/weight', message + '\n'))
-          sys.stdout.write('Sent data to topic %s: %s' % (MQTT_PREFIX + '/' + user + '/weight', message + '\n'))
+            publish.single(
+                MQTT_PREFIX + '/' + user + '/weight',
+                message,
+                qos=1,
+                retain=True,
+                hostname=MQTT_HOST,
+                port=MQTT_PORT,
+                auth={'username':MQTT_USERNAME, 'password':MQTT_PASSWORD}
+            )
         except:
-          sys.stdout.write('Could not publish to MQTT, Disconnecting...\n')
+          sys.stdout.write('Could not publish to MQTT\n')
-          MQTT_CONNECTED = False
+          raise
-          self.mqtt_client.disconnect()
-          pass
 
 def main():
-
     sys.stdout.write(' \n')
     sys.stdout.write('-------------------------------------\n')
     sys.stdout.write('Starting Xiaomi mi Scale...\n')
@@ -216,4 +193,4 @@ def main():
         time.sleep(TIME_INTERVAL)
 
 if __name__ == "__main__":
-    main()
+    main()