Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2025-12-15 16:07:05 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into httpd

Browse Source 
Conflicts:
	Makefile
This commit is contained in:
Sebastien
2020-02-07 12:53:33 -05:00
parent 4963579e20 e51604dd3d
commit fdbb24962a
12 changed files with 72 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/services/audio_controls.c
View File

@@ -148,7 +148,7 @@ static void control_rotary_handler(void *client, rotary_event_e event, bool long
case ROTARY_PRESSED:
if (long_press) rotary.long_state = !rotary.long_state;
else if (rotary.volume_lock) action = ACTRLS_TOGGLE;
else action = KNOB_RIGHT;
else action = KNOB_PUSH;
break;
default:
break;

3
components/services/buttons.c
View File

@@ -81,7 +81,8 @@ static void IRAM_ATTR gpio_isr_handler(void* arg)
if (xTimerGetPeriod(button->timer) > button->debounce / portTICK_RATE_MS) xTimerChangePeriodFromISR(button->timer, button->debounce / portTICK_RATE_MS, &woken); // does that restart the timer?
else xTimerResetFromISR(button->timer, &woken);
// ESP_EARLY_LOGI(TAG, "INT gpio %u level %u", button->gpio, button->level);
if (woken) portYIELD_FROM_ISR();
ESP_EARLY_LOGD(TAG, "INT gpio %u level %u", button->gpio, button->level);
}
/****************************************************************************************

2
components/services/services.c
View File

@@ -70,7 +70,7 @@ void services_init(void) {
i2c_param_config(i2c_system_port, i2c_config);
i2c_driver_install(i2c_system_port, i2c_config->mode, 0, 0, 0 );
} else {
ESP_LOGE(TAG, "can't initialize I2C");
ESP_LOGW(TAG, "no I2C configured");
}
ESP_LOGD(TAG,"Configuring LEDs");