Update firmware to match previous PB commit's updated PBs

Author: brentru

src/components/i2c/controller.cpp

@@ -834,11 +834,8 @@ bool I2cController::Handle_I2cDeviceOutputWrite(pb_istream_t *stream) {
   if (_i2c_model->GetI2cDeviceOutputWriteMsg()->which_output_msg ==
       wippersnapper_i2c_I2cDeviceOutputWrite_write_led_backpack_tag) {
     WS_DEBUG_PRINTLN("[i2c] Writing to LED backpack...");
-    if (!driver->LedBackpackWrite(&_i2c_model->GetI2cDeviceOutputWriteMsg()
-                                       ->output_msg.write_led_backpack)) {
-      WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to write to LED backpack!");
-      return false;
-    }
+    driver->WriteMessage(_i2c_model->GetI2cDeviceOutputWriteMsg()
+                             ->output_msg.write_led_backpack.message);
   } else if (_i2c_model->GetI2cDeviceOutputWriteMsg()->which_output_msg ==
              wippersnapper_i2c_I2cDeviceOutputWrite_write_char_lcd_tag) {
     WS_DEBUG_PRINTLN("[i2c] Writing to char LCD...");

src/components/i2c/drivers/drvOutCharLcd.h

@@ -82,6 +82,22 @@ class drvOutCharLcd : public drvOutputBase {
     _enable_backlight = enable_backlight;
   }
 
+  /*!
+       @brief    Enables or disables the backlight on a character LCD.
+       @param    enable_backlight
+                   True to enable the backlight, False to disable it.
+ */
+  void EnableBackLightCharLCD(bool enable_backlight) {
+    if (_lcd == nullptr)
+      return;
+    if (_enable_backlight) {
+      _lcd->setBacklight(HIGH);
+    } else {
+      _lcd->setBacklight(LOW);
+    }
+    _enable_backlight = enable_backlight;
+  }
+
   /*!
       @brief    Writes a message to the LCD.
       @param    message
@@ -94,11 +110,6 @@ class drvOutCharLcd : public drvOutputBase {
     // 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 Char. LCD: ");
-    Serial.println(message);
-
     size_t message_length = strlen(message);
     size_t cur_idx = 0; // Current index in the message
 

src/components/i2c/drivers/drvOutputBase.h

@@ -102,6 +102,15 @@ class drvOutputBase : public drvBase {
     // noop
   }
 
+  /*!
+       @brief    Enables or disables the backlight on a character LCD.
+       @param    enable_backlight
+                   True to enable the backlight, False to disable it.
+ */
+  void EnableBackLightCharLCD(bool enable_backlight) {
+    // noop
+  }
+
   /*!
       @brief    Writes a message to the LCD.
       @param    write_char_lcd
@@ -110,10 +119,8 @@ class drvOutputBase : public drvBase {
   */
   bool
   WriteMessageCharLCD(wippersnapper_i2c_output_CharLCDWrite *write_char_lcd) {
+    EnableBackLightCharLCD(write_char_lcd->enable_backlight);
     WriteMessage(write_char_lcd->message);
-    // NOTE: While this isn't calling any other funcs in here and ret'ing true,
-    // I want to keep this function high-level for when we implement backlight
-    // color and scrolling.
     return true;
   }
 
@@ -126,42 +133,6 @@ class drvOutputBase : public drvBase {
     // noop
   }
 
-  /*!
-      @brief    High-level fn, executes a call to the appropriate driver
-     function(s) based on the message data type to write.
-      @param    msg_backpack_write
-                Pointer to a wippersnapper_i2c_output_LedBackpackWrite message.
-      @returns  True if the message was written successfully, False otherwise.
-  */
-  bool LedBackpackWrite(
-      wippersnapper_i2c_output_LedBackpackWrite *msg_backpack_write) {
-    // Check if we should adjust brightness
-    if (msg_backpack_write->adjust_brightness)
-      SetLedBackpackBrightness((uint8_t)msg_backpack_write->brightness);
-
-    // Write the message to a LED backpack
-    switch (msg_backpack_write->which_message) {
-    case wippersnapper_i2c_output_LedBackpackWrite_text_tag:
-      WS_DEBUG_PRINTLN("[i2c] Writing text to LED backpack...");
-      WriteMessage(msg_backpack_write->message.text);
-      break;
-    case wippersnapper_i2c_output_LedBackpackWrite_number_int_tag:
-      WS_DEBUG_PRINTLN("[i2c] Writing int to LED backpack...");
-      WriteValue(msg_backpack_write->message.number_int);
-      break;
-    case wippersnapper_i2c_output_LedBackpackWrite_number_float_tag:
-      WS_DEBUG_PRINTLN("[i2c] Writing float to LED backpack...");
-      WriteValue(msg_backpack_write->message.number_float);
-      break;
-    default:
-      WS_DEBUG_PRINTLN("[i2c] ERROR: Unable to determine LED backpack "
-                       "message type!");
-      return false;
-      break;
-    }
-    return true;
-  }
-
 protected:
 };
 #endif // DRV_OUTPUT_BASE_H