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

Display config UI fixes - release

Browse Source 
Add 2 entries as a replacement for the ST77xx driver name, remove SSD1306 default.
This commit is contained in:
Sebastien
2020-10-08 21:09:36 -04:00
parent be1d841039
commit d379858dd2
7 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/platform_console/cmd_config.c
View File

@@ -154,7 +154,7 @@ static int do_spdif_cmd(int argc, char **argv){
esp_err_t err=ESP_OK;
int nerrors = arg_parse(argc, argv,(void **)&spdif_args);
if (spdif_args.clear->count) {
cmd_send_messaging(argv[0],MESSAGING_WARNING,"SPDIF config cleared");
cmd_send_messaging(argv[0],MESSAGING_WARNING,"SPDIF config cleared\n");
config_set_value(NVS_TYPE_STR, "spdif_config", "");
return 0;
}
@@ -163,7 +163,7 @@ static int do_spdif_cmd(int argc, char **argv){
size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size);
if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1;
}
if(nerrors >0){
@@ -205,7 +205,7 @@ static int do_i2s_cmd(int argc, char **argv)
esp_err_t err=ESP_OK;
int nerrors = arg_parse(argc, argv,(void **)&i2s_args);
if (i2s_args.clear->count) {
cmd_send_messaging(argv[0],MESSAGING_WARNING,"DAC config cleared");
cmd_send_messaging(argv[0],MESSAGING_WARNING,"DAC config cleared\n");
config_set_value(NVS_TYPE_STR, "dac_config", "");
return 0;
}
@@ -214,7 +214,7 @@ static int do_i2s_cmd(int argc, char **argv)
size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size);
if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1;
}
if(nerrors >0){
@@ -360,7 +360,7 @@ static int do_squeezelite_cmd(int argc, char **argv)
size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size);
if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1;
}
fprintf(f,"Not yet implemented!");

9
components/platform_console/cmd_i2ctools.c
View File

@@ -365,7 +365,7 @@ static int do_i2c_set_display(int argc, char **argv)
config.speed = 8000000;
}
/* Check "--cs" option */
nerrors +=is_output_gpio(i2cdisp_args.cs,f,&config.CS_pin, true);
nerrors +=is_output_gpio(i2cdisp_args.cs,f,&config.CS_pin, false);
}
nerrors +=is_output_gpio(i2cdisp_args.reset,f,&config.RST_pin, false);
@@ -382,15 +382,12 @@ static int do_i2c_set_display(int argc, char **argv)
if (i2cdisp_args.driver->count) {
config.drivername=display_conf_get_driver_name(i2cdisp_args.driver->sval[0]) ;
}
else {
config.drivername = display_conf_get_driver_name("SSD1306");
}
if(i2cdisp_args.depth->count > 0 && strcasecmp(config.drivername,"SSD1326")==0) {
config.depth = i2cdisp_args.depth->ival[0];
}
/* Check "--back" option */
nerrors +=is_output_gpio(i2cdisp_args.back,f,&config.back, false);
if(!display_is_valid_driver(config.drivername)){
if(!config.drivername || !display_is_valid_driver(config.drivername)){
fprintf(f,"Unsupported display driver %s\n",config.drivername);
nerrors++;
}
@@ -905,7 +902,7 @@ static void register_i2c_set_display(){
i2cdisp_args.reset = arg_int0(NULL, "reset", "<n>", "Reset GPIO");
i2cdisp_args.hflip = arg_lit0(NULL, "hf", "Flip horizontally");
i2cdisp_args.vflip = arg_lit0(NULL, "vf", "Flip vertically");
i2cdisp_args.driver = arg_str0("d", "driver", supported_drivers?supported_drivers:"<string>", "Driver (default SSD1306)");
i2cdisp_args.driver = arg_str0("d", "driver", supported_drivers?supported_drivers:"<string>", "Driver");
i2cdisp_args.cs = arg_int0("b", "cs", "<n>","SPI Only. CS GPIO (for SPI displays)");
i2cdisp_args.speed = arg_int0("s", "speed", "<n>","SPI Only. Bus Speed (Default 8000000). SPI interface can work up to 26MHz~40MHz");
i2cdisp_args.back = arg_int0("b", "back", "<n>","Backlight GPIO (if applicable)");