Merge pull request #80 from AEFeinstein/ninth-led

Ninth led
AEFeinstein · Sep 25, 2023 · 6fc5353 · 6fc5353
2 parents 6c769d3 + d3d5d09
commit 6fc5353
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 7 deletions.
diff --git a/components/hdw-led/hdw-led.c b/components/hdw-led/hdw-led.c
@@ -20,10 +20,10 @@
 // Variables
 //==============================================================================
 
-static rmt_channel_handle_t led_chan    = NULL;
-static rmt_encoder_handle_t led_encoder = NULL;
-static uint8_t ledBrightness            = 0;
-static led_t localLeds[CONFIG_NUM_LEDS] = {0};
+static rmt_channel_handle_t led_chan        = NULL;
+static rmt_encoder_handle_t led_encoder     = NULL;
+static uint8_t ledBrightness                = 0;
+static led_t localLeds[CONFIG_NUM_LEDS + 1] = {0};
 
 //==============================================================================
 // Functions
@@ -108,9 +108,9 @@ esp_err_t setLeds(led_t* leds, uint8_t numLeds)
     };
 
     // Make sure to not overflow
-    if (numLeds > CONFIG_NUM_LEDS)
+    if (numLeds > CONFIG_NUM_LEDS + 1)
     {
-        numLeds = CONFIG_NUM_LEDS;
+        numLeds = CONFIG_NUM_LEDS + 1;
     }
 
     // Fill a local copy of LEDs with brightness applied
@@ -121,6 +121,27 @@ esp_err_t setLeds(led_t* leds, uint8_t numLeds)
         localLeds[i].b = (leds[i].b >> ledBrightness);
     }
 
+    // If all eight LEDs are being set, but not the 9th
+    if (CONFIG_NUM_LEDS == numLeds)
+    {
+        // Set the 9th LED to the average of the 6th, 7th, and 8th
+        int32_t avgR = 0;
+        int32_t avgG = 0;
+        int32_t avgB = 0;
+        for (int32_t lIdx = 5; lIdx < 8; lIdx++)
+        {
+            avgR += leds[lIdx].r;
+            avgG += leds[lIdx].g;
+            avgB += leds[lIdx].b;
+        }
+        localLeds[CONFIG_NUM_LEDS].r = (avgR / 3) >> ledBrightness;
+        localLeds[CONFIG_NUM_LEDS].g = (avgG / 3) >> ledBrightness;
+        localLeds[CONFIG_NUM_LEDS].b = (avgB / 3) >> ledBrightness;
+
+        // Set the 9th LED too
+        numLeds = CONFIG_NUM_LEDS + 1;
+    }
+
     // Write RGB values to LEDs
     return rmt_transmit(led_chan, led_encoder, (uint8_t*)localLeds, numLeds * sizeof(led_t), &tx_config);
 }
diff --git a/components/hdw-led/include/hdw-led.h b/components/hdw-led/include/hdw-led.h
@@ -25,6 +25,10 @@
  * Brightness is adjusted per-color-channel, so dimming may produce different colors.
  * setLedBrightnessSetting() should be called instead if the brightness change should be persistent through reboots.
  *
+ * Even though \c CONFIG_NUM_LEDS declares eight LEDs, there is a ninth LED which is controllable. By default, setting
+ * \c CONFIG_NUM_LEDS LEDs will automatically set the ninth to the average of the sixth, seventh, and eighth, which
+ * surround it on the PCB. To set the ninth LED, set `CONFIG_NUM_LEDS + 1` LEDs.
+ *
  * \section led_example Example
  *
  * Set the LEDs to a rough rainbow:

diff --git a/components/hdw-mic/hdw-mic.c b/components/hdw-mic/hdw-mic.c
@@ -62,7 +62,7 @@ void initMic(gpio_num_t gpio)
         adc_digi_pattern_config_t adc_pattern[SOC_ADC_PATT_LEN_MAX] = {0};
 
         // Configure the ADC pattern. We only configure a single channel
-        adc_pattern[0].atten     = ADC_ATTEN_DB_0;
+        adc_pattern[0].atten     = ADC_ATTEN_DB_11;
         adc_pattern[0].channel   = channel;
         adc_pattern[0].unit      = unit;
         adc_pattern[0].bit_width = SOC_ADC_DIGI_MAX_BITWIDTH;