diff --git a/components/display/display.c b/components/display/display.c index bae3d6cc..37214028 100644 --- a/components/display/display.c +++ b/components/display/display.c @@ -52,7 +52,8 @@ static const char *known_drivers[] = {"SH1106", "SSD1327", "SSD1675", "SSD1351", - "ST77xx", + "ST7735", + "ST7789", "ILI9341", NULL }; diff --git a/components/platform_console/cmd_config.c b/components/platform_console/cmd_config.c index 586d1e16..4b094eba 100644 --- a/components/platform_console/cmd_config.c +++ b/components/platform_console/cmd_config.c @@ -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!"); diff --git a/components/platform_console/cmd_i2ctools.c b/components/platform_console/cmd_i2ctools.c index f1565955..7daef03b 100644 --- a/components/platform_console/cmd_i2ctools.c +++ b/components/platform_console/cmd_i2ctools.c @@ -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", "", "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:"", "Driver (default SSD1306)"); + i2cdisp_args.driver = arg_str0("d", "driver", supported_drivers?supported_drivers:"", "Driver"); i2cdisp_args.cs = arg_int0("b", "cs", "","SPI Only. CS GPIO (for SPI displays)"); i2cdisp_args.speed = arg_int0("s", "speed", "","SPI Only. Bus Speed (Default 8000000). SPI interface can work up to 26MHz~40MHz"); i2cdisp_args.back = arg_int0("b", "back", "","Backlight GPIO (if applicable)"); diff --git a/components/services/accessors.c b/components/services/accessors.c index 81093050..cf7ed9bf 100644 --- a/components/services/accessors.c +++ b/components/services/accessors.c @@ -343,7 +343,6 @@ const display_config_t * config_display_get(){ dstruct.drivername = display_conf_get_driver_name(strchr(p, '=') + 1); } - dstruct.drivername=dstruct.drivername?dstruct.drivername:"SSD1306"; if ((p = strcasestr(config, "width")) != NULL) dstruct.width = atoi(strchr(p, '=') + 1); if ((p = strcasestr(config, "height")) != NULL) dstruct.height = atoi(strchr(p, '=') + 1); if ((p = strcasestr(config, "reset")) != NULL) dstruct.RST_pin = atoi(strchr(p, '=') + 1); diff --git a/components/wifi-manager/res/code.js b/components/wifi-manager/res/code.js index ae781172..43c43d46 100644 --- a/components/wifi-manager/res/code.js +++ b/components/wifi-manager/res/code.js @@ -284,7 +284,7 @@ function delay_reboot(duration,cmdname, ota=false){ showCmdMessage(cmdname,'MESSAGING_WARNING','Rebooting the ESP32.\n',true); } else { - showLocalMessage('MESSAGING_WARNING','Rebooting the ESP32.\n') + showLocalMessage('Rebooting the ESP32.\n','MESSAGING_WARNING') } console.log('now triggering reboot'); $.ajax({ diff --git a/components/wifi-manager/res/code.js.gz b/components/wifi-manager/res/code.js.gz index 04afcc8e..95064959 100644 Binary files a/components/wifi-manager/res/code.js.gz and b/components/wifi-manager/res/code.js.gz differ diff --git a/components/wifi-manager/status-messages.json b/components/wifi-manager/status-messages.json index d73b9123..cfa2ac2a 100644 --- a/components/wifi-manager/status-messages.json +++ b/components/wifi-manager/status-messages.json @@ -1 +1 @@ -{"project_name":"recovery","version":"custom.build","recovery":1,"Jack":"1","Voltage":0,"disconnect_count":0,"avg_conn_time":0,"is_i2c_locked":false,"urc":0,"ssid":"Abyssin","ip":"192.168.10.225","netmask":"255.255.255.0","gw":"192.168.10.1"} \ No newline at end of file +{"project_name":"recovery","version":"custom.build","recovery":1,"Jack":"1","Voltage":0,"disconnect_count":0,"avg_conn_time":0,"is_i2c_locked":false,"urc":0,"ssid":"MyTestSSID","ip":"192.168.10.225","netmask":"255.255.255.0","gw":"192.168.10.1"} \ No newline at end of file