Fixed merge issue

ClassicDIY · Jan 28, 2024 · 0805108 · 0805108
1 parent c036133
commit 0805108
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/code/Python/classic_mqtt.py b/code/Python/classic_mqtt.py
@@ -397,7 +397,7 @@ def periodic(modbus_stop):
                     modbusErrorCount = 0
                     if (not infoPublished): #Check if the Info has been published yet
                         #
-                        if ( argumentValues['homeassistant'] == True ): #Check if HA_enabled is true
+                        if ( homeassistantEnabled ): #Check if HA_enabled is true
                             log.debug("Call mqttHAautodiscovery" )
                             mqttHAautodiscovery( data )
                             # wait 1 second for HA to receive and create device
@@ -412,7 +412,7 @@ def periodic(modbus_stop):
                         #
                     if mqttPublish(mqttClient,encodeClassicData_readings(data),"readings"):
                         #
-                        if ( argumentValues['homeassistant'] == True ): #Check if HA_enabled is true
+                        if ( homeassistantEnabled ): #Check if HA_enabled is true
                             # re-send ChargeState because of icon
                             if mqttLastCSicon != data["ChargeStateIcon"]:
                                 mqttLastCSicon = data["ChargeStateIcon"]

diff --git a/code/Python/compose-override.yml b/code/Python/compose-override.yml
@@ -11,6 +11,8 @@ services:
       - MQTT_HOST=mosquitto
       - MQTT_PORT=1883
       - MQTT_ROOT=ClassicMQTT
+      # uncomment to enable Home Assistant discovery
+      # - HA_ENABLED=True
  #     - MQTT_USER=ClassicPublisher
  #     - MQTT_PASS=ClassicPub123
 

diff --git a/code/Python/support/classic_jsonencoder.py b/code/Python/support/classic_jsonencoder.py
@@ -100,6 +100,7 @@ def encodeClassicData_info(decoded):
     # "deviceName":"CLASSIC",
     classicData["deviceName"] = "".join(chr(x) for x in uint_array).strip(chr(0))
     # "buildDate":"Tuesday, February 6, 2018",
+    bdate = datetime.date(decoded["Year"],decoded["Month"],decoded["Day"])
     classicData["buildDate"] = bdate.strftime("%A, %B %d, %Y").replace(' 0', ' ') # get rid of the stupid leading 0 in date.
     # "deviceType":"Classic",
     classicData["deviceType"] = "Classic"