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

Allow compiling out cspot

Browse Source
This commit is contained in:
Sebastien L
2022-11-28 09:22:46 -05:00
parent 46eb732d82
commit 14f4caf584
2 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
components/platform_console/cmd_config.c
View File

@@ -592,6 +592,8 @@ static int is_valid_gpio_number(int gpio, const char * name, FILE *f, bool manda
} }
return 0; return 0;
} }
#ifdef CONFIG_CSPOT_SINK
static int do_cspot_config(int argc, char **argv){ static int do_cspot_config(int argc, char **argv){
int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&cspot_args); int nerrors = arg_parse_msg(argc, argv,(struct arg_hdr **)&cspot_args);
if (nerrors != 0) { if (nerrors != 0) {
@@ -639,6 +641,7 @@ static int do_cspot_config(int argc, char **argv){
FREE_AND_NULL(buf); FREE_AND_NULL(buf);
return nerrors; return nerrors;
} }
#endif
static int do_i2s_cmd(int argc, char **argv) static int do_i2s_cmd(int argc, char **argv)
{ {
i2s_platform_config_t i2s_dac_pin = { i2s_platform_config_t i2s_dac_pin = {
@@ -746,6 +749,7 @@ cJSON * known_model_cb(){
} }
return values; return values;
} }
#ifdef CONFIG_CSPOT_SINK
cJSON * cspot_cb(){ cJSON * cspot_cb(){
cJSON * values = cJSON_CreateObject(); cJSON * values = cJSON_CreateObject();
if(!values){ if(!values){
@@ -769,6 +773,7 @@ cJSON * cspot_cb(){
cJSON_Delete(cspot_config); cJSON_Delete(cspot_config);
return values; return values;
} }
#endif
cJSON * i2s_cb(){ cJSON * i2s_cb(){
cJSON * values = cJSON_CreateObject(); cJSON * values = cJSON_CreateObject();
@@ -1172,7 +1177,7 @@ static void register_known_templates_config(){
cmd_to_json_with_cb(&cmd,&known_model_cb); cmd_to_json_with_cb(&cmd,&known_model_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
#ifdef CONFIG_CSPOT_SINK
static void register_cspot_config(){ static void register_cspot_config(){
cspot_args.deviceName = arg_str1(NULL,"deviceName","","Device Name"); cspot_args.deviceName = arg_str1(NULL,"deviceName","","Device Name");
cspot_args.bitrate = arg_int1(NULL,"bitrate","96|160|320","Streaming Bitrate (kbps)"); cspot_args.bitrate = arg_int1(NULL,"bitrate","96|160|320","Streaming Bitrate (kbps)");
@@ -1188,6 +1193,7 @@ static void register_cspot_config(){
cmd_to_json_with_cb(&cmd,&cspot_cb); cmd_to_json_with_cb(&cmd,&cspot_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
#endif
static void register_i2s_config(void){ static void register_i2s_config(void){
i2s_args.model_name = arg_str1(NULL,"model_name",STR_OR_BLANK(get_dac_list()),"DAC Model Name"); i2s_args.model_name = arg_str1(NULL,"model_name",STR_OR_BLANK(get_dac_list()),"DAC Model Name");
i2s_args.clear = arg_lit0(NULL, "clear", "Clear configuration"); i2s_args.clear = arg_lit0(NULL, "clear", "Clear configuration");
@@ -1329,8 +1335,11 @@ static void register_squeezelite_config(void){
void register_config_cmd(void){ void register_config_cmd(void){
if(!is_dac_config_locked()){ if(!is_dac_config_locked()){
register_known_templates_config(); register_known_templates_config();
} }
#ifdef CONFIG_CSPOT_SINK
register_cspot_config(); register_cspot_config();
#endif
register_audio_config(); register_audio_config();
// register_squeezelite_config(); // register_squeezelite_config();
register_bt_source_config(); register_bt_source_config();

35
main/esp_app_main.c
View File

@@ -312,8 +312,22 @@ void register_default_with_mac(const char* key, char* defval) {
void register_default_nvs(){ void register_default_nvs(){
#ifdef CONFIG_CSPOT_SINK #ifdef CONFIG_CSPOT_SINK
register_default_string_val("enable_cspot", STR(CONFIG_CSPOT_SINK)); register_default_string_val("enable_cspot", STR(CONFIG_CSPOT_SINK));
#else cJSON * cspot_config=config_alloc_get_cjson("cspot_config");
register_default_string_val("enable_cspot", "0"); if(!cspot_config){
char * name = alloc_get_string_with_mac(DEFAULT_HOST_NAME);
if(name){
cjson_update_string(&cspot_config,"deviceName",name);
cjson_update_number(&cspot_config,"bitrate",160);
// the call below saves the config and frees the json pointer
config_set_cjson_str_and_free("cspot_config",cspot_config);
FREE_AND_NULL(name);
}
else {
register_default_string_val("cspot_config", "");
}
}
#endif #endif
#ifdef CONFIG_AIRPLAY_SINK #ifdef CONFIG_AIRPLAY_SINK
@@ -379,23 +393,6 @@ void register_default_nvs(){
register_default_string_val("ethtmout","8"); register_default_string_val("ethtmout","8");
register_default_string_val("dhcp_tmout","8"); register_default_string_val("dhcp_tmout","8");
register_default_string_val("target", CONFIG_TARGET); register_default_string_val("target", CONFIG_TARGET);
cJSON * cspot_config=config_alloc_get_cjson("cspot_config");
if(!cspot_config){
char * name = alloc_get_string_with_mac(DEFAULT_HOST_NAME);
if(name){
cjson_update_string(&cspot_config,"deviceName",name);
cjson_update_number(&cspot_config,"bitrate",160);
// the call below saves the config and frees the json pointer
config_set_cjson_str_and_free("cspot_config",cspot_config);
FREE_AND_NULL(name);
}
else {
register_default_string_val("cspot_config", "");
}
}
wait_for_commit(); wait_for_commit();
ESP_LOGD(TAG,"Done setting default values in nvs."); ESP_LOGD(TAG,"Done setting default values in nvs.");
} }