diff --git a/build-scripts/Muse-sdkconfig.defaults b/build-scripts/Muse-sdkconfig.defaults index fbe0f755..ddbe0a78 100644 --- a/build-scripts/Muse-sdkconfig.defaults +++ b/build-scripts/Muse-sdkconfig.defaults @@ -204,7 +204,7 @@ CONFIG_AMP_GPIO=21 CONFIG_JACK_GPIO=34 CONFIG_SPKFAULT_GPIO=-1 CONFIG_BAT_CHANNEL=-1 -CONFIG_LED_GREEN_GPIO=22 +CONFIG_LED_GREEN_GPIO=-1 CONFIG_LED_RED_GPIO=-1 CONFIG_TARGET="muse" # end of Target diff --git a/components/targets/muse/muse.c b/components/targets/muse/muse.c index 3501fe2d..b2a180e1 100644 --- a/components/targets/muse/muse.c +++ b/components/targets/muse/muse.c @@ -52,51 +52,27 @@ const struct target_s target_muse = { "muse", init }; static bool init(void) { battery_handler_chain = battery_handler_svc; battery_handler_svc = battery_svc; + ws2812_control_init(); ESP_LOGI(TAG, "Initializing for Muse"); return true; } -static void battery_svc(float value) { - ESP_LOGI(TAG, "Called for battery service with %f", value); - // put here your code for LED according to value - if (battery_handler_chain) battery_handler_chain(value); -} +#define VGREEN 4.0 +#define VRED 3.6 + +static void battery_svc(float value) { + struct led_state new_state; + + ESP_LOGI(TAG, "Called for battery service with %f", value); + + if (value > VGREEN) new_state.leds[0] = GREEN; + else if (value < VRED) new_state.leds[0] = RED; + else new_state.leds[0] = YELLOW; -// Battery monitoring -/* -static void battery(void *data) -{ -#define VGREEN 2300 -#define VRED 2000 -#define NM 10 - static int val; - static int V[NM]; - static int I=0; - int S; - for(int i=0;i= NM)I = 0; - S = 0; - for(int i=0;i VGREEN) new_state.leds[0] = GREEN; - if(val < VRED) new_state.leds[0] = RED; - printf("====> %d %6x\n", val, new_state.leds[0]); ws2812_write_leds(new_state); - } + if (battery_handler_chain) battery_handler_chain(value); } -*/ // This is the buffer which the hw peripheral will access while pulsing the output pin rmt_item32_t led_data_buffer[LED_BUFFER_ITEMS]; @@ -139,5 +115,5 @@ void setup_rmt_data_buffer(struct led_state new_state) mask >>= 1; } } - } +} diff --git a/main/Kconfig.projbuild b/main/Kconfig.projbuild index 2fd73169..8209a124 100644 --- a/main/Kconfig.projbuild +++ b/main/Kconfig.projbuild @@ -138,7 +138,7 @@ menu "Squeezelite-ESP32" config BAT_CONFIG string default "channel=7,scale=20.24,atten=0" if SQUEEZEAMP - default "channel=5,scale=1,atten=3,cells=1" if MUSE + default "channel=5,scale=7.48,atten=3,cells=1" if MUSE default "" config TARGET string @@ -163,7 +163,6 @@ menu "Squeezelite-ESP32" config LED_GREEN_GPIO int default 12 if SQUEEZEAMP - default 22 if MUSE default -1 config LED_RED_GPIO int