printing!

Author: brentru

src/components/i2c/controller.cpp

@@ -826,15 +826,20 @@ bool I2cController::Handle_I2cDeviceOutputWrite(pb_istream_t *stream) {
   }
 
   // Determine which driver cb function to use
-  if (_i2c_model->GetI2cDeviceOutputWriteMsg()->has_led_backpack_write) {
-    if (!driver->LedBackpackWrite(
-            &_i2c_model->GetI2cDeviceOutputWriteMsg()->led_backpack_write)) {
+  if (_i2c_model->GetI2cDeviceOutputWriteMsg()->which_output_msg ==
+      wippersnapper_i2c_I2cDeviceOutputWrite_write_led_backpack_tag) {
+    if (!driver->LedBackpackWrite(&_i2c_model->GetI2cDeviceOutputWriteMsg()
+                                       ->output_msg.write_led_backpack)) {
       WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to write to LED backpack!");
       return false;
     }
-  } else if (_i2c_model->GetI2cDeviceOutputWriteMsg()->has_char_lcd_write) {
-    WS_DEBUG_PRINTLN("[i2c] Char LCD write not implemented yet!");
-    // TODO!
+  } else if (_i2c_model->GetI2cDeviceOutputWriteMsg()->which_output_msg ==
+             wippersnapper_i2c_I2cDeviceOutputWrite_write_char_lcd_tag) {
+    if (!driver->WriteMessageCharLCD(&_i2c_model->GetI2cDeviceOutputWriteMsg()
+                                          ->output_msg.write_char_lcd)) {
+      WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to write to char LCD!");
+      return false;
+    }
   } else {
     WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to determine I2C Output Write type!");
     return false;

src/components/i2c/drivers/drvOutCharLcd.h

@@ -83,13 +83,27 @@ class drvOutCharLcd : public drvOutputBase {
       @param    message
                 The message to be displayed.
   */
-  void WriteMessageCharLCD(const char *message) override {
+  void WriteMessage(const char *message) {
     if (_lcd == nullptr)
       return;
 
     // Before writing, let's clear the display
     _lcd->clear();
 
+    // TODO: Remove all the prints!
+
+    // Print the message to the serial
+    Serial.print("Writing message to LCD: ");
+    Serial.println(message);
+
+    // Debug: Print each character's ASCII value
+    Serial.print("Character values: ");
+    for (size_t i = 0; i < strlen(message); i++) {
+      Serial.print((int)message[i]);
+      Serial.print(" ");
+    }
+    Serial.println();
+
     size_t message_length = strlen(message);
     size_t cur_idx = 0; // Current index in the message
 
@@ -102,12 +116,31 @@ class drvOutCharLcd : public drvOutputBase {
       for (int cur_col = 0; cur_col < _cols && cur_idx < message_length;
            cur_col++) {
         char c = message[cur_idx];
+
+        // Debug: Print the character we're processing
+        Serial.print("Processing char at position ");
+        Serial.print(cur_idx);
+        Serial.print(": '");
         if (c == '\n') {
+          Serial.print("\\n");
+        } else {
+          Serial.print(c);
+        }
+        Serial.print("' (");
+        Serial.print((int)c);
+        Serial.println(")");
+
+        if (c == '\\' && message[cur_idx + 1] == 'n') {
+          Serial.println("Found newline, moving to next row");
+          cur_idx += 2; // Skip the '\n' character in the buffer
+          break;        // and move to the next row
+        } else if (c == 194 && message[cur_idx + 1] == 176) {
+          cur_idx += 2;      // Skip the degree symbol sequence in the buffer
+          _lcd->write(0xDF); // and write the degree symbol
+        } else {
+          _lcd->write(c);
           cur_idx++;
-          break;
         }
-        _lcd->write(c);
-        cur_idx++;
       }
     }
   }

src/components/i2c/drivers/drvOutputBase.h

@@ -103,11 +103,25 @@ class drvOutputBase : public drvBase {
 
   /*!
       @brief    Writes a message to the LCD.
-      @param    message
-                The message to be displayed.
+      @param    write_char_lcd
+                Pointer to a wippersnapper_i2c_output_CharLCDWrite message.
   */
-  virtual void WriteMessageCharLCD(const char *message) override {
-    // noop
+  bool
+  WriteMessageCharLCD(wippersnapper_i2c_output_CharLCDWrite *write_char_lcd) {
+    switch (write_char_lcd->which_message) {
+    case wippersnapper_i2c_output_CharLCDWrite_text_tag:
+      WriteMessage(write_char_lcd->message.text);
+      break;
+    case wippersnapper_i2c_output_CharLCDWrite_number_int_tag:
+      // WriteValue(write_char_lcd->message.number_int);
+      break;
+    case wippersnapper_i2c_output_CharLCDWrite_number_float_tag:
+      // WriteValue(write_char_lcd->message.number_float);
+      break;
+    default:
+      return false;
+    }
+    return true;
   }
 
   /*!

src/protos/i2c.pb.h

@@ -129,10 +129,11 @@ typedef struct _wippersnapper_i2c_I2cDeviceEvent {
 typedef struct _wippersnapper_i2c_I2cDeviceOutputWrite {
     bool has_i2c_device_description;
     wippersnapper_i2c_I2cDeviceDescriptor i2c_device_description; /* * Required - The I2c device's address and metadata. */
-    bool has_led_backpack_write;
-    wippersnapper_i2c_output_LedBackpackWrite led_backpack_write; /* * Optional - If the I2C device is a LED backpack, fill this field. * */
-    bool has_char_lcd_write;
-    wippersnapper_i2c_output_CharLCDWrite char_lcd_write; /* * Optional - If the I2C device is a character LCD, fill this field. * */
+    pb_size_t which_output_msg;
+    union {
+        wippersnapper_i2c_output_LedBackpackWrite write_led_backpack; /* * Optional - If the I2C device is a LED backpack, fill this field. * */
+        wippersnapper_i2c_output_CharLCDWrite write_char_lcd; /* * Optional - If the I2C device is a character LCD, fill this field. * */
+    } output_msg;
 } wippersnapper_i2c_I2cDeviceOutputWrite;
 
 
@@ -174,7 +175,7 @@ extern "C" {
 #define wippersnapper_i2c_I2cDeviceRemove_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 0}
 #define wippersnapper_i2c_I2cDeviceRemoved_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 0}
 #define wippersnapper_i2c_I2cDeviceEvent_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 0, {wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default, wippersnapper_sensor_SensorEvent_init_default}}
-#define wippersnapper_i2c_I2cDeviceOutputWrite_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, false, wippersnapper_i2c_output_LedBackpackWrite_init_default, false, wippersnapper_i2c_output_CharLCDWrite_init_default}
+#define wippersnapper_i2c_I2cDeviceOutputWrite_init_default {false, wippersnapper_i2c_I2cDeviceDescriptor_init_default, 0, {wippersnapper_i2c_output_LedBackpackWrite_init_default}}
 #define wippersnapper_i2c_I2cDeviceDescriptor_init_zero {"", "", 0, 0, 0}
 #define wippersnapper_i2c_I2cBusDescriptor_init_zero {"", ""}
 #define wippersnapper_i2c_I2cBusScan_init_zero   {0, 0, false, wippersnapper_i2c_I2cBusDescriptor_init_zero, 0, 0}
@@ -184,7 +185,7 @@ extern "C" {
 #define wippersnapper_i2c_I2cDeviceRemove_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0}
 #define wippersnapper_i2c_I2cDeviceRemoved_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0}
 #define wippersnapper_i2c_I2cDeviceEvent_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0, {wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero, wippersnapper_sensor_SensorEvent_init_zero}}
-#define wippersnapper_i2c_I2cDeviceOutputWrite_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, false, wippersnapper_i2c_output_LedBackpackWrite_init_zero, false, wippersnapper_i2c_output_CharLCDWrite_init_zero}
+#define wippersnapper_i2c_I2cDeviceOutputWrite_init_zero {false, wippersnapper_i2c_I2cDeviceDescriptor_init_zero, 0, {wippersnapper_i2c_output_LedBackpackWrite_init_zero}}
 
 /* Field tags (for use in manual encoding/decoding) */
 #define wippersnapper_i2c_I2cDeviceDescriptor_i2c_bus_sda_tag 1
@@ -218,8 +219,8 @@ extern "C" {
 #define wippersnapper_i2c_I2cDeviceEvent_i2c_device_description_tag 1
 #define wippersnapper_i2c_I2cDeviceEvent_i2c_device_events_tag 2
 #define wippersnapper_i2c_I2cDeviceOutputWrite_i2c_device_description_tag 1
-#define wippersnapper_i2c_I2cDeviceOutputWrite_led_backpack_write_tag 2
-#define wippersnapper_i2c_I2cDeviceOutputWrite_char_lcd_write_tag 3
+#define wippersnapper_i2c_I2cDeviceOutputWrite_write_led_backpack_tag 2
+#define wippersnapper_i2c_I2cDeviceOutputWrite_write_char_lcd_tag 3
 
 /* Struct field encoding specification for nanopb */
 #define wippersnapper_i2c_I2cDeviceDescriptor_FIELDLIST(X, a) \
@@ -299,13 +300,13 @@ X(a, STATIC,   REPEATED, MESSAGE,  i2c_device_events,   2)
 
 #define wippersnapper_i2c_I2cDeviceOutputWrite_FIELDLIST(X, a) \
 X(a, STATIC,   OPTIONAL, MESSAGE,  i2c_device_description,   1) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  led_backpack_write,   2) \
-X(a, STATIC,   OPTIONAL, MESSAGE,  char_lcd_write,    3)
+X(a, STATIC,   ONEOF,    MESSAGE,  (output_msg,write_led_backpack,output_msg.write_led_backpack),   2) \
+X(a, STATIC,   ONEOF,    MESSAGE,  (output_msg,write_char_lcd,output_msg.write_char_lcd),   3)
 #define wippersnapper_i2c_I2cDeviceOutputWrite_CALLBACK NULL
 #define wippersnapper_i2c_I2cDeviceOutputWrite_DEFAULT NULL
 #define wippersnapper_i2c_I2cDeviceOutputWrite_i2c_device_description_MSGTYPE wippersnapper_i2c_I2cDeviceDescriptor
-#define wippersnapper_i2c_I2cDeviceOutputWrite_led_backpack_write_MSGTYPE wippersnapper_i2c_output_LedBackpackWrite
-#define wippersnapper_i2c_I2cDeviceOutputWrite_char_lcd_write_MSGTYPE wippersnapper_i2c_output_CharLCDWrite
+#define wippersnapper_i2c_I2cDeviceOutputWrite_output_msg_write_led_backpack_MSGTYPE wippersnapper_i2c_output_LedBackpackWrite
+#define wippersnapper_i2c_I2cDeviceOutputWrite_output_msg_write_char_lcd_MSGTYPE wippersnapper_i2c_output_CharLCDWrite
 
 extern const pb_msgdesc_t wippersnapper_i2c_I2cDeviceDescriptor_msg;
 extern const pb_msgdesc_t wippersnapper_i2c_I2cBusDescriptor_msg;
@@ -338,7 +339,7 @@ extern const pb_msgdesc_t wippersnapper_i2c_I2cDeviceOutputWrite_msg;
 #define wippersnapper_i2c_I2cDeviceAddOrReplace_size 141
 #define wippersnapper_i2c_I2cDeviceAddedOrReplaced_size 56
 #define wippersnapper_i2c_I2cDeviceDescriptor_size 50
-#define wippersnapper_i2c_I2cDeviceOutputWrite_size 147
+#define wippersnapper_i2c_I2cDeviceOutputWrite_size 100
 #define wippersnapper_i2c_I2cDeviceRemove_size   54
 #define wippersnapper_i2c_I2cDeviceRemoved_size  54
 #if defined(wippersnapper_sensor_SensorEvent_size)

src/protos/i2c_output.pb.h

@@ -77,7 +77,7 @@ typedef struct _wippersnapper_i2c_output_LedBackpackWrite {
 typedef struct _wippersnapper_i2c_output_CharLCDWrite {
     pb_size_t which_message;
     union {
-        char text[20]; /* * Text to write to the character LCD. * */
+        char text[100]; /* * Text to write to the character LCD. * */
         int32_t number_int; /* * Number to write to the character LCD. * */
         float number_float; /* * Float to write to the character LCD. * */
     } message;

src/protos/signal.pb.h

@@ -257,7 +257,7 @@ extern const pb_msgdesc_t wippersnapper_signal_DeviceToBroker_msg;
 
 /* Maximum encoded size of messages (where known) */
 #if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_digitalio_DigitalIOWrite_size) && defined(wippersnapper_uart_UARTAdd_size) && defined(wippersnapper_uart_UARTRemove_size)
-union wippersnapper_signal_BrokerToDevice_payload_size_union {char f12[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f13[(6 + wippersnapper_digitalio_DigitalIOWrite_size)]; char f80[(7 + wippersnapper_uart_UARTAdd_size)]; char f81[(7 + wippersnapper_uart_UARTRemove_size)]; char f0[151];};
+union wippersnapper_signal_BrokerToDevice_payload_size_union {char f12[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f13[(6 + wippersnapper_digitalio_DigitalIOWrite_size)]; char f80[(7 + wippersnapper_uart_UARTAdd_size)]; char f81[(7 + wippersnapper_uart_UARTRemove_size)]; char f0[145];};
 #endif
 #if defined(wippersnapper_digitalio_DigitalIOEvent_size) && defined(wippersnapper_analogio_AnalogIOEvent_size) && defined(wippersnapper_ds18x20_Ds18x20Event_size) && defined(wippersnapper_uart_UARTAdded_size) && defined(wippersnapper_uart_UARTEvent_size) && defined(wippersnapper_i2c_I2cDeviceEvent_size)
 union wippersnapper_signal_DeviceToBroker_payload_size_union {char f10[(6 + wippersnapper_digitalio_DigitalIOEvent_size)]; char f20[(7 + wippersnapper_analogio_AnalogIOEvent_size)]; char f80[(7 + wippersnapper_ds18x20_Ds18x20Event_size)]; char f90[(7 + wippersnapper_uart_UARTAdded_size)]; char f100[(7 + wippersnapper_uart_UARTEvent_size)]; char f113[(7 + wippersnapper_i2c_I2cDeviceEvent_size)]; char f0[6246];};