diff --git a/CMakeLists.txt b/CMakeLists.txt index 517d109d..204ba9f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -11,7 +11,7 @@ add_definitions(-DMODEL_NAME=SqueezeESP32) #add_definitions(-DNETWORK_HANDLERS_LOG_LEVEL=ESP_LOG_DEBUG) #add_definitions(-DNETWORK_WIFI_LOG_LEVEL=ESP_LOG_DEBUG) #add_definitions(-DNETWORK_MANAGER_LOG_LEVEL=ESP_LOG_DEBUG) - +add_definitions(-DNETWORK_HTTP_SERVER_LOG_LEVEL=ESP_LOG_DEBUG) if(NOT DEFINED DEPTH) set(DEPTH "16") diff --git a/components/platform_console/CMakeLists.txt b/components/platform_console/CMakeLists.txt index b46cdced..ad32232c 100644 --- a/components/platform_console/CMakeLists.txt +++ b/components/platform_console/CMakeLists.txt @@ -11,3 +11,4 @@ idf_component_register( SRCS PRIV_REQUIRES console app_update tools services spi_flash platform_config vfs pthread wifi-manager platform_config newlib telnet display squeezelite services) target_link_libraries(${COMPONENT_LIB} "-Wl,--undefined=GDS_DrawPixelFast") target_link_libraries(${COMPONENT_LIB} ${build_dir}/esp-idf/$/lib$.a ) +target_add_binary_data( __idf_platform_console presets.json BINARY) diff --git a/components/platform_console/cmd_config.c b/components/platform_console/cmd_config.c index 9b7c6c19..fa5486f5 100644 --- a/components/platform_console/cmd_config.c +++ b/components/platform_console/cmd_config.c @@ -20,6 +20,7 @@ #include "adac.h" #include "globdefs.h" #include "cJSON.h" +#include "cmd_i2ctools.h" const char * desc_squeezelite ="Squeezelite Options"; const char * desc_dac= "DAC Options"; @@ -48,11 +49,9 @@ extern const struct adac_s *dac_set[]; #define CODECS_DSD "" #endif #define CODECS_MP3 "|mad|mpg" -#ifdef CONFIG_SQUEEZEAMP -static const char * known_configs = ""; -#else -static const char * known_configs_string = "[{\"name\":\"ESP32A1S Old Model config 1 (AC101)\",\"config\":[{\"dac_config\":\"AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32\"},{\"dac_controlset\":\"\"},{\"set_GPIO\":\"\"},{\"spdif_config\":\"21=amp,22=green:0,39=jack:0\"}]},{\"name\":\"ESP32A1S Old Model config 2 (AC101)\",\"config\":[{\"dac_config\":\"AC101,bck=27,ws=26,do=25,di=35,sda=33,scl=32\"},{\"dac_controlset\":\"\"},{\"set_GPIO\":\"\"},{\"spdif_config\":\"21=amp,22=green:0,5=jack:0\"}]},{\"name\":\"ESP32A1S V2.2+ variant 1 (ES8388)\",\"config\":[{\"dac_config\":\"model=ES8388,bck=27,ws=25,do=26,sda=33,scl=32,di=35,i2c=16\"},{\"dac_controlset\":\"\"},{\"set_GPIO\":\"21=amp,22=green:0,39=jack:0\"},{\"spdif_config\":\"\"}]},{\"name\":\"ESP32A1S V2.2+ variant 2 (ES8388)\",\"config\":[{\"dac_config\":\"model=ES8388,bck=5,ws=25,do=26,sda=18,scl=23,i2c=16\"},{\"dac_controlset\":\"\"},{\"set_GPIO\":\"21=amp,22=green:0,39=jack:0\"},{\"spdif_config\":\"\"}]}]"; -#endif +extern const uint8_t _presets_json_start[] asm("_binary_presets_json_start"); +extern const uint8_t _presets_json__end[] asm("_binary_presets_json__end"); + #if !defined(MODEL_NAME) @@ -948,8 +947,14 @@ void replace_char_in_string(char * str, char find, char replace){ } static cJSON * get_known_configurations(FILE * f){ +#ifndef CONFIG_SQUEEZEAMP #define err1_msg "Failed to parse known_configs json. %s\nError at:\n%s" #define err2_msg "Known configs should be an array and it is not: \n%s" + +//extern const uint8_t _presets_json_start[] asm("_binary_presets_json_start"); +//extern const uint8_t _presets_json__end[] asm("_binary_presets_json__end"); + const char * known_configs_string = (const char *)_presets_json_start; + if(!known_configs_string || strlen(known_configs_string)==0){ return NULL; } @@ -977,7 +982,10 @@ static cJSON * get_known_configurations(FILE * f){ } return known_configs_json; - +#else + return NULL; +#endif + } static cJSON * find_known_model_name(cJSON * root,const char * name, FILE * f, bool * found){ @@ -1006,9 +1014,6 @@ static esp_err_t is_known_model_name(const char * name, FILE * f, bool * found){ if(found){ *found = false; } - if(!known_configs_string || strlen(known_configs_string)==0){ - return err; - } cJSON * known_configs_json = get_known_configurations(f); if(known_configs_json){ cJSON * known_item = find_known_model_name(known_configs_json,name,f,found); @@ -1023,9 +1028,7 @@ static esp_err_t is_known_model_name(const char * name, FILE * f, bool * found){ static esp_err_t save_known_config(const char * name, FILE * f){ esp_err_t err = ESP_OK; char * json_string=NULL; - if(!known_configs_string || strlen(known_configs_string)==0){ - return err; - } + cJSON * known_configs_json = get_known_configurations(f); if(known_configs_json){ bool found = false; @@ -1145,6 +1148,14 @@ static int do_register_known_templates_config(int argc, char **argv){ fprintf(f,"Appling template configuration for %s\n",known_model_args.model_name->sval[0]); nerrors+=((err=save_known_config(known_model_args.model_name->sval[0],f))!=ESP_OK); } + if(nerrors==0){ + const i2s_platform_config_t * i2s_config= config_dac_get(); + if(i2s_config->scl!=-1 && i2s_config->sda!=-1 && GPIO_IS_VALID_GPIO(i2s_config->scl) && GPIO_IS_VALID_GPIO(i2s_config->sda)){ + fprintf(f,"Scanning i2c bus for devices\n"); + cmd_i2ctools_scan_bus(f,i2s_config->sda, i2s_config->scl); + } + + } if(err!=ESP_OK){ nerrors++; diff --git a/components/platform_console/cmd_i2ctools.c b/components/platform_console/cmd_i2ctools.c index f6509a0c..f5073fac 100644 --- a/components/platform_console/cmd_i2ctools.c +++ b/components/platform_console/cmd_i2ctools.c @@ -21,6 +21,7 @@ #include "display.h" #include "config.h" #include "globdefs.h" +#include "adac.h" #define I2C_MASTER_TX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */ #define I2C_MASTER_RX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */ @@ -123,124 +124,131 @@ bool is_i2c_started(i2c_port_t port){ typedef struct { uint8_t address; - char * description; + const char * description; } i2c_db_t; // the list was taken from https://i2cdevices.org/addresses // on 2020-01-16 + static const i2c_db_t i2c_db[] = { - { .address = 0x00, .description = "Unknown"}, - { .address = 0x01, .description = "Unknown"}, - { .address = 0x02, .description = "Unknown"}, - { .address = 0x03, .description = "Unknown"}, - { .address = 0x04, .description = "Unknown"}, - { .address = 0x05, .description = "Unknown"}, - { .address = 0x06, .description = "Unknown"}, - { .address = 0x07, .description = "Unknown"}, - { .address = 0x0c, .description = "AK8975"}, - { .address = 0x0d, .description = "AK8975"}, - { .address = 0x0e, .description = "MAG3110 AK8975 IST-8310"}, - { .address = 0x0f, .description = "AK8975"}, - { .address = 0x10, .description = "VEML7700 VML6075"}, - { .address = 0x11, .description = "Si4713 SAA5246 SAA5243P/K SAA5243P/L SAA5243P/E SAA5243P/H"}, - { .address = 0x13, .description = "VCNL40x0"}, - { .address = 0x18, .description = "MCP9808 LIS3DH LSM303"}, - { .address = 0x19, .description = "MCP9808 LIS3DH LSM303"}, - { .address = 0x1a, .description = "MCP9808"}, - { .address = 0x1b, .description = "MCP9808"}, - { .address = 0x1c, .description = "MCP9808 MMA845x FXOS8700"}, - { .address = 0x1d, .description = "MCP9808 MMA845x ADXL345 FXOS8700"}, - { .address = 0x1e, .description = "MCP9808 FXOS8700 HMC5883 LSM303 LSM303"}, - { .address = 0x1f, .description = "MCP9808 FXOS8700"}, - { .address = 0x20, .description = "FXAS21002 MCP23008 MCP23017 Chirp!"}, - { .address = 0x21, .description = "FXAS21002 MCP23008 MCP23017 SAA4700"}, - { .address = 0x22, .description = "MCP23008 MCP23017 PCA1070"}, - { .address = 0x23, .description = "MCP23008 MCP23017 SAA4700"}, - { .address = 0x24, .description = "MCP23008 MCP23017 PCD3311C PCD3312C"}, - { .address = 0x25, .description = "MCP23008 MCP23017 PCD3311C PCD3312C"}, - { .address = 0x26, .description = "MCP23008 MCP23017"}, - { .address = 0x27, .description = "MCP23008 MCP23017"}, - { .address = 0x28, .description = "BNO055 CAP1188"}, - { .address = 0x29, .description = "BNO055 CAP1188 TCS34725 TSL2591 VL53L0x VL6180X"}, - { .address = 0x2a, .description = "CAP1188"}, - { .address = 0x2b, .description = "CAP1188"}, - { .address = 0x2c, .description = "CAP1188 AD5248 AD5251 AD5252 CAT5171"}, - { .address = 0x2d, .description = "CAP1188 AD5248 AD5251 AD5252 CAT5171"}, - { .address = 0x2e, .description = "AD5248 AD5251 AD5252"}, - { .address = 0x2f, .description = "AD5248 AD5243 AD5251 AD5252"}, - { .address = 0x30, .description = "SAA2502"}, - { .address = 0x31, .description = "SAA2502"}, - { .address = 0x38, .description = "FT6x06 VEML6070 BMA150 SAA1064"}, - { .address = 0x39, .description = "TSL2561 APDS-9960 VEML6070 SAA1064"}, - { .address = 0x3a, .description = "PCF8577C SAA1064"}, - { .address = 0x3b, .description = "SAA1064 PCF8569"}, - { .address = 0x3c, .description = "SSD1305 SSD1306 PCF8578 PCF8569 SH1106"}, - { .address = 0x3d, .description = "SSD1305 SSD1306 PCF8578 SH1106"}, - { .address = 0x40, .description = "HTU21D-F TMP007 PCA9685 NE5751 TDA8421 INA260 TEA6320 TEA6330 TMP006 TEA6300 Si7021 INA219 TDA9860"}, - { .address = 0x41, .description = "TMP007 PCA9685 STMPE811 TDA8424 NE5751 TDA8421 INA260 STMPE610 TDA8425 TMP006 INA219 TDA9860 TDA8426"}, - { .address = 0x42, .description = "HDC1008 TMP007 TMP006 PCA9685 INA219 TDA8415 TDA8417 INA260"}, - { .address = 0x43, .description = "HDC1008 TMP007 TMP006 PCA9685 INA219 INA260"}, - { .address = 0x44, .description = "TMP007 TMP006 PCA9685 INA219 STMPE610 SHT31 ISL29125 STMPE811 TDA4688 TDA4672 TDA4780 TDA4670 TDA8442 TDA4687 TDA4671 TDA4680 INA260"}, - { .address = 0x45, .description = "TMP007 TMP006 PCA9685 INA219 SHT31 TDA8376 INA260"}, - { .address = 0x46, .description = "TMP007 TMP006 PCA9685 INA219 TDA9150 TDA8370 INA260"}, - { .address = 0x47, .description = "TMP007 TMP006 PCA9685 INA219 INA260"}, - { .address = 0x48, .description = "PCA9685 INA219 PN532 TMP102 INA260 ADS1115"}, - { .address = 0x49, .description = "TSL2561 PCA9685 INA219 TMP102 INA260 ADS1115 AS7262"}, - { .address = 0x4a, .description = "PCA9685 INA219 TMP102 ADS1115 MAX44009 INA260"}, - { .address = 0x4b, .description = "PCA9685 INA219 TMP102 ADS1115 MAX44009 INA260"}, - { .address = 0x4c, .description = "PCA9685 INA219 INA260"}, - { .address = 0x4d, .description = "PCA9685 INA219 INA260"}, - { .address = 0x4e, .description = "PCA9685 INA219 INA260"}, - { .address = 0x4f, .description = "PCA9685 INA219 INA260"}, - { .address = 0x50, .description = "PCA9685 MB85RC"}, - { .address = 0x51, .description = "PCA9685 MB85RC"}, - { .address = 0x52, .description = "PCA9685 MB85RC Nunchuck controller APDS-9250"}, - { .address = 0x53, .description = "ADXL345 PCA9685 MB85RC"}, - { .address = 0x54, .description = "PCA9685 MB85RC"}, - { .address = 0x55, .description = "PCA9685 MB85RC"}, - { .address = 0x56, .description = "PCA9685 MB85RC"}, - { .address = 0x57, .description = "PCA9685 MB85RC MAX3010x"}, - { .address = 0x58, .description = "PCA9685 TPA2016 SGP30"}, - { .address = 0x59, .description = "PCA9685"}, - { .address = 0x5a, .description = "PCA9685 CCS811 MLX90614 DRV2605 MPR121"}, - { .address = 0x5b, .description = "PCA9685 CCS811 MPR121"}, - { .address = 0x5c, .description = "PCA9685 AM2315 MPR121"}, - { .address = 0x5d, .description = "PCA9685 MPR121"}, - { .address = 0x5e, .description = "PCA9685"}, - { .address = 0x5f, .description = "PCA9685 HTS221"}, - { .address = 0x60, .description = "PCA9685 MPL115A2 MPL3115A2 Si5351A Si1145 MCP4725A0 TEA5767 TSA5511 SAB3037 SAB3035 MCP4725A1"}, - { .address = 0x61, .description = "PCA9685 Si5351A MCP4725A0 TEA6100 TSA5511 SAB3037 SAB3035 MCP4725A1"}, - { .address = 0x62, .description = "PCA9685 MCP4725A1 TSA5511 SAB3037 SAB3035 UMA1014T"}, - { .address = 0x63, .description = "Si4713 PCA9685 MCP4725A1 TSA5511 SAB3037 SAB3035 UMA1014T"}, - { .address = 0x64, .description = "PCA9685 MCP4725A2 MCP4725A1"}, - { .address = 0x65, .description = "PCA9685 MCP4725A2 MCP4725A1"}, - { .address = 0x66, .description = "PCA9685 MCP4725A3 IS31FL3731 MCP4725A1"}, - { .address = 0x67, .description = "PCA9685 MCP4725A3 MCP4725A1"}, - { .address = 0x68, .description = "PCA9685 AMG8833 DS1307 PCF8523 DS3231 MPU-9250 ITG3200 PCF8573 MPU6050"}, - { .address = 0x69, .description = "PCA9685 AMG8833 MPU-9250 ITG3200 PCF8573 SPS30 MPU6050"}, - { .address = 0x6a, .description = "PCA9685 L3GD20H PCF8573"}, - { .address = 0x6b, .description = "PCA9685 L3GD20H PCF8573"}, - { .address = 0x6c, .description = "PCA9685"}, - { .address = 0x6d, .description = "PCA9685"}, - { .address = 0x6e, .description = "PCA9685"}, - { .address = 0x6f, .description = "PCA9685"}, - { .address = 0x70, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x71, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x72, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x73, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x74, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x75, .description = "PCA9685 TCA9548 HT16K33"}, - { .address = 0x76, .description = "PCA9685 TCA9548 HT16K33 BME280 BMP280 MS5607 MS5611 BME680"}, - { .address = 0x77, .description = "PCA9685 TCA9548 HT16K33 IS31FL3731 BME280 BMP280 MS5607 BMP180 BMP085 BMA180 MS5611 BME680"}, - { .address = 0x78, .description = "PCA9685"}, - { .address = 0x79, .description = "PCA9685"}, - { .address = 0x7a, .description = "PCA9685"}, - { .address = 0x7b, .description = "PCA9685"}, - { .address = 0x7c, .description = "PCA9685"}, - { .address = 0x7d, .description = "PCA9685"}, - { .address = 0x7e, .description = "PCA9685"}, - { .address = 0x7f, .description = "PCA9685"}, +{ .address = 0x00, .description="Unknown"}, +{ .address = 0x01, .description="Unknown"}, +{ .address = 0x02, .description="Unknown"}, +{ .address = 0x03, .description="Unknown"}, +{ .address = 0x04, .description="Unknown"}, +{ .address = 0x05, .description="Unknown"}, +{ .address = 0x06, .description="Unknown"}, +{ .address = 0x07, .description="Unknown"}, +{ .address = 0x08, .description="Unknown"}, +{ .address = 0x0c, .description="AK8975"}, +{ .address = 0x0d, .description="AK8975"}, +{ .address = 0x0e, .description="MAG3110 AK8975 IST-8310"}, +{ .address = 0x0f, .description="AK8975"}, +{ .address = 0x10, .description="VEML7700 VML6075 VEML6075"}, +{ .address = 0x11, .description="Si4713 SAA5246 SAA5243P/K SAA5243P/L SAA5243P/E SAA5243P/H"}, +{ .address = 0x12, .description="SEN-17374"}, +{ .address = 0x13, .description="VCNL40x0 SEN-17374"}, +{ .address = 0x18, .description="MCP9808 LIS3DH LSM303 COM-15093"}, +{ .address = 0x19, .description="MCP9808 LIS3DH LSM303 COM-15093"}, +{ .address = 0x20, .description="ES8388"}, +{ .address = 0x1a, .description="AC101 MCP9808"}, +{ .address = 0x1b, .description="MCP9808"}, +{ .address = 0x1c, .description="MCP9808 MMA845x FXOS8700"}, +{ .address = 0x1d, .description="MCP9808 MMA845x ADXL345 FXOS8700"}, +{ .address = 0x1e, .description="HMC5883 LSM303 MCP9808 LSM303 FXOS8700"}, +{ .address = 0x1f, .description="MCP9808 FXOS8700"}, +{ .address = 0x20, .description="TCA9554 MCP23008 MA12070P MCP23017 Chirp! FXAS21002"}, +{ .address = 0x21, .description="FXAS21002 MCP23008 MCP23017 SAA4700 MA12070P TCA9554"}, +{ .address = 0x22, .description="ES8388 MCP23008 MCP23017 PCA1070 MA12070P TCA9554"}, +{ .address = 0x23, .description="MCP23008 MCP23017 SAA4700 MA12070P TCA9554"}, +{ .address = 0x24, .description="TCA9554 MCP23008 PCD3312C MCP23017 PCD3311C"}, +{ .address = 0x25, .description="TCA9554 MCP23008 PCD3312C MCP23017 PCD3311C"}, +{ .address = 0x26, .description="MCP23008 MCP23017 TCA9554"}, +{ .address = 0x27, .description="MCP23008 MCP23017 HIH6130 TCA9554"}, +{ .address = 0x28, .description="BNO055 CAP1188"}, +{ .address = 0x29, .description="BNO055 VL53L0x VL6180X CAP1188 TCS34725 TSL2591"}, +{ .address = 0x2a, .description="CAP1188"}, +{ .address = 0x2b, .description="CAP1188"}, +{ .address = 0x2c, .description="CAP1188 AD5248 AD5251 AD5252 CAT5171"}, +{ .address = 0x2d, .description="CAP1188 AD5248 AD5251 AD5252 CAT5171"}, +{ .address = 0x2e, .description="AD5248 AD5251 AD5252 LPS22HB"}, +{ .address = 0x2f, .description="AD5248 AD5243 AD5251 AD5252"}, +{ .address = 0x30, .description="SAA2502"}, +{ .address = 0x31, .description="SAA2502"}, +{ .address = 0x33, .description="MLX90640"}, +{ .address = 0x38, .description="FT6x06 VEML6070 BMA150 SAA1064 SEN-15892 PCF8574AP"}, +{ .address = 0x39, .description="TSL2561 APDS-9960 VEML6070 SAA1064 PCF8574AP"}, +{ .address = 0x3a, .description="PCF8577C SAA1064 PCF8574AP"}, +{ .address = 0x3b, .description="SAA1064 PCF8569 PCF8574AP"}, +{ .address = 0x3c, .description="SSD1305 SSD1306 PCF8578 PCF8569 SH1106 PCF8574AP"}, +{ .address = 0x3d, .description="SSD1305 SSD1306 PCF8578 SH1106 PCF8574AP"}, +{ .address = 0x3e, .description="PCF8574AP"}, +{ .address = 0x3f, .description="PCF8574AP"}, +{ .address = 0x40, .description="Si7021 HTU21D-F TMP007 TMP006 PCA9685 INA219 TEA6330 TEA6300 TDA9860 TEA6320 TDA8421 NE5751 INA260 PCF8574"}, +{ .address = 0x41, .description="TMP007 TDA8421 TDA8424 STMPE610 PCF8574 STMPE811 NE5751 INA260 TDA8425 TMP006 TDA9860 PCA9685 INA219 TDA8426"}, +{ .address = 0x42, .description="TMP007 TDA8417 HDC1008 PCF8574 INA260 TDA8415 TMP006 PCA9685 INA219"}, +{ .address = 0x43, .description="TMP007 HDC1008 PCF8574 INA260 TMP006 PCA9685 INA219"}, +{ .address = 0x44, .description="TMP007 TMP006 PCA9685 INA219 STMPE610 SHT31 ISL29125 STMPE811 TDA4688 TDA4672 TDA4780 TDA4670 TDA8442 TDA4687 TDA4671 TDA4680 INA260 PCF8574"}, +{ .address = 0x45, .description="TMP007 TDA7433 PCF8574 TDA8376 INA260 TMP006 PCA9685 INA219 SHT31"}, +{ .address = 0x46, .description="TMP007 PCF8574 TDA8370 INA260 TMP006 PCA9685 INA219 TDA9150"}, +{ .address = 0x47, .description="TMP007 PCF8574 INA260 TMP006 PCA9685 INA219"}, +{ .address = 0x48, .description="PCA9685 INA219 PN532 TMP102 INA260 ADS1115 PCF8574 ADS7828"}, +{ .address = 0x49, .description="TSL2561 PCA9685 INA219 TMP102 INA260 ADS1115 AS7262 PCF8574 ADS7828"}, +{ .address = 0x4a, .description="ADS7828 PCF8574 ADS1115 INA260 PCA9685 MAX44009 INA219 TMP102"}, +{ .address = 0x4b, .description="ADS7828 PCF8574 ADS1115 INA260 PCA9685 MAX44009 INA219 TMP102"}, +{ .address = 0x4c, .description="PCA9685 INA219 INA260 PCF8574"}, +{ .address = 0x4d, .description="PCA9685 INA219 INA260 PCF8574"}, +{ .address = 0x4e, .description="PCA9685 INA219 INA260 PCF8574"}, +{ .address = 0x4f, .description="PCA9685 INA219 INA260 PCF8574"}, +{ .address = 0x50, .description="PCA9685 MB85RC"}, +{ .address = 0x51, .description="PCA9685 MB85RC VCNL4200"}, +{ .address = 0x52, .description="PCA9685 MB85RC Nunchuck controller APDS-9250 SI1133"}, +{ .address = 0x53, .description="ADXL345 PCA9685 MB85RC"}, +{ .address = 0x54, .description="PCA9685 MB85RC"}, +{ .address = 0x55, .description="PCA9685 MB85RC MAX30101 SI1133"}, +{ .address = 0x56, .description="PCA9685 MB85RC"}, +{ .address = 0x57, .description="PCA9685 MB85RC MAX3010x"}, +{ .address = 0x58, .description="PCA9685 TPA2016 SGP30"}, +{ .address = 0x59, .description="PCA9685"}, +{ .address = 0x5a, .description="MPR121 MLX90614 CCS811 PCA9685 DRV2605"}, +{ .address = 0x5b, .description="PCA9685 CCS811 MPR121"}, +{ .address = 0x5c, .description="PCA9685 AM2315 MPR121"}, +{ .address = 0x5d, .description="PCA9685 MPR121"}, +{ .address = 0x5e, .description="PCA9685"}, +{ .address = 0x5f, .description="PCA9685 HTS221"}, +{ .address = 0x60, .description="SI1132 Si5351A ATECC608A TSA5511 ATECC508A SAB3035 MCP4725A0 SAB3037 PCA9685 MCP4725A1 TEA5767 MPL3115A2 MPL115A2 Si1145"}, +{ .address = 0x61, .description="Si5351A TSA5511 SAB3035 MCP4725A0 SAB3037 TEA6100 PCA9685 MCP4725A1"}, +{ .address = 0x62, .description="SCD40-D-R2 TSA5511 SAB3035 UMA1014T SAB3037 PCA9685 MCP4725A1"}, +{ .address = 0x63, .description="Si4713 TSA5511 SAB3035 UMA1014T SAB3037 PCA9685 MCP4725A1"}, +{ .address = 0x64, .description="PCA9685 MCP4725A2 MCP4725A1"}, +{ .address = 0x65, .description="PCA9685 MCP4725A2 MCP4725A1"}, +{ .address = 0x66, .description="PCA9685 MCP4725A3 IS31FL3731 MCP4725A1"}, +{ .address = 0x67, .description="PCA9685 MCP4725A3 MCP4725A1"}, +{ .address = 0x68, .description="MPU-9250 ICM-20948 MPU6050 AMG8833 DS3231 PCA9685 PCF8573 PCF8523 DS1307 ITG3200"}, +{ .address = 0x69, .description="MPU-9250 ICM-20948 MPU6050 AMG8833 PCA9685 PCF8573 ITG3200 SPS30"}, +{ .address = 0x6a, .description="PCA9685 L3GD20H PCF8573"}, +{ .address = 0x6b, .description="PCA9685 L3GD20H PCF8573"}, +{ .address = 0x6c, .description="PCA9685"}, +{ .address = 0x6d, .description="PCA9685"}, +{ .address = 0x6e, .description="PCA9685"}, +{ .address = 0x6f, .description="PCA9685 MCP7940N"}, +{ .address = 0x70, .description="PCA9685 TCA9548 HT16K33 SHTC3"}, +{ .address = 0x71, .description="PCA9685 TCA9548 HT16K33"}, +{ .address = 0x72, .description="PCA9685 TCA9548 HT16K33"}, +{ .address = 0x73, .description="PCA9685 TCA9548 HT16K33"}, +{ .address = 0x74, .description="PCA9685 TCA9548 HT16K33"}, +{ .address = 0x75, .description="PCA9685 TCA9548 HT16K33"}, +{ .address = 0x76, .description="BME688 BME680 MS5611 MS5607 HT16K33 PCA9685 BME280 BMP280 TCA9548"}, +{ .address = 0x77, .description="PCA9685 TCA9548 HT16K33 IS31FL3731 BME280 BMP280 MS5607 BMP180 BMP085 BMA180 MS5611 BME680 BME688"}, +{ .address = 0x78, .description="PCA9685"}, +{ .address = 0x79, .description="PCA9685"}, +{ .address = 0x7a, .description="PCA9685"}, +{ .address = 0x7b, .description="PCA9685"}, +{ .address = 0x7c, .description="PCA9685"}, +{ .address = 0x7d, .description="PCA9685"}, +{ .address = 0x7e, .description="PCA9685"}, +{ .address = 0x7f, .description="PCA9685"}, { .address = 0, .description = NULL} }; @@ -793,7 +801,67 @@ static int do_i2cget_cmd(int argc, char **argv) FREE_AND_NULL(buf); return 0; } +esp_err_t cmd_i2ctools_scan_bus(FILE *f,int sda, int scl){ + uint8_t matches[128]={}; + int last_match=0; + esp_err_t ret = ESP_OK; + + if(!GPIO_IS_VALID_GPIO(scl) || !GPIO_IS_VALID_GPIO(sda)){ + fprintf(f,"Invalid GPIO. Cannot scan bus\n"); + return 1; + } + + // configure i2c + i2c_config_t i2c_config = { + .mode = I2C_MODE_MASTER, + .sda_io_num = -1, + .sda_pullup_en = GPIO_PULLUP_ENABLE, + .scl_io_num = -1, + .scl_pullup_en = GPIO_PULLUP_ENABLE, + .master.clk_speed = 250000, + }; + i2c_config.sda_io_num = sda; + i2c_config.scl_io_num = scl; + // we have an I2C configured + i2c_port_t i2c_port = 0; + // make sure that we don't have an i2c driver running + i2c_driver_delete(i2c_port); + ret = i2c_param_config(i2c_port, &i2c_config); + if (ret != ESP_OK) { + fprintf(f,"I2C Param Config failed %s\n", esp_err_to_name(ret)); + return ret; + } + ret=i2c_driver_install(i2c_port, I2C_MODE_MASTER, false, false, false); + if (ret != ESP_OK) { + fprintf(f,"I2C driver install failed %s\n", esp_err_to_name(ret)); + return ret; + } + for (int i = 0; i < 128 ; i ++) { + + i2c_cmd_handle_t cmd = i2c_cmd_link_create(); + i2c_master_start(cmd); + i2c_master_write_byte(cmd, (i << 1) | WRITE_BIT, ACK_CHECK_EN); + i2c_master_stop(cmd); + ret = i2c_master_cmd_begin(i2c_port, cmd, 50 / portTICK_RATE_MS); + i2c_cmd_link_delete(cmd); + if (ret == ESP_OK) { + matches[++last_match-1] = i; + } + } + i2c_driver_delete(i2c_port); + if(last_match) { + fprintf(f,"i2c device detected (names provided by https://i2cdevices.org/addresses).\n"); + for(int i=0;i= ESP_LOG_DEBUG -#define network_handler_entry_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"BEGIN ENTRY":"END ENTRY",State_Machine,false,__FUNCTION__) -#define network_exit_handler_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"BEGIN EXIT":"END EXIT",State_Machine,false,__FUNCTION__) -#define network_handler_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"HANDLER START":"HANDLER END",State_Machine,false,__FUNCTION__) +#define network_handler_entry_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"BEGIN ENTRY":"END ENTRY",State_Machine,false,"") +#define network_exit_handler_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"BEGIN EXIT":"END EXIT",State_Machine,false,"") +#define network_handler_print(State_Machine, begin) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,begin?"HANDLER START":"HANDLER END",State_Machine,false,"") #define NETWORK_PRINT_TRANSITION(begin, prefix, source,target, event, print_source,caller ) if(begin) network_manager_format_from_to_states(ESP_LOG_DEBUG, prefix, source,target, event, print_source,caller )#define NETWORK_EXECUTE_CB(mch) network_execute_cb(mch,__FUNCTION__); #define NETWORK_DEBUG_STATE_MACHINE(begin, cb_prefix,state_machine,print_from,caller) if(begin) network_manager_format_state_machine(ESP_LOG_DEBUG,cb_prefix,state_machine,print_from,caller) diff --git a/components/wifi-manager/wifi_manager_http_server.c b/components/wifi-manager/wifi_manager_http_server.c index 78e587a6..f640cf85 100644 --- a/components/wifi-manager/wifi_manager_http_server.c +++ b/components/wifi-manager/wifi_manager_http_server.c @@ -1,3 +1,6 @@ +#ifdef NETWORK_HTTP_SERVER_LOG_LEVEL +#define LOG_LOCAL_LEVEL NETWORK_HTTP_SERVER_LOG_LEVEL +#endif /* * Squeezelite for esp32 * @@ -139,7 +142,7 @@ esp_err_t http_server_start() strlcpy(rest_context->base_path, "/res/", sizeof(rest_context->base_path)); httpd_config_t config = HTTPD_DEFAULT_CONFIG(); - config.max_uri_handlers = 25; + config.max_uri_handlers = 30; config.max_open_sockets = 8; config.uri_match_fn = httpd_uri_match_wildcard; config.task_priority = ESP_TASK_PRIO_MIN;