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

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

Browse Source 
Conflicts:
	components/services/monitor.c
	components/telnet/telnet.c
	components/telnet/telnet.h
This commit is contained in:
Sebastien
2020-02-12 18:03:22 -05:00
parent 730b6d38a5 1af1fd1639
commit 1d803af331
81 changed files with 2376 additions and 7661 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/cmd_i2c/cmd_i2ctools.c
View File

@@ -32,7 +32,7 @@ static const char *TAG = "cmd_i2ctools";
static gpio_num_t i2c_gpio_sda = 19;
static gpio_num_t i2c_gpio_scl = 18;
static uint32_t i2c_frequency = 100000;
#ifdef CONFIG_SQUEEZEAMP
#ifdef CONFIG_I2C_LOCKED
static i2c_port_t i2c_port = I2C_NUM_1;
#else
static i2c_port_t i2c_port = I2C_NUM_0;