Merge pull request #220 from proddy:dev

minor updates

CHANGELOG_LATEST.md

@@ -33,6 +33,7 @@
 - Help fix issues with WebUI unable to fully load UI over Ethernet [#177](https://github.com/emsesp/EMS-ESP32/issues/177)
 - Shower alert never reset after limit reached when enabled [(PR #185)]
 - Remove HA entity entries when a device value goes dormant [#196](https://github.com/emsesp/EMS-ESP32/issues/196)
+- deciphering last error code dates on 0xC2 telegram [#204](https://github.com/emsesp/EMS-ESP32/issues/204)
 
 ## Changed
 
@@ -49,6 +50,7 @@
 - Improve Nefit Moduline 200 functionality [#183](https://github.com/emsesp/EMS-ESP32/issues/183)
 - `status` in the MQTT heartbeat renamed to `bus_status`
 - Layout changes in the WebUI, showing stripped table rows in Dashboard
+- Alternative font for log window [#219](https://github.com/emsesp/EMS-ESP32/issues/219)
 
 ## **BREAKING CHANGES**
 

interface/src/project/EMSESPDataForm.tsx

@@ -412,12 +412,7 @@ class EMSESPDataForm extends Component<
                   <TableCell padding="checkbox">
                     {me.admin && (
                       <StyledTooltip title="edit" placement="left-end">
-                        <IconButton
+                        <IconButton edge="start" size="small" aria-label="Edit">
-                          edge="start"
-                          size="small"
-                          aria-label="Edit"
-                          onClick={() => this.sendSensor(sensorData)}
-                        >
                           <EditIcon color="primary" fontSize="small" />
                         </IconButton>
                       </StyledTooltip>
@@ -612,7 +607,6 @@ class EMSESPDataForm extends Component<
                             edge="start"
                             size="small"
                             aria-label="Edit"
-                            onClick={() => this.sendCommand(item)}
                           >
                             <EditIcon color="primary" fontSize="small" />
                           </IconButton>

interface/src/system/LogEventConsole.tsx

@@ -34,8 +34,8 @@ const useStyles = makeStyles((theme: Theme) => ({
   },
   entry: {
     color: '#bbbbbb',
-    fontFamily: 'Courier New, monospace',
+    fontFamily: 'monospace',
-    fontSize: '13px',
+    fontSize: '14px',
     letterSpacing: 'normal',
     whiteSpace: 'nowrap'
   },

src/devices/boiler.cpp

@@ -815,12 +815,13 @@ void Boiler::process_UBAErrorMessage(std::shared_ptr<const Telegram> telegram) {
 
 // 0xC2
 void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram) {
-    if (telegram->offset > 0 || telegram->message_length < 14) {
+    // not sure why this test is in , so removing
-        return;
+    // if (telegram->offset > 0 || telegram->message_length < 14) {
-    }
+    //     return;
+    // }
     char     code[4];
     uint16_t codeNo;
-        char     start_time[17];
+    char     start_time[17];
     char     end_time[17];
 
     if (!(telegram->message_data[10] & 0x80)) { // no valid start date means no error?
@@ -846,10 +847,9 @@ void Boiler::process_UBAErrorMessage2(std::shared_ptr<const Telegram> telegram)
     uint8_t  end_hour  = telegram->message_data[17];
     uint8_t  end_min   = telegram->message_data[19];
 
-    if (telegram->message_data[15] & 0x80) { //valid end date
+    if (telegram->message_data[15] & 0x80) { // valid end date
-        snprintf(end_time, sizeof(end_time), "%d.%02d.%02d %02d:%02d", end_year, end_month, end_day, end_hour, end_min); 
+        snprintf(end_time, sizeof(end_time), "%d.%02d.%02d %02d:%02d", end_year, end_month, end_day, end_hour, end_min);
-    } 
+    } else { // no valid end date means error still persists
-    else { // no valid end date means error still persists
         snprintf(end_time, sizeof(end_time), "%s", "none");
     }
 

src/test/test.cpp

@@ -487,6 +487,24 @@ void Test::run_test(uuid::console::Shell & shell, const std::string & cmd) {
         shell.invoke_command("call system publish");
     }
 
+    if (command == "lastcode") {
+        shell.printfln(F("Testing lastcode"));
+
+        Mqtt::ha_enabled(false);
+        Mqtt::nested_format(1);
+        Mqtt::send_response(false);
+
+        run_test("boiler");
+        // run_test("thermostat");
+
+        // 0xC2
+        //  [emsesp] Boiler(0x08) -> Me(0x0B), UBAErrorMessage3(0xC2), data: 08 AC 00 10 31 48 30 31 15 80 95 0B 0E 10 38 00 7F FF FF FF 08 AC 00 10 09 41 30
+        uart_telegram(
+            {0x08, 0x0B, 0xC2, 0, 0x08, 0xAC, 00, 0x10, 0x31, 0x48, 0x30, 0x31, 0x15, 0x80, 0x95, 0x0B, 0x0E, 0x10, 0x38, 00, 0x7F, 0xFF, 0xFF, 0xFF});
+
+        // shell.invoke_command("show");
+    }
+
     if (command == "dv2") {
         shell.printfln(F("Testing device value lost"));
 

src/version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.3.0b10"
+#define EMSESP_APP_VERSION "3.3.0b11"