commit 7ab356d15514677a14cebe962d2f4c638374e060
author Wyatt Hepler <hepler@google.com> Fri Aug 02 00:54:02 2024 +0000
committer CQ Bot Account <pigweed-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Aug 02 00:54:02 2024 +0000
tree 28c5fbd10a6524af31015544a9f562df56817dfb
parent 243758928bc391a5daef7853c7db721d72ef6363

modules/led: Remove unused PulseBetween mode; rename "hex" to "color"

Change-Id: I7a6dd4a43171f78e0b5299da7ebb6f99b55e3265
Reviewed-on: https://pigweed-internal-review.git.corp.google.com/c/pigweed/showcase/rp2/+/73648
Commit-Queue: Auto-Submit <auto-submit@pw-internal-service-accounts.iam.gserviceaccount.com>
Presubmit-Verified: CQ Bot Account <pigweed-internal-scoped@luci-project-accounts.iam.gserviceaccount.com>
Reviewed-by: Keir Mierle <keir@google.com>
Pigweed-Auto-Submit: Wyatt Hepler <hepler@google.com>

modules/led/polychrome_led.cc

diff --git a/modules/led/polychrome_led.cc b/modules/led/polychrome_led.cc
index e0fce89..2962733 100644
--- a/modules/led/polychrome_led.cc
+++ b/modules/led/polychrome_led.cc
@@ -67,22 +67,22 @@
   }
 }
 
-void PolychromeLed::SetColor(uint32_t hex) {
+void PolychromeLed::SetColor(uint32_t color_hex) {
   red_.ClearCallback();
-  if (hex_ == hex) {
+  if (color_ == color_hex) {
     return;
   }
 
-  hex_ = hex;
+  color_ = color_hex;
   if (state_ == kOn) {
     Update();
   }
 }
 
-void PolychromeLed::Pulse(uint32_t hex, uint32_t interval_ms) {
+void PolychromeLed::Pulse(uint32_t color_hex, uint32_t interval_ms) {
   TurnOff();
   brightness_ = 0;
-  hex_ = hex;
+  color_ = color_hex;
   red_.SetCallback(
       [this]() {
         static uint16_t counter = 0;
@@ -99,54 +99,25 @@
   TurnOn();
 }
 
-void PolychromeLed::PulseBetween(uint32_t hex1,
-                                 uint32_t hex2,
-                                 uint32_t interval_ms) {
-  TurnOff();
-  brightness_ = 0;
-  hex_ = hex1;
-  alternate_hex_ = hex2;
-  red_.SetCallback(
-      [this]() {
-        static uint16_t counter = 0;
-        if (counter < 0x100) {
-          brightness_ = static_cast<uint8_t>(counter);
-        } else if (counter < 0x200) {
-          brightness_ = static_cast<uint8_t>(0x200 - counter);
-        }
-        ++counter;
-        if (counter == 0x200) {
-          uint32_t hex = hex_;
-          hex_ = alternate_hex_;
-          alternate_hex_ = hex;
-        }
-        Update();
-        counter %= 0x200;
-      },
-      0x200,
-      interval_ms);
-  TurnOn();
-}
-
 void PolychromeLed::Rainbow(uint32_t interval_ms) {
   TurnOff();
   brightness_ = 0xff;
-  hex_ = 0xff0000;
+  color_ = 0xff0000;
   red_.SetCallback(
       [this]() {
         static uint16_t counter = 0;
         if (counter < 0x100) {
-          hex_ = 0xff0000 + (counter << 8);
+          color_ = 0xff0000 + (counter << 8);
         } else if (counter < 0x200) {
-          hex_ = 0xffff00 - ((counter - 0x100) << 16);
+          color_ = 0xffff00 - ((counter - 0x100) << 16);
         } else if (counter < 0x300) {
-          hex_ = 0x00ff00 + (counter - 0x200);
+          color_ = 0x00ff00 + (counter - 0x200);
         } else if (counter < 0x400) {
-          hex_ = 0x00ffff - ((counter - 0x300) << 8);
+          color_ = 0x00ffff - ((counter - 0x300) << 8);
         } else if (counter < 0x500) {
-          hex_ = 0x0000ff + ((counter - 0x400) << 16);
+          color_ = 0x0000ff + ((counter - 0x400) << 16);
         } else {
-          hex_ = 0xff00ff - (counter - 0x500);
+          color_ = 0xff00ff - (counter - 0x500);
         }
         Update();
         counter = (counter + 1) % 0x600;
@@ -157,14 +128,14 @@
 }
 
 void PolychromeLed::Update() {
-  PW_LOG_DEBUG("LED update: rgb=%06x brightness=%hu", hex_, brightness_);
-  red_.SetLevel(GammaCorrect(hex_ >> kRedShift));
-  green_.SetLevel(GammaCorrect(hex_ >> kGreenShift));
-  blue_.SetLevel(GammaCorrect(hex_ >> kBlueShift));
+  PW_LOG_DEBUG("LED update: rgb=%06x brightness=%hu", color_, brightness_);
+  red_.SetLevel(GammaCorrect(color_ >> kRedShift));
+  green_.SetLevel(GammaCorrect(color_ >> kGreenShift));
+  blue_.SetLevel(GammaCorrect(color_ >> kBlueShift));
 }
 
 void PolychromeLed::UpdateZeroBrightness() {
-  PW_LOG_DEBUG("LED update: rgb=%06x brightness=0", hex_);
+  PW_LOG_DEBUG("LED update: rgb=%06x brightness=0", color_);
   red_.SetLevel(0);
   green_.SetLevel(0);
   blue_.SetLevel(0);

modules/led/polychrome_led.h

diff --git a/modules/led/polychrome_led.h b/modules/led/polychrome_led.h
index adc2ae3..81459b2 100644
--- a/modules/led/polychrome_led.h
+++ b/modules/led/polychrome_led.h
@@ -71,15 +71,12 @@
   }
 
   /// Sets the RGB LED using a 24-bit hex color code.
-  void SetColor(uint32_t hex);
+  void SetColor(uint32_t color_hex);
 
   /// Fades the LED on and off continuously.
   ///
   /// @param interval_ms The duration of a fade cycle, in milliseconds.
-  void Pulse(uint32_t hex, uint32_t interval_ms);
-
-  /// Cycles back and forth between two colors.
-  void PulseBetween(uint32_t hex1, uint32_t hex2, uint32_t interval_ms);
+  void Pulse(uint32_t color_hex, uint32_t interval_ms);
 
   /// Cycles thorugh all the colors.
   void Rainbow(uint32_t interval_ms);
@@ -98,8 +95,7 @@
   PwmDigitalOut& red_;
   PwmDigitalOut& green_;
   PwmDigitalOut& blue_;
-  uint32_t hex_ = 0;
-  uint32_t alternate_hex_ = 0;
+  uint32_t color_ = 0;
   uint8_t brightness_ = 0;
   enum : uint8_t { kDisabled, kOff, kOn } state_ = kDisabled;
 };