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

Fix recovery

Browse Source
This commit is contained in:
Sebastien L
2023-10-28 22:48:12 -04:00
parent 9619b1d792
commit c76bbc3524
16 changed files with 2360 additions and 2253 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile
View File

@@ -25,7 +25,11 @@ ENV GCC_TOOLS_BASE=/opt/esp/tools/xtensa-esp32-elf/esp-2021r2-patch3-8.4.0/xtens
# pushd components/wifi-manager/webapp/ && npm install && npm run-script build && popd # pushd components/wifi-manager/webapp/ && npm install && npm run-script build && popd
# #
# to run the docker with netwotrk port published on the host: # to run the docker with netwotrk port published on the host:
# (windows)
# docker run --rm -p 5000:5000/tcp -v %cd%:/project -w /project -it sle118/squeezelite-esp32-idfv435 # docker run --rm -p 5000:5000/tcp -v %cd%:/project -w /project -it sle118/squeezelite-esp32-idfv435
# (linux)
# docker run --rm -p 5000:5000/tcp -v `pwd`:/project -w /project -it sle118/squeezelite-esp32-idfv435
ARG IDF_CLONE_URL=https://github.com/espressif/esp-idf.git ARG IDF_CLONE_URL=https://github.com/espressif/esp-idf.git
ARG IDF_CLONE_BRANCH_OR_TAG=master ARG IDF_CLONE_BRANCH_OR_TAG=master

6
components/platform_console/app_squeezelite/cmd_squeezelite.c
View File

@@ -43,11 +43,15 @@ const __attribute__((section(".rodata_desc"))) esp_app_desc_t esp_app_desc = {
extern void register_audio_config(void); extern void register_audio_config(void);
extern void register_rotary_config(void); extern void register_rotary_config(void);
extern void register_ledvu_config(void); extern void register_ledvu_config(void);
extern void register_nvs();
void register_optional_cmd(void) { void register_optional_cmd(void) {
#if CONFIG_WITH_CONFIG_UI
register_rotary_config(); register_rotary_config();
register_ledvu_config(); #endif
register_audio_config(); register_audio_config();
register_ledvu_config();
register_nvs();
} }
extern int squeezelite_main(int argc, char **argv); extern int squeezelite_main(int argc, char **argv);

215
components/platform_console/cmd_config.c
View File

@@ -6,21 +6,21 @@
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. CONDITIONS OF ANY KIND, either express or implied.
*/ */
#include <stdio.h>
#include "cmd_config.h" #include "cmd_config.h"
#include "argtable3/argtable3.h"
#include "platform_console.h"
#include "esp_log.h"
#include "string.h"
#include "stdio.h"
#include "platform_config.h"
#include "messaging.h"
#include "accessors.h" #include "accessors.h"
#include "adac.h" #include "adac.h"
#include "tools.h" #include "argtable3/argtable3.h"
#include "cJSON.h" #include "cJSON.h"
#include "cmd_i2ctools.h" #include "cmd_i2ctools.h"
#include "cmd_system.h"
#include "esp_log.h"
#include "messaging.h"
#include "platform_config.h"
#include "platform_console.h"
#include "stdio.h"
#include "string.h"
#include "tools.h"
#include <stdio.h>
const char *desc_squeezelite = "Squeezelite Options"; const char *desc_squeezelite = "Squeezelite Options";
const char *desc_dac = "DAC Options"; const char *desc_dac = "DAC Options";
const char *desc_cspotc = "Spotify (cSpot) Options"; const char *desc_cspotc = "Spotify (cSpot) Options";
@@ -65,7 +65,6 @@ extern void register_optional_cmd(void);
#define MODEL_NAME_STRING STR(MODEL_NAME) #define MODEL_NAME_STRING STR(MODEL_NAME)
#endif #endif
#define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_DSD CODECS_MP3 #define CODECS CODECS_BASE CODECS_AAC CODECS_FF CODECS_DSD CODECS_MP3
#define NOT_OUTPUT "has input capabilities only" #define NOT_OUTPUT "has input capabilities only"
#define NOT_GPIO "is not a GPIO" #define NOT_GPIO "is not a GPIO"
@@ -197,8 +196,7 @@ int is_gpio(struct arg_int * gpio, FILE * f, int * gpio_out, bool mandatory, boo
} else if ((output && !GPIO_IS_VALID_OUTPUT_GPIO(t_gpio)) || (!GPIO_IS_VALID_GPIO(t_gpio))) { } else if ((output && !GPIO_IS_VALID_OUTPUT_GPIO(t_gpio)) || (!GPIO_IS_VALID_GPIO(t_gpio))) {
fprintf(f, "Invalid %s gpio: [%d] %s\n", name, t_gpio, GPIO_IS_VALID_GPIO(t_gpio) ? NOT_OUTPUT : NOT_GPIO); fprintf(f, "Invalid %s gpio: [%d] %s\n", name, t_gpio, GPIO_IS_VALID_GPIO(t_gpio) ? NOT_OUTPUT : NOT_GPIO);
res++; res++;
} } else {
else{
*gpio_out = t_gpio; *gpio_out = t_gpio;
} }
return res; return res;
@@ -215,8 +213,7 @@ int check_missing_parm(struct arg_int * int_parm, FILE * f){
} }
return res; return res;
} }
char * strip_bt_name(char * opt_str) char *strip_bt_name(char *opt_str) {
{
if (!opt_str || strlen(opt_str) == 0) { if (!opt_str || strlen(opt_str) == 0) {
ESP_LOGW(TAG, "strip_bt_name: opt_str is NULL"); ESP_LOGW(TAG, "strip_bt_name: opt_str is NULL");
return NULL; return NULL;
@@ -236,41 +233,34 @@ char * strip_bt_name(char * opt_str)
bool quoted = false; bool quoted = false;
parse_state_t state = SEARCHING_FOR_BT; parse_state_t state = SEARCHING_FOR_BT;
char *start = strstr(str, output_marker); char *start = strstr(str, output_marker);
if (start) if (start) {
{
ESP_LOGV(TAG, "Found output option : %s\n", start); ESP_LOGV(TAG, "Found output option : %s\n", start);
start += strlen(output_marker); start += strlen(output_marker);
strncpy(result, str, (size_t)(start - str)); strncpy(result, str, (size_t)(start - str));
char *pch = strtok(start, " "); char *pch = strtok(start, " ");
while (pch) { while (pch) {
ESP_LOGV(TAG, "Current output: %s\n[%s]", result, pch); ESP_LOGV(TAG, "Current output: %s\n[%s]", result, pch);
switch (state) switch (state) {
{
case SEARCHING_FOR_BT: case SEARCHING_FOR_BT:
if (strcasestr(pch, "BT") ) if (strcasestr(pch, "BT")) {
{
state = SEARCHING_FOR_NAME; state = SEARCHING_FOR_NAME;
quoted = strcasestr(pch, "BT") != NULL; quoted = strcasestr(pch, "BT") != NULL;
ESP_LOGV(TAG, " - fount BT Start %s", quoted ? "quoted" : ""); ESP_LOGV(TAG, " - fount BT Start %s", quoted ? "quoted" : "");
} } else {
else
{
ESP_LOGV(TAG, " - Searching for BT, Ignoring"); ESP_LOGV(TAG, " - Searching for BT, Ignoring");
} }
strcat(result, " "); strcat(result, " ");
strcat(result, pch); strcat(result, pch);
break; break;
case SEARCHING_FOR_NAME: case SEARCHING_FOR_NAME:
if (strcasestr(pch, "name") || strcasestr(pch, "n")) if (strcasestr(pch, "name") || strcasestr(pch, "n")) {
{
ESP_LOGV(TAG, " - Found name tag"); ESP_LOGV(TAG, " - Found name tag");
state = SEARCHING_FOR_NAME_START; state = SEARCHING_FOR_NAME_START;
} } else {
else
{
strcat(result, " "); strcat(result, " ");
strcat(result, pch); strcat(result, pch);
ESP_LOGV(TAG," - Searching for name - added ");; ESP_LOGV(TAG, " - Searching for name - added ");
;
} }
break; break;
case SEARCHING_FOR_NAME_START: case SEARCHING_FOR_NAME_START:
@@ -281,14 +271,12 @@ char * strip_bt_name(char * opt_str)
if (strcasestr(pch, "\"")) { if (strcasestr(pch, "\"")) {
ESP_LOGV(TAG, " - got quoted string"); ESP_LOGV(TAG, " - got quoted string");
state = FINISHING; state = FINISHING;
} } else if (pch[0] == '-') {
else if(pch[0]== '-'){
strcat(result, " "); strcat(result, " ");
strcat(result, pch); strcat(result, pch);
ESP_LOGV(TAG, " - got parameter marker"); ESP_LOGV(TAG, " - got parameter marker");
state = quoted ? SEARCHING_FOR_BT_CMD_END : FINISHING; state = quoted ? SEARCHING_FOR_BT_CMD_END : FINISHING;
} } else {
else {
ESP_LOGV(TAG, " - name continued"); ESP_LOGV(TAG, " - name continued");
} }
break; break;
@@ -312,9 +300,7 @@ char * strip_bt_name(char * opt_str)
pch = strtok(NULL, " "); pch = strtok(NULL, " ");
ESP_LOGV(TAG, "\n"); ESP_LOGV(TAG, "\n");
} }
} } else {
else
{
ESP_LOGE(TAG, "output option not found in %s\n", str); ESP_LOGE(TAG, "output option not found in %s\n", str);
strcpy(result, str); strcpy(result, str);
} }
@@ -330,9 +316,8 @@ static int do_bt_source_cmd(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
// char value[100] ={0}; // char value[100] ={0};
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
@@ -346,8 +331,7 @@ static int do_bt_source_cmd(int argc, char **argv){
if (err != ESP_OK) { if (err != ESP_OK) {
nerrors++; nerrors++;
fprintf(f, "Error setting Bluetooth audio device name %s. %s\n", bt_source_args.sink_name->sval[0], esp_err_to_name(err)); fprintf(f, "Error setting Bluetooth audio device name %s. %s\n", bt_source_args.sink_name->sval[0], esp_err_to_name(err));
} } else {
else {
fprintf(f, "Bluetooth audio device name changed to %s\n", bt_source_args.sink_name->sval[0]); fprintf(f, "Bluetooth audio device name changed to %s\n", bt_source_args.sink_name->sval[0]);
} }
char *squeezelite_cmd = config_alloc_get_default(NVS_TYPE_STR, "autoexec1", NULL, 0); char *squeezelite_cmd = config_alloc_get_default(NVS_TYPE_STR, "autoexec1", NULL, 0);
@@ -364,7 +348,6 @@ static int do_bt_source_cmd(int argc, char **argv){
free(squeezelite_cmd); free(squeezelite_cmd);
free(new_cmd); free(new_cmd);
} }
} }
if (bt_source_args.pin_code->count > 0) { if (bt_source_args.pin_code->count > 0) {
const char *v = bt_source_args.pin_code->sval[0]; const char *v = bt_source_args.pin_code->sval[0];
@@ -377,14 +360,12 @@ static int do_bt_source_cmd(int argc, char **argv){
if (bInvalid || strlen(bt_source_args.pin_code->sval[0]) > 16 || strlen(bt_source_args.pin_code->sval[0]) < 4) { if (bInvalid || strlen(bt_source_args.pin_code->sval[0]) > 16 || strlen(bt_source_args.pin_code->sval[0]) < 4) {
nerrors++; nerrors++;
fprintf(f, "Pin code %s invalid. Should be numbers only with length between 4 and 16 characters. \n", bt_source_args.pin_code->sval[0]); fprintf(f, "Pin code %s invalid. Should be numbers only with length between 4 and 16 characters. \n", bt_source_args.pin_code->sval[0]);
} } else {
else {
err = config_set_value(NVS_TYPE_STR, "a2dp_spin", bt_source_args.pin_code->sval[0]); err = config_set_value(NVS_TYPE_STR, "a2dp_spin", bt_source_args.pin_code->sval[0]);
if (err != ESP_OK) { if (err != ESP_OK) {
nerrors++; nerrors++;
fprintf(f, "Error setting Bluetooth source pin to %s. %s\n", bt_source_args.pin_code->sval[0], esp_err_to_name(err)); fprintf(f, "Error setting Bluetooth source pin to %s. %s\n", bt_source_args.pin_code->sval[0], esp_err_to_name(err));
} } else {
else {
fprintf(f, "Bluetooth source pin changed to %s\n", bt_source_args.pin_code->sval[0]); fprintf(f, "Bluetooth source pin changed to %s\n", bt_source_args.pin_code->sval[0]);
} }
} }
@@ -434,16 +415,14 @@ static int do_bt_source_cmd(int argc, char **argv){
fclose(f); fclose(f);
FREE_AND_NULL(buf); FREE_AND_NULL(buf);
return (nerrors == 0 && err == ESP_OK) ? 0 : 1; return (nerrors == 0 && err == ESP_OK) ? 0 : 1;
} }
static int do_audio_cmd(int argc, char **argv) { static int do_audio_cmd(int argc, char **argv) {
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
int nerrors = arg_parse(argc, argv, (void **)&audio_args); int nerrors = arg_parse(argc, argv, (void **)&audio_args);
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
@@ -469,8 +448,7 @@ static int do_audio_cmd(int argc, char **argv){
if (err != ESP_OK) { if (err != ESP_OK) {
nerrors++; nerrors++;
fprintf(f, "Error setting Loudness value %s. %s\n", p, esp_err_to_name(err)); fprintf(f, "Error setting Loudness value %s. %s\n", p, esp_err_to_name(err));
} } else {
else {
fprintf(f, "Loudness changed to %s\n", p); fprintf(f, "Loudness changed to %s\n", p);
equalizer_set_loudness(loudness_val); equalizer_set_loudness(loudness_val);
} }
@@ -480,11 +458,9 @@ static int do_audio_cmd(int argc, char **argv){
err = ESP_OK; // suppress any error code that might have happened in a previous step err = ESP_OK; // suppress any error code that might have happened in a previous step
if (strcasecmp(audio_args.jack_behavior->sval[0], "Headphones") == 0) { if (strcasecmp(audio_args.jack_behavior->sval[0], "Headphones") == 0) {
err = config_set_value(NVS_TYPE_STR, "jack_mutes_amp", "y"); err = config_set_value(NVS_TYPE_STR, "jack_mutes_amp", "y");
} } else if (strcasecmp(audio_args.jack_behavior->sval[0], "Subwoofer") == 0) {
else if(strcasecmp(audio_args.jack_behavior->sval[0],"Subwoofer")==0){
err = config_set_value(NVS_TYPE_STR, "jack_mutes_amp", "n"); err = config_set_value(NVS_TYPE_STR, "jack_mutes_amp", "n");
} } else {
else {
nerrors++; nerrors++;
fprintf(f, "Unknown Audio Jack Behavior %s.\n", audio_args.jack_behavior->sval[0]); fprintf(f, "Unknown Audio Jack Behavior %s.\n", audio_args.jack_behavior->sval[0]);
} }
@@ -492,8 +468,7 @@ static int do_audio_cmd(int argc, char **argv){
if (err != ESP_OK) { if (err != ESP_OK) {
nerrors++; nerrors++;
fprintf(f, "Error setting Audio Jack Behavior %s. %s\n", audio_args.jack_behavior->sval[0], esp_err_to_name(err)); fprintf(f, "Error setting Audio Jack Behavior %s. %s\n", audio_args.jack_behavior->sval[0], esp_err_to_name(err));
} } else {
else {
fprintf(f, "Audio Jack Behavior changed to %s\n", audio_args.jack_behavior->sval[0]); fprintf(f, "Audio Jack Behavior changed to %s\n", audio_args.jack_behavior->sval[0]);
} }
} }
@@ -513,8 +488,7 @@ static int do_spdif_cmd(int argc, char **argv){
.sda = -1, .sda = -1,
.scl = -1, .scl = -1,
.mute_gpio = -1, .mute_gpio = -1,
.mute_level = -1 .mute_level = -1};
};
if (is_spdif_config_locked()) { if (is_spdif_config_locked()) {
cmd_send_messaging(argv[0], MESSAGING_ERROR, "SPDIF Configuration is locked on this platform\n"); cmd_send_messaging(argv[0], MESSAGING_ERROR, "SPDIF Configuration is locked on this platform\n");
return 1; return 1;
@@ -529,9 +503,8 @@ static int do_spdif_cmd(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
@@ -568,9 +541,8 @@ static int do_rotary_cmd(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
@@ -582,7 +554,6 @@ static int do_rotary_cmd(int argc, char **argv){
nerrors += is_gpio(rotary_args.B, f, &rotary.B, true, false); nerrors += is_gpio(rotary_args.B, f, &rotary.B, true, false);
nerrors += is_gpio(rotary_args.SW, f, &rotary.SW, false, false); nerrors += is_gpio(rotary_args.SW, f, &rotary.SW, false, false);
if (rotary_args.knobonly->count > 0 && (rotary_args.volume_lock->count > 0 || rotary_args.longpress->count > 0)) { if (rotary_args.knobonly->count > 0 && (rotary_args.volume_lock->count > 0 || rotary_args.longpress->count > 0)) {
fprintf(f, "error: Cannot use volume lock or longpress option when knob only option selected\n"); fprintf(f, "error: Cannot use volume lock or longpress option when knob only option selected\n");
nerrors++; nerrors++;
@@ -591,8 +562,7 @@ static int do_rotary_cmd(int argc, char **argv){
if (rotary_args.timer->count > 0 && rotary_args.timer->ival[0] < 0) { if (rotary_args.timer->count > 0 && rotary_args.timer->ival[0] < 0) {
fprintf(f, "error: knob only timer should be greater than or equal to zero.\n"); fprintf(f, "error: knob only timer should be greater than or equal to zero.\n");
nerrors++; nerrors++;
} } else {
else {
rotary.timer = rotary_args.timer->count > 0 ? rotary_args.timer->ival[0] : 0; rotary.timer = rotary_args.timer->count > 0 ? rotary_args.timer->ival[0] : 0;
} }
rotary.knobonly = rotary_args.knobonly->count > 0; rotary.knobonly = rotary_args.knobonly->count > 0;
@@ -640,9 +610,8 @@ static int do_cspot_config(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
return 1; return 1;
} }
@@ -699,9 +668,8 @@ static int do_ledvu_cmd(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
@@ -714,8 +682,7 @@ static int do_ledvu_cmd(int argc, char **argv){
if (ledvu_args.length->count == 0 || ledvu_args.length->ival[0] < 1 || ledvu_args.length->ival[0] > 255) { if (ledvu_args.length->count == 0 || ledvu_args.length->ival[0] < 1 || ledvu_args.length->ival[0] > 255) {
fprintf(f, "error: strip length must be greater than 0 and no more than 255\n"); fprintf(f, "error: strip length must be greater than 0 and no more than 255\n");
nerrors++; nerrors++;
} } else {
else {
ledvu.length = ledvu_args.length->count > 0 ? ledvu_args.length->ival[0] : 0; ledvu.length = ledvu_args.length->count > 0 ? ledvu_args.length->ival[0] : 0;
} }
@@ -733,15 +700,13 @@ static int do_ledvu_cmd(int argc, char **argv){
return (nerrors == 0 && err == ESP_OK) ? 0 : 1; return (nerrors == 0 && err == ESP_OK) ? 0 : 1;
} }
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 = {
.i2c_addr = -1, .i2c_addr = -1,
.sda = -1, .sda = -1,
.scl = -1, .scl = -1,
.mute_gpio = -1, .mute_gpio = -1,
.mute_level = -1 .mute_level = -1};
};
if (is_dac_config_locked()) { if (is_dac_config_locked()) {
cmd_send_messaging(argv[0], MESSAGING_ERROR, "DAC Configuration is locked on this platform\n"); cmd_send_messaging(argv[0], MESSAGING_ERROR, "DAC Configuration is locked on this platform\n");
return 1; return 1;
@@ -759,17 +724,14 @@ static int do_i2s_cmd(int argc, char **argv)
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
ESP_LOGE(TAG, "do_i2s_cmd: Failed to open memstream");
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
ESP_LOGE(TAG, "do_i2s_cmd: %d errors parsing arguments", nerrors); ESP_LOGE(TAG, "do_i2s_cmd: %d errors parsing arguments", nerrors);
arg_print_errors(f, i2s_args.end, desc_dac); arg_print_errors(f, i2s_args.end, desc_dac);
} } else {
else {
strncpy(i2s_dac_pin.model, i2s_args.model_name->sval[0], sizeof(i2s_dac_pin.model)); strncpy(i2s_dac_pin.model, i2s_args.model_name->sval[0], sizeof(i2s_dac_pin.model));
i2s_dac_pin.model[sizeof(i2s_dac_pin.model) - 1] = '\0'; i2s_dac_pin.model[sizeof(i2s_dac_pin.model) - 1] = '\0';
nerrors += is_output_gpio(i2s_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true); nerrors += is_output_gpio(i2s_args.clock, f, &i2s_dac_pin.pin.bck_io_num, true);
@@ -834,8 +796,7 @@ cJSON * known_model_cb(){
char *name = config_alloc_get_default(NVS_TYPE_STR, known_model_args.model_config->hdr.longopts, "", 0); char *name = config_alloc_get_default(NVS_TYPE_STR, known_model_args.model_config->hdr.longopts, "", 0);
if (!name) { if (!name) {
ESP_LOGE(TAG, "Failed to get board model from nvs key %s ", known_model_args.model_config->hdr.longopts); ESP_LOGE(TAG, "Failed to get board model from nvs key %s ", known_model_args.model_config->hdr.longopts);
} } else {
else {
cJSON_AddStringToObject(values, known_model_args.model_config->hdr.longopts, name); cJSON_AddStringToObject(values, known_model_args.model_config->hdr.longopts, name);
} }
return values; return values;
@@ -873,7 +834,6 @@ cJSON * i2s_cb(){
cJSON *values = cJSON_CreateObject(); cJSON *values = cJSON_CreateObject();
const i2s_platform_config_t *i2s_conf = config_dac_get(); const i2s_platform_config_t *i2s_conf = config_dac_get();
if (i2s_conf->pin.bck_io_num > 0) { if (i2s_conf->pin.bck_io_num > 0) {
cJSON_AddNumberToObject(values, i2s_args.clock->hdr.longopts, i2s_conf->pin.bck_io_num); cJSON_AddNumberToObject(values, i2s_args.clock->hdr.longopts, i2s_conf->pin.bck_io_num);
} }
@@ -900,8 +860,7 @@ cJSON * i2s_cb(){
} }
if (strlen(i2s_conf->model) > 0) { if (strlen(i2s_conf->model) > 0) {
cJSON_AddStringToObject(values, i2s_args.model_name->hdr.longopts, i2s_conf->model); cJSON_AddStringToObject(values, i2s_args.model_name->hdr.longopts, i2s_conf->model);
} } else {
else {
cJSON_AddStringToObject(values, i2s_args.model_name->hdr.longopts, "I2S"); cJSON_AddStringToObject(values, i2s_args.model_name->hdr.longopts, "I2S");
} }
@@ -928,7 +887,6 @@ cJSON * rotary_cb(){
bool raw_mode = p && (*p == '1' || *p == 'Y' || *p == 'y'); bool raw_mode = p && (*p == '1' || *p == 'Y' || *p == 'y');
free(p); free(p);
const rotary_struct_t *rotary = config_rotary_get(); const rotary_struct_t *rotary = config_rotary_get();
if (GPIO_IS_VALID_GPIO(rotary->A) && rotary->A >= 0 && GPIO_IS_VALID_GPIO(rotary->B) && rotary->B >= 0) { if (GPIO_IS_VALID_GPIO(rotary->A) && rotary->A >= 0 && GPIO_IS_VALID_GPIO(rotary->B) && rotary->B >= 0) {
cJSON_AddNumberToObject(values, rotary_args.A->hdr.longopts, rotary->A); cJSON_AddNumberToObject(values, rotary_args.A->hdr.longopts, rotary->A);
cJSON_AddNumberToObject(values, rotary_args.B->hdr.longopts, rotary->B); cJSON_AddNumberToObject(values, rotary_args.B->hdr.longopts, rotary->B);
@@ -947,15 +905,13 @@ cJSON * rotary_cb(){
cJSON *ledvu_cb() { cJSON *ledvu_cb() {
cJSON *values = cJSON_CreateObject(); cJSON *values = cJSON_CreateObject();
const ledvu_struct_t *ledvu = config_ledvu_get(); const ledvu_struct_t *ledvu = config_ledvu_get();
if (GPIO_IS_VALID_GPIO(ledvu->gpio) && ledvu->gpio >= 0 && ledvu->length > 0) { if (GPIO_IS_VALID_GPIO(ledvu->gpio) && ledvu->gpio >= 0 && ledvu->length > 0) {
cJSON_AddNumberToObject(values, "gpio", ledvu->gpio); cJSON_AddNumberToObject(values, "gpio", ledvu->gpio);
cJSON_AddNumberToObject(values, "length", ledvu->length); cJSON_AddNumberToObject(values, "length", ledvu->length);
} }
if (strlen(ledvu->type) > 0) { if (strlen(ledvu->type) > 0) {
cJSON_AddStringToObject(values, "type", ledvu->type); cJSON_AddStringToObject(values, "type", ledvu->type);
} } else {
else {
cJSON_AddStringToObject(values, "type", "WS2812"); cJSON_AddStringToObject(values, "type", "WS2812");
} }
return values; return values;
@@ -996,7 +952,6 @@ cJSON * bt_source_cb(){
return values; return values;
} }
void get_str_parm_json(struct arg_str *parm, cJSON *entry) { void get_str_parm_json(struct arg_str *parm, cJSON *entry) {
const char *name = parm->hdr.longopts ? parm->hdr.longopts : parm->hdr.glossary; const char *name = parm->hdr.longopts ? parm->hdr.longopts : parm->hdr.glossary;
if (parm->count > 0) { if (parm->count > 0) {
@@ -1020,15 +975,13 @@ void get_int_parm_json(struct arg_int * parm, cJSON * entry){
} }
} }
static int do_squeezelite_cmd(int argc, char **argv) static int do_squeezelite_cmd(int argc, char **argv) {
{
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
int nerrors = arg_parse_msg(argc, argv, (struct arg_hdr **)&squeezelite_args); int nerrors = arg_parse_msg(argc, argv, (struct arg_hdr **)&squeezelite_args);
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
fprintf(f, "Not yet implemented!"); fprintf(f, "Not yet implemented!");
@@ -1047,11 +1000,10 @@ cJSON * squeezelite_cb(){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
int nerrors = 1; int nerrors = 1;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
log_send_messaging(MESSAGING_ERROR,"Unable to parse squeezelite parameters"); return values;
} }
else {
if (nvs_config && strlen(nvs_config) > 0) { if (nvs_config && strlen(nvs_config) > 0) {
ESP_LOGD(TAG, "Parsing command %s", nvs_config); ESP_LOGD(TAG, "Parsing command %s", nvs_config);
@@ -1089,8 +1041,7 @@ cJSON * squeezelite_cb(){
char *p = cJSON_Print(values); char *p = cJSON_Print(values);
ESP_LOGD(TAG, "%s", p); ESP_LOGD(TAG, "%s", p);
free(p); free(p);
} } else {
else {
arg_print_errors(f, squeezelite_args.end, desc_squeezelite); arg_print_errors(f, squeezelite_args.end, desc_squeezelite);
} }
fflush(f); fflush(f);
@@ -1099,7 +1050,6 @@ cJSON * squeezelite_cb(){
} }
fclose(f); fclose(f);
FREE_AND_NULL(buf); FREE_AND_NULL(buf);
}
FREE_AND_NULL(nvs_config); FREE_AND_NULL(nvs_config);
FREE_AND_NULL(argv); FREE_AND_NULL(argv);
return values; return values;
@@ -1123,8 +1073,7 @@ static char * get_dac_list(){
for (int i = 0; dac_set[i]; i++) { for (int i = 0; dac_set[i]; i++) {
if (dac_set[i]->model && strlen(dac_set[i]->model) > 0) { if (dac_set[i]->model && strlen(dac_set[i]->model) > 0) {
total_len += strlen(dac_set[i]->model) + 1; total_len += strlen(dac_set[i]->model) + 1;
} } else {
else {
break; break;
} }
} }
@@ -1135,8 +1084,7 @@ static char * get_dac_list(){
if (dac_set[i]->model && strlen(dac_set[i]->model) > 0) { if (dac_set[i]->model && strlen(dac_set[i]->model) > 0) {
strcat(dac_list, dac_set[i]->model); strcat(dac_list, dac_set[i]->model);
strcat(dac_list, "|"); strcat(dac_list, "|");
} } else {
else {
break; break;
} }
} }
@@ -1185,8 +1133,7 @@ static esp_err_t save_known_config(cJSON * known_item, const char * name,FILE *
break; break;
} }
} }
} } else {
else {
json_string = cJSON_Print(config_array); json_string = cJSON_Print(config_array);
char *known_item_string = cJSON_Print(known_item); char *known_item_string = cJSON_Print(known_item);
fprintf(f, "Failed to parse config array. %s\n%s\nKnown item found: %s\n", config_array ? cJSON_IsArray(config_array) ? "" : "NOT AN ARRAY" : "config entry not found", STR_OR_BLANK(json_string), STR_OR_BLANK(known_item_string)); fprintf(f, "Failed to parse config array. %s\n%s\nKnown item found: %s\n", config_array ? cJSON_IsArray(config_array) ? "" : "NOT AN ARRAY" : "config entry not found", STR_OR_BLANK(json_string), STR_OR_BLANK(known_item_string));
@@ -1195,7 +1142,6 @@ static esp_err_t save_known_config(cJSON * known_item, const char * name,FILE *
err = ESP_FAIL; err = ESP_FAIL;
} }
if (err == ESP_OK) { if (err == ESP_OK) {
err = config_set_value(NVS_TYPE_STR, "board_model", name); err = config_set_value(NVS_TYPE_STR, "board_model", name);
if (err != ESP_OK) { if (err != ESP_OK) {
@@ -1212,15 +1158,13 @@ static int do_register_known_templates_config(int argc, char **argv){
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
cJSON *config_name = NULL; cJSON *config_name = NULL;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0], &buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.\n");
return 1; return 1;
} }
if (nerrors > 0) { if (nerrors > 0) {
arg_print_errors(f, known_model_args.end, desc_preset); arg_print_errors(f, known_model_args.end, desc_preset);
} } else {
else {
ESP_LOGD(TAG, "arg: %s", STR_OR_BLANK(known_model_args.model_config->sval[0])); ESP_LOGD(TAG, "arg: %s", STR_OR_BLANK(known_model_args.model_config->sval[0]));
char *model_config = strdup_psram(known_model_args.model_config->sval[0]); char *model_config = strdup_psram(known_model_args.model_config->sval[0]);
char *t = model_config; char *t = model_config;
@@ -1228,8 +1172,7 @@ static int do_register_known_templates_config(int argc, char **argv){
if (*p == '\\' && *(p + 1) == '"') { if (*p == '\\' && *(p + 1) == '"') {
*t++ = '"'; *t++ = '"';
p++; p++;
} } else {
else {
*t++ = *p; *t++ = *p;
} }
} }
@@ -1255,8 +1198,7 @@ static int do_register_known_templates_config(int argc, char **argv){
} }
} }
cJSON_Delete(known_item); cJSON_Delete(known_item);
} } else {
else {
ESP_LOGE(TAG, "Parsing error: %s", cJSON_GetErrorPtr()); ESP_LOGE(TAG, "Parsing error: %s", cJSON_GetErrorPtr());
fprintf(f, "Failed to parse JSON: %s\n", cJSON_GetErrorPtr()); fprintf(f, "Failed to parse JSON: %s\n", cJSON_GetErrorPtr());
err = ESP_FAIL; err = ESP_FAIL;
@@ -1264,8 +1206,7 @@ static int do_register_known_templates_config(int argc, char **argv){
if (err != ESP_OK) { if (err != ESP_OK) {
nerrors++; nerrors++;
fprintf(f, "Error registering known config %s.\n", known_model_args.model_config->sval[0]); fprintf(f, "Error registering known config %s.\n", known_model_args.model_config->sval[0]);
} } else {
else {
fprintf(f, "Registered known config %s.\n", known_model_args.model_config->sval[0]); fprintf(f, "Registered known config %s.\n", known_model_args.model_config->sval[0]);
} }
} }
@@ -1280,7 +1221,6 @@ static int do_register_known_templates_config(int argc, char **argv){
return (nerrors == 0 && err == ESP_OK) ? 0 : 1; return (nerrors == 0 && err == ESP_OK) ? 0 : 1;
} }
static void register_known_templates_config() { static void register_known_templates_config() {
known_model_args.model_config = arg_str1(NULL, "model_config", "SqueezeAMP|T-WATCH2020 by LilyGo", "Known Board Name.\nFor known boards, several systems parameters will be updated"); known_model_args.model_config = arg_str1(NULL, "model_config", "SqueezeAMP|T-WATCH2020 by LilyGo", "Known Board Name.\nFor known boards, several systems parameters will be updated");
known_model_args.end = arg_end(1); known_model_args.end = arg_end(1);
const esp_console_cmd_t cmd = { const esp_console_cmd_t cmd = {
@@ -1288,8 +1228,7 @@ static void register_known_templates_config(){
.help = desc_preset, .help = desc_preset,
.hint = NULL, .hint = NULL,
.func = &do_register_known_templates_config, .func = &do_register_known_templates_config,
.argtable = &known_model_args .argtable = &known_model_args};
};
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));
} }
@@ -1305,8 +1244,7 @@ static void register_cspot_config(){
.help = desc_cspotc, .help = desc_cspotc,
.hint = NULL, .hint = NULL,
.func = &do_cspot_config, .func = &do_cspot_config,
.argtable = &cspot_args .argtable = &cspot_args};
};
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));
} }
@@ -1329,14 +1267,12 @@ static void register_i2s_config(void){
.help = desc_dac, .help = desc_dac,
.hint = NULL, .hint = NULL,
.func = &do_i2s_cmd, .func = &do_i2s_cmd,
.argtable = &i2s_args .argtable = &i2s_args};
};
cmd_to_json_with_cb(&cmd, &i2s_cb); cmd_to_json_with_cb(&cmd, &i2s_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
static void register_bt_source_config(void) { static void register_bt_source_config(void) {
bt_source_args.sink_name = arg_str1("n", "sink_name", "name", "Bluetooth audio device name. This applies when output mode is Bluetooth"); bt_source_args.sink_name = arg_str1("n", "sink_name", "name", "Bluetooth audio device name. This applies when output mode is Bluetooth");
bt_source_args.pin_code = arg_str1("p", "pin_code", "pin", "Bluetooth security/pin code. Usually 0000. This applies when output mode is Bluetooth"); bt_source_args.pin_code = arg_str1("p", "pin_code", "pin", "Bluetooth security/pin code. Usually 0000. This applies when output mode is Bluetooth");
// bt_source_args.control_delay= arg_dbl0("d","control_delay","seconds","Control response delay, in seconds. This determines the response time of the system Bluetooth events. The default value should work for the majority of cases and changing this could lead to instabilities."); // bt_source_args.control_delay= arg_dbl0("d","control_delay","seconds","Control response delay, in seconds. This determines the response time of the system Bluetooth events. The default value should work for the majority of cases and changing this could lead to instabilities.");
@@ -1347,8 +1283,7 @@ static void register_bt_source_config(void){
.help = desc_bt_source, .help = desc_bt_source,
.hint = NULL, .hint = NULL,
.func = &do_bt_source_cmd, .func = &do_bt_source_cmd,
.argtable = &bt_source_args .argtable = &bt_source_args};
};
cmd_to_json_with_cb(&cmd, &bt_source_cb); cmd_to_json_with_cb(&cmd, &bt_source_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
@@ -1370,8 +1305,7 @@ void register_rotary_config(void){
.help = desc_rotary, .help = desc_rotary,
.hint = NULL, .hint = NULL,
.func = &do_rotary_cmd, .func = &do_rotary_cmd,
.argtable = &rotary_args .argtable = &rotary_args};
};
cmd_to_json_with_cb(&cmd, &rotary_cb); cmd_to_json_with_cb(&cmd, &rotary_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
@@ -1388,15 +1322,14 @@ void register_ledvu_config(void){
.help = desc_ledvu, .help = desc_ledvu,
.hint = NULL, .hint = NULL,
.func = &do_ledvu_cmd, .func = &do_ledvu_cmd,
.argtable = &ledvu_args .argtable = &ledvu_args};
};
cmd_to_json_with_cb(&cmd, &ledvu_cb); cmd_to_json_with_cb(&cmd, &ledvu_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
void register_audio_config(void) { void register_audio_config(void) {
audio_args.jack_behavior = arg_str0("j", "jack_behavior", "Headphones|Subwoofer", "On supported DAC, determines the audio jack behavior. Selecting headphones will cause the external amp to be muted on insert, while selecting Subwoofer will keep the amp active all the time."); audio_args.jack_behavior = arg_str0("j", "jack_behavior", "Headphones|Subwoofer", "On supported DAC, determines the audio jack behavior. Selecting headphones will cause the external amp to be muted on insert, while selecting Subwoofer will keep the amp active all the time.");
audio_args.loudness = arg_int0("l", "loudness","0-10","Sets the loudness level, from 0 to 10. 0 will disable the loudness completely."); audio_args.loudness = arg_int0("l", "loudness", "0-10", "Sets a loudness level, from 0 to 10. 0 will disable the loudness completely. Note that LMS has priority over setting this value, so use it only when away from your server.");
audio_args.end = arg_end(6); audio_args.end = arg_end(6);
audio_args.end = arg_end(6); audio_args.end = arg_end(6);
const esp_console_cmd_t cmd = { const esp_console_cmd_t cmd = {
@@ -1404,8 +1337,7 @@ void register_audio_config(void){
.help = desc_audio, .help = desc_audio,
.hint = NULL, .hint = NULL,
.func = &do_audio_cmd, .func = &do_audio_cmd,
.argtable = &audio_args .argtable = &audio_args};
};
cmd_to_json_with_cb(&cmd, &audio_cb); cmd_to_json_with_cb(&cmd, &audio_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
@@ -1422,8 +1354,7 @@ static void register_spdif_config(void){
.help = desc_spdif, .help = desc_spdif,
.hint = NULL, .hint = NULL,
.func = &do_spdif_cmd, .func = &do_spdif_cmd,
.argtable = &spdif_args .argtable = &spdif_args};
};
cmd_to_json_with_cb(&cmd, &spdif_cb); cmd_to_json_with_cb(&cmd, &spdif_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
@@ -1433,11 +1364,6 @@ static void register_squeezelite_config(void){
squeezelite_args.codecs = arg_strn("c", "codecs", "+" CODECS "+", 0, 20, "Restrict codecs to those specified, otherwise load all available codecs; known codecs: " CODECS); squeezelite_args.codecs = arg_strn("c", "codecs", "+" CODECS "+", 0, 20, "Restrict codecs to those specified, otherwise load all available codecs; known codecs: " CODECS);
squeezelite_args.timeout = arg_int0("C", "timeout", "<n>", "Close output device when idle after timeout seconds, default is to keep it open while player is 'on"); squeezelite_args.timeout = arg_int0("C", "timeout", "<n>", "Close output device when idle after timeout seconds, default is to keep it open while player is 'on");
squeezelite_args.log_level = arg_str0("d", "loglevel", "log=level", "Set logging level, logs: all|slimproto|stream|decode|output|ir, level: info|debug|sdebug"); // " -d <log>=<level>\tSet logging level, logs: all|slimproto|stream|decode|output|ir, level: info|debug|sdebug\n" squeezelite_args.log_level = arg_str0("d", "loglevel", "log=level", "Set logging level, logs: all|slimproto|stream|decode|output|ir, level: info|debug|sdebug"); // " -d <log>=<level>\tSet logging level, logs: all|slimproto|stream|decode|output|ir, level: info|debug|sdebug\n"
// squeezelite_args.log_level_all = arg_str0(NULL,"all",get_log_level_options("all"),"Overall Logging Level");
// squeezelite_args.log_level_slimproto = arg_str0(NULL,"loglevel_slimproto",get_log_level_options("slimproto"),"Slimproto Logging Level");
// squeezelite_args.log_level_stream= arg_str0(NULL,"loglevel_stream",get_log_level_options("stream"),"Stream Logging Level");
// squeezelite_args.log_level_decode= arg_str0(NULL,"loglevel_decode",get_log_level_options("decode"),"Decode Logging Level");
// squeezelite_args.log_level_output= arg_str0(NULL,"loglevel_output",get_log_level_options("output"),"Output Logging Level");
#if IR #if IR
squeezelite_args.log_level_ir = arg_str0(NULL, "loglevel_ir", get_log_level_options("ir"), "IR Logging Level"); squeezelite_args.log_level_ir = arg_str0(NULL, "loglevel_ir", get_log_level_options("ir"), "IR Logging Level");
#endif #endif
@@ -1463,8 +1389,7 @@ static void register_squeezelite_config(void){
.help = desc_squeezelite, .help = desc_squeezelite,
.hint = NULL, .hint = NULL,
.func = &do_squeezelite_cmd, .func = &do_squeezelite_cmd,
.argtable = &squeezelite_args .argtable = &squeezelite_args};
};
cmd_to_json_with_cb(&cmd, &squeezelite_cb); cmd_to_json_with_cb(&cmd, &squeezelite_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&cmd)); ESP_ERROR_CHECK(esp_console_cmd_register(&cmd));
} }
@@ -1472,7 +1397,6 @@ 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 #ifdef CONFIG_CSPOT_SINK
register_cspot_config(); register_cspot_config();
@@ -1486,4 +1410,3 @@ void register_config_cmd(void){
} }
register_optional_cmd(); register_optional_cmd();
} }

153
components/platform_console/cmd_i2ctools.c
View File

@@ -6,22 +6,22 @@
software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR software is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
CONDITIONS OF ANY KIND, either express or implied. CONDITIONS OF ANY KIND, either express or implied.
*/ */
#include <stdio.h>
#include "cmd_i2ctools.h" #include "cmd_i2ctools.h"
#include "argtable3/argtable3.h" #include <stdio.h>
#include "driver/i2c.h"
#include "platform_console.h"
#include "esp_log.h"
#include "string.h"
#include "stdio.h"
#include "platform_config.h"
#include "accessors.h" #include "accessors.h"
#include "trace.h"
#include "messaging.h"
#include "display.h"
#include "config.h"
#include "tools.h"
#include "adac.h" #include "adac.h"
#include "argtable3/argtable3.h"
#include "config.h"
#include "display.h"
#include "driver/i2c.h"
#include "esp_log.h"
#include "messaging.h"
#include "platform_config.h"
#include "platform_console.h"
#include "stdio.h"
#include "string.h"
#include "tools.h"
#include "trace.h"
#define I2C_MASTER_TX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */ #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 */ #define I2C_MASTER_RX_BUF_DISABLE 0 /*!< I2C master doesn't need buffer */
@@ -129,7 +129,6 @@ typedef struct {
const char* description; const char* description;
} i2c_db_t; } i2c_db_t;
// the list was taken from https://i2cdevices.org/addresses // the list was taken from https://i2cdevices.org/addresses
// on 2020-01-16 // on 2020-01-16
@@ -250,17 +249,16 @@ static const i2c_db_t i2c_db[] = {
{.address = 0x7d, .description = "PCA9685"}, {.address = 0x7d, .description = "PCA9685"},
{.address = 0x7e, .description = "PCA9685"}, {.address = 0x7e, .description = "PCA9685"},
{.address = 0x7f, .description = "PCA9685"}, {.address = 0x7f, .description = "PCA9685"},
{ .address = 0, .description = NULL} {.address = 0, .description = NULL}};
};
const char* i2c_get_description (uint8_t address) { const char* i2c_get_description (uint8_t address) {
uint8_t i = 0; uint8_t i = 0;
while(i2c_db[i].description && i2c_db[i].address!=address) i++; while (i2c_db[i].description && i2c_db[i].address != address)
i++;
return i2c_db[i].description ? i2c_db[i].description : "Unlisted"; return i2c_db[i].description ? i2c_db[i].description : "Unlisted";
} }
static esp_err_t i2c_get_port(int port, i2c_port_t *i2c_port) static esp_err_t i2c_get_port (int port, i2c_port_t* i2c_port) {
{
if (port >= I2C_NUM_MAX) { if (port >= I2C_NUM_MAX) {
log_send_messaging (MESSAGING_ERROR, "Wrong port number: %d", port); log_send_messaging (MESSAGING_ERROR, "Wrong port number: %d", port);
return ESP_FAIL; return ESP_FAIL;
@@ -287,8 +285,7 @@ static esp_err_t i2c_master_driver_install(const char * cmdname){
return err; return err;
} }
static esp_err_t i2c_master_driver_initialize(const char * cmdname, i2c_config_t * conf) static esp_err_t i2c_master_driver_initialize (const char* cmdname, i2c_config_t* conf) {
{
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
cmd_send_messaging (cmdname, MESSAGING_INFO, "Initializing i2c driver configuration.\n mode = I2C_MODE_MASTER, \n scl_pullup_en = GPIO_PULLUP_ENABLE, \n i2c port = %u, \n sda_io_num = %u, \n sda_pullup_en = GPIO_PULLUP_ENABLE, \n scl_io_num = %u, \n scl_pullup_en = GPIO_PULLUP_ENABLE, \n master.clk_speed = %u\n", i2c_port, conf->sda_io_num, conf->scl_io_num, conf->master.clk_speed); cmd_send_messaging (cmdname, MESSAGING_INFO, "Initializing i2c driver configuration.\n mode = I2C_MODE_MASTER, \n scl_pullup_en = GPIO_PULLUP_ENABLE, \n i2c port = %u, \n sda_io_num = %u, \n sda_pullup_en = GPIO_PULLUP_ENABLE, \n scl_io_num = %u, \n scl_pullup_en = GPIO_PULLUP_ENABLE, \n master.clk_speed = %u\n", i2c_port, conf->sda_io_num, conf->scl_io_num, conf->master.clk_speed);
if ((err = i2c_param_config (i2c_port, conf)) != ESP_OK) { if ((err = i2c_param_config (i2c_port, conf)) != ESP_OK) {
@@ -297,16 +294,14 @@ static esp_err_t i2c_master_driver_initialize(const char * cmdname, i2c_config_t
return err; return err;
} }
static int do_i2c_set_display(int argc, char **argv) static int do_i2c_set_display (int argc, char** argv) {
{
bool bHasi2cConfig = false, bHasSpiConfig = false; bool bHasi2cConfig = false, bHasSpiConfig = false;
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cdisp_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cdisp_args);
display_config_t config = { display_config_t config = {
.back = -1, .back = -1,
.CS_pin = -1, .CS_pin = -1,
.RST_pin = -1, .RST_pin = -1,
.depth = 0 .depth = 0};
};
char* nvs_item = config_alloc_get (NVS_TYPE_STR, "i2c_config"); char* nvs_item = config_alloc_get (NVS_TYPE_STR, "i2c_config");
if (nvs_item && strlen (nvs_item) > 0) { if (nvs_item && strlen (nvs_item) > 0) {
bHasi2cConfig = true; bHasi2cConfig = true;
@@ -341,28 +336,24 @@ static int do_i2c_set_display(int argc, char **argv)
if (i2cdisp_args.type->count) { if (i2cdisp_args.type->count) {
if (strcasecmp (i2c_name_type, i2cdisp_args.type->sval[0]) == 0) { if (strcasecmp (i2c_name_type, i2cdisp_args.type->sval[0]) == 0) {
config.type = i2c_name_type; config.type = i2c_name_type;
} } else {
else {
config.type = spi_name_type; config.type = spi_name_type;
} }
} } else {
else {
config.type = i2c_name_type; config.type = i2c_name_type;
} }
/* Check "--address" option */ /* Check "--address" option */
if (strcasecmp (config.type, "I2C") == 0) { if (strcasecmp (config.type, "I2C") == 0) {
if (i2cdisp_args.address->count > 0) { if (i2cdisp_args.address->count > 0) {
config.address = i2cdisp_args.address->ival[0]; config.address = i2cdisp_args.address->ival[0];
} } else {
else {
config.address = 60; config.address = 60;
} }
if (!bHasi2cConfig) { if (!bHasi2cConfig) {
fprintf (f, "I2C bus has to be configured first. \n"); fprintf (f, "I2C bus has to be configured first. \n");
nerrors++; nerrors++;
} }
} } else {
else {
// SPI Bus connection // SPI Bus connection
if (!bHasSpiConfig) { if (!bHasSpiConfig) {
fprintf (f, "SPI bus has to be configured first. \n"); fprintf (f, "SPI bus has to be configured first. \n");
@@ -371,8 +362,7 @@ static int do_i2c_set_display(int argc, char **argv)
/* Check "--speed" option */ /* Check "--speed" option */
if (i2cdisp_args.speed->count) { if (i2cdisp_args.speed->count) {
config.speed = i2cdisp_args.speed->ival[0]; config.speed = i2cdisp_args.speed->ival[0];
} } else {
else {
config.speed = 8000000; config.speed = 8000000;
} }
/* Check "--cs" option */ /* Check "--cs" option */
@@ -380,8 +370,7 @@ static int do_i2c_set_display(int argc, char **argv)
/* Check "--mode" option */ /* Check "--mode" option */
if (i2cdisp_args.mode->count) { if (i2cdisp_args.mode->count) {
config.mode = i2cdisp_args.mode->ival[0]; config.mode = i2cdisp_args.mode->ival[0];
} } else {
else {
config.mode = 0; config.mode = 0;
} }
} }
@@ -436,15 +425,13 @@ static int do_i2c_set_display(int argc, char **argv)
return nerrors; return nerrors;
} }
static int do_spiconfig_cmd (int argc, char** argv) { static int do_spiconfig_cmd (int argc, char** argv) {
static spi_bus_config_t spi_config = { static spi_bus_config_t spi_config = {
.mosi_io_num = -1, .mosi_io_num = -1,
.sclk_io_num = -1, .sclk_io_num = -1,
.miso_io_num = -1, .miso_io_num = -1,
.quadwp_io_num = -1, .quadwp_io_num = -1,
.quadhd_io_num = -1 .quadhd_io_num = -1};
};
int dc = -1, host = 0; int dc = -1, host = 0;
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&spiconfig_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&spiconfig_args);
@@ -484,13 +471,11 @@ static int do_spiconfig_cmd(int argc, char **argv){
if ((err = spi_bus_free (host)) != ESP_OK && (err = spi_bus_free (host == 1 ? 2 : 1)) != ESP_OK) { if ((err = spi_bus_free (host)) != ESP_OK && (err = spi_bus_free (host == 1 ? 2 : 1)) != ESP_OK) {
fprintf (f, "SPI bus init failed. Please clear SPI configuration, restart the device and try again. %s\n", esp_err_to_name (err)); fprintf (f, "SPI bus init failed. Please clear SPI configuration, restart the device and try again. %s\n", esp_err_to_name (err));
nerrors++; nerrors++;
} } else if ((err = spi_bus_initialize (host, &spi_config, SPI_DMA_CH_AUTO)) != ESP_OK) {
else if((err=spi_bus_initialize( host, &spi_config, SPI_DMA_CH_AUTO ))!=ESP_OK){
fprintf (f, "Failed to initialize SPI Bus. %s\n", esp_err_to_name (err)); fprintf (f, "Failed to initialize SPI Bus. %s\n", esp_err_to_name (err));
nerrors++; nerrors++;
} }
} } else {
else {
fprintf (f, "SPI bus initialization failed. %s\n", esp_err_to_name (err)); fprintf (f, "SPI bus initialization failed. %s\n", esp_err_to_name (err));
nerrors++; nerrors++;
} }
@@ -511,9 +496,7 @@ static int do_spiconfig_cmd(int argc, char **argv){
return nerrors; return nerrors;
} }
static int do_i2cconfig_cmd (int argc, char** argv) {
static int do_i2cconfig_cmd(int argc, char **argv)
{
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
i2c_config_t conf = { i2c_config_t conf = {
.mode = I2C_MODE_MASTER, .mode = I2C_MODE_MASTER,
@@ -521,8 +504,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
.sda_pullup_en = GPIO_PULLUP_ENABLE, .sda_pullup_en = GPIO_PULLUP_ENABLE,
.scl_io_num = 18, .scl_io_num = 18,
.scl_pullup_en = GPIO_PULLUP_ENABLE, .scl_pullup_en = GPIO_PULLUP_ENABLE,
.master.clk_speed = 100000 .master.clk_speed = 100000};
};
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cconfig_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cconfig_args);
/* Check "--clear" option */ /* Check "--clear" option */
@@ -578,12 +560,10 @@ static int do_i2cconfig_cmd(int argc, char **argv)
if ((err = i2c_master_driver_initialize (argv[0], &conf)) == ESP_OK) { if ((err = i2c_master_driver_initialize (argv[0], &conf)) == ESP_OK) {
if ((err = i2c_master_driver_install (argv[0])) != ESP_OK) { if ((err = i2c_master_driver_install (argv[0])) != ESP_OK) {
nerrors++; nerrors++;
} } else {
else {
fprintf (f, "i2c driver successfully started.\n"); fprintf (f, "i2c driver successfully started.\n");
} }
} } else {
else {
nerrors++; nerrors++;
} }
} }
@@ -602,8 +582,7 @@ static int do_i2cconfig_cmd(int argc, char **argv)
return nerrors; return nerrors;
} }
static int do_i2cdump_cmd(int argc, char **argv) static int do_i2cdump_cmd (int argc, char** argv) {
{
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cdump_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cdump_args);
if (nerrors != 0) { if (nerrors != 0) {
return 1; return 1;
@@ -636,7 +615,8 @@ static int do_i2cdump_cmd(int argc, char **argv)
uint8_t data_addr; uint8_t data_addr;
uint8_t data[4]; uint8_t data[4];
int32_t block[16]; int32_t block[16];
fprintf(f,"\n 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f" fprintf (f,
"\n 00 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f"
" 0123456789abcdef\r\n"); " 0123456789abcdef\r\n");
for (int i = 0; i < 128; i += 16) { for (int i = 0; i < 128; i += 16) {
fprintf (f, "%02x: ", i); fprintf (f, "%02x: ", i);
@@ -691,8 +671,7 @@ static int do_i2cdump_cmd(int argc, char **argv)
FREE_AND_NULL (buf); FREE_AND_NULL (buf);
return 0; return 0;
} }
static int do_i2cset_cmd(int argc, char **argv) static int do_i2cset_cmd (int argc, char** argv) {
{
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cset_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cset_args);
if (nerrors != 0) { if (nerrors != 0) {
return 1; return 1;
@@ -738,8 +717,7 @@ static int do_i2cset_cmd(int argc, char **argv)
return 0; return 0;
} }
static int do_i2cget_cmd(int argc, char **argv) static int do_i2cget_cmd (int argc, char** argv) {
{
int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cget_args); int nerrors = arg_parse_msg (argc, argv, (struct arg_hdr**)&i2cget_args);
if (nerrors != 0) { if (nerrors != 0) {
return 1; return 1;
@@ -847,7 +825,6 @@ esp_err_t cmd_i2ctools_scan_bus(FILE *f,int sda, int scl){
return ret; return ret;
} }
for (int i = 0; i < 128; i++) { for (int i = 0; i < 128; i++) {
i2c_cmd_handle_t cmd = i2c_cmd_link_create (); i2c_cmd_handle_t cmd = i2c_cmd_link_create ();
i2c_master_start (cmd); i2c_master_start (cmd);
i2c_master_write_byte (cmd, (i << 1) | WRITE_BIT, ACK_CHECK_EN); i2c_master_write_byte (cmd, (i << 1) | WRITE_BIT, ACK_CHECK_EN);
@@ -864,15 +841,13 @@ esp_err_t cmd_i2ctools_scan_bus(FILE *f,int sda, int scl){
for (int i = 0; i < last_match; i++) { for (int i = 0; i < last_match; i++) {
fprintf (f, "%u [%02xh]- %s\n", matches[i], matches[i], i2c_get_description (matches[i])); fprintf (f, "%u [%02xh]- %s\n", matches[i], matches[i], i2c_get_description (matches[i]));
} }
} } else {
else {
fprintf (f, "No i2c devices found with scl-%d and sda-%d\n", scl, sda); fprintf (f, "No i2c devices found with scl-%d and sda-%d\n", scl, sda);
} }
return 0; return 0;
} }
static int do_i2cdetect_cmd(int argc, char **argv) static int do_i2cdetect_cmd (int argc, char** argv) {
{
uint8_t matches[128] = {}; uint8_t matches[128] = {};
int last_match = 0; int last_match = 0;
esp_err_t ret = ESP_OK; esp_err_t ret = ESP_OK;
@@ -890,7 +865,6 @@ static int do_i2cdetect_cmd(int argc, char **argv)
return 1; return 1;
} }
fprintf (f, "\n 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n"); fprintf (f, "\n 0 1 2 3 4 5 6 7 8 9 a b c d e f\r\n");
for (int i = 0; i < 128; i += 16) { for (int i = 0; i < 128; i += 16) {
fprintf (f, "%02x: ", i); fprintf (f, "%02x: ", i);
@@ -913,10 +887,10 @@ static int do_i2cdetect_cmd(int argc, char **argv)
} }
fprintf (f, "\r\n"); fprintf (f, "\r\n");
} }
if (last_match) { if (last_match) {
fprintf(f,"\r\n------------------------------------------------------------------------------------" fprintf (f,
"\r\n------------------------------------------------------------------------------------"
"\r\nDetected the following devices (names provided by https://i2cdevices.org/addresses)."); "\r\nDetected the following devices (names provided by https://i2cdevices.org/addresses).");
for (int i = 0; i < last_match; i++) { for (int i = 0; i < last_match; i++) {
@@ -1003,26 +977,22 @@ static void register_i2c_set_display(){
.help = desc_display, .help = desc_display,
.hint = NULL, .hint = NULL,
.func = &do_i2c_set_display, .func = &do_i2c_set_display,
.argtable = &i2cdisp_args .argtable = &i2cdisp_args};
};
cmd_to_json_with_cb (&i2c_set_display, &i2c_set_display_cb); cmd_to_json_with_cb (&i2c_set_display, &i2c_set_display_cb);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2c_set_display)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2c_set_display));
} }
static void register_i2cdectect(void) static void register_i2cdectect (void) {
{
const esp_console_cmd_t i2cdetect_cmd = { const esp_console_cmd_t i2cdetect_cmd = {
.command = "i2cdetect", .command = "i2cdetect",
.help = "Scan I2C bus for devices", .help = "Scan I2C bus for devices",
.hint = NULL, .hint = NULL,
.func = &do_i2cdetect_cmd, .func = &do_i2cdetect_cmd,
.argtable = NULL .argtable = NULL};
};
cmd_to_json (&i2cdetect_cmd); cmd_to_json (&i2cdetect_cmd);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2cdetect_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2cdetect_cmd));
} }
static void register_i2cget(void) static void register_i2cget (void) {
{
i2cget_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus"); i2cget_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus");
i2cget_args.register_address = arg_int0 ("r", "register", "<register_addr>", "Specify the address on that chip to read from"); i2cget_args.register_address = arg_int0 ("r", "register", "<register_addr>", "Specify the address on that chip to read from");
i2cget_args.data_length = arg_int0 ("l", "length", "<length>", "Specify the length to read from that data address"); i2cget_args.data_length = arg_int0 ("l", "length", "<length>", "Specify the length to read from that data address");
@@ -1032,14 +1002,12 @@ static void register_i2cget(void)
.help = "Read registers visible through the I2C bus", .help = "Read registers visible through the I2C bus",
.hint = NULL, .hint = NULL,
.func = &do_i2cget_cmd, .func = &do_i2cget_cmd,
.argtable = &i2cget_args .argtable = &i2cget_args};
};
cmd_to_json (&i2cget_cmd); cmd_to_json (&i2cget_cmd);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2cget_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2cget_cmd));
} }
static void register_i2cset(void) static void register_i2cset (void) {
{
i2cset_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus"); i2cset_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus");
i2cset_args.register_address = arg_int0 ("r", "register", "<register_addr>", "Specify the address on that chip to read from"); i2cset_args.register_address = arg_int0 ("r", "register", "<register_addr>", "Specify the address on that chip to read from");
i2cset_args.data = arg_intn (NULL, NULL, "<data>", 0, 256, "Specify the data to write to that data address"); i2cset_args.data = arg_intn (NULL, NULL, "<data>", 0, 256, "Specify the data to write to that data address");
@@ -1051,14 +1019,12 @@ static void register_i2cset(void)
.help = "Set registers visible through the I2C bus", .help = "Set registers visible through the I2C bus",
.hint = NULL, .hint = NULL,
.func = &do_i2cset_cmd, .func = &do_i2cset_cmd,
.argtable = &i2cset_args .argtable = &i2cset_args};
};
cmd_to_json (&i2cset_cmd); cmd_to_json (&i2cset_cmd);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2cset_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2cset_cmd));
} }
static void register_i2cdump(void) static void register_i2cdump (void) {
{
i2cdump_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus"); i2cdump_args.chip_address = arg_int1 ("c", "chip", "<chip_addr>", "Specify the address of the chip on that bus");
i2cdump_args.size = arg_int0 ("s", "size", "<size>", "Specify the size of each read"); i2cdump_args.size = arg_int0 ("s", "size", "<size>", "Specify the size of each read");
i2cdump_args.end = arg_end (3); i2cdump_args.end = arg_end (3);
@@ -1067,13 +1033,11 @@ static void register_i2cdump(void)
.help = "Examine registers visible through the I2C bus", .help = "Examine registers visible through the I2C bus",
.hint = NULL, .hint = NULL,
.func = &do_i2cdump_cmd, .func = &do_i2cdump_cmd,
.argtable = &i2cdump_args .argtable = &i2cdump_args};
};
cmd_to_json (&i2cdump_cmd); cmd_to_json (&i2cdump_cmd);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2cdump_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2cdump_cmd));
} }
cJSON* i2config_cb () { cJSON* i2config_cb () {
cJSON* values = cJSON_CreateObject (); cJSON* values = cJSON_CreateObject ();
int i2c_port; int i2c_port;
@@ -1110,8 +1074,7 @@ cJSON * spiconfig_cb(){
return values; return values;
} }
static void register_spiconfig(void) static void register_spiconfig (void) {
{
spiconfig_args.clear = arg_lit0 (NULL, "clear", "Clear configuration"); spiconfig_args.clear = arg_lit0 (NULL, "clear", "Clear configuration");
spiconfig_args.clk = arg_int0 ("k", "clk", "<n>", "Clock GPIO"); spiconfig_args.clk = arg_int0 ("k", "clk", "<n>", "Clock GPIO");
spiconfig_args.data = arg_int0 ("d", "data", "<n>", "Data OUT GPIO"); spiconfig_args.data = arg_int0 ("d", "data", "<n>", "Data OUT GPIO");
@@ -1124,13 +1087,11 @@ static void register_spiconfig(void)
.help = desc_spiconfig, .help = desc_spiconfig,
.hint = NULL, .hint = NULL,
.func = &do_spiconfig_cmd, .func = &do_spiconfig_cmd,
.argtable = &spiconfig_args .argtable = &spiconfig_args};
};
cmd_to_json_with_cb (&spiconfig_cmd, &spiconfig_cb); cmd_to_json_with_cb (&spiconfig_cmd, &spiconfig_cb);
ESP_ERROR_CHECK (esp_console_cmd_register (&spiconfig_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&spiconfig_cmd));
} }
static void register_i2cconfig(void) static void register_i2cconfig (void) {
{
i2cconfig_args.clear = arg_lit0 (NULL, "clear", "Clear configuration"); i2cconfig_args.clear = arg_lit0 (NULL, "clear", "Clear configuration");
i2cconfig_args.port = arg_int0 ("p", "port", "0|1", "Port"); i2cconfig_args.port = arg_int0 ("p", "port", "0|1", "Port");
i2cconfig_args.freq = arg_int0 ("f", "speed", "int", "Frequency (Hz) e.g. 100000"); i2cconfig_args.freq = arg_int0 ("f", "speed", "int", "Frequency (Hz) e.g. 100000");
@@ -1142,14 +1103,12 @@ static void register_i2cconfig(void)
.help = desc_i2c, .help = desc_i2c,
.hint = NULL, .hint = NULL,
.func = &do_i2cconfig_cmd, .func = &do_i2cconfig_cmd,
.argtable = &i2cconfig_args .argtable = &i2cconfig_args};
};
cmd_to_json_with_cb (&i2cconfig_cmd, &i2config_cb); cmd_to_json_with_cb (&i2cconfig_cmd, &i2config_cb);
ESP_ERROR_CHECK (esp_console_cmd_register (&i2cconfig_cmd)); ESP_ERROR_CHECK (esp_console_cmd_register (&i2cconfig_cmd));
} }
void register_i2ctools(void) void register_i2ctools (void) {
{
register_i2cconfig (); register_i2cconfig ();
register_spiconfig (); register_spiconfig ();
register_i2cdectect (); register_i2cdectect ();

142
components/platform_console/cmd_system.c
View File

@@ -73,24 +73,42 @@ static void register_set_services();
static void register_tasks(); static void register_tasks();
#endif #endif
extern BaseType_t network_manager_task; extern BaseType_t network_manager_task;
FILE * system_open_memstream(const char * cmdname,char **buf,size_t *buf_size){
FILE *f = open_memstream(buf, buf_size);
if (f == NULL) {
cmd_send_messaging(cmdname,MESSAGING_ERROR,"Unable to open memory stream.");
}
return f;
}
void register_system() void register_system()
{ {
register_free();
register_setdevicename();
register_set_services(); register_set_services();
register_free();
register_heap(); register_heap();
register_dump_heap(); register_dump_heap();
register_setdevicename();
register_version(); register_version();
register_restart(); register_restart();
register_deep_sleep();
register_light_sleep();
register_factory_boot(); register_factory_boot();
register_restart_ota(); register_restart_ota();
#if WITH_TASKS_INFO #if WITH_TASKS_INFO
register_tasks(); register_tasks();
#endif #endif
#if CONFIG_WITH_CONFIG_UI
register_deep_sleep();
register_light_sleep();
#endif
}
void simple_restart()
{
log_send_messaging(MESSAGING_WARNING,"Rebooting.");
if(!wait_for_commit()){
log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
} }
/* 'version' command */ /* 'version' command */
static int get_version(int argc, char **argv) static int get_version(int argc, char **argv)
{ {
@@ -128,36 +146,23 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
{ {
if(is_recovery_running){ if(is_recovery_running){
if(partition_subtype ==ESP_PARTITION_SUBTYPE_APP_FACTORY){ if(partition_subtype ==ESP_PARTITION_SUBTYPE_APP_FACTORY){
log_send_messaging(MESSAGING_WARNING,"RECOVERY application is already active"); // log_send_messaging(MESSAGING_WARNING,"RECOVERY application is already active");
if(!wait_for_commit()){ simple_restart();
log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
return ESP_OK;
} }
} }
else { else {
if(partition_subtype !=ESP_PARTITION_SUBTYPE_APP_FACTORY){ if(partition_subtype !=ESP_PARTITION_SUBTYPE_APP_FACTORY){
log_send_messaging(MESSAGING_WARNING,"SQUEEZELITE application is already active"); // log_send_messaging(MESSAGING_WARNING,"SQUEEZELITE application is already active");
if(!wait_for_commit()){ simple_restart();
log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
return ESP_OK;
} }
} }
esp_err_t err = ESP_OK; esp_err_t err = ESP_OK;
bool bFound=false; // log_send_messaging(MESSAGING_INFO, "Looking for partition type %u",partition_subtype);
log_send_messaging(MESSAGING_INFO, "Looking for partition type %u",partition_subtype);
const esp_partition_t *partition; const esp_partition_t *partition;
esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_APP, partition_subtype, NULL); esp_partition_iterator_t it = esp_partition_find(ESP_PARTITION_TYPE_APP, partition_subtype, NULL);
if(it == NULL){ if(it == NULL){
log_send_messaging(MESSAGING_ERROR,"Reboot failed. Cannot iterate through partitions"); log_send_messaging(MESSAGING_ERROR,"Reboot failed. Partitions error");
} }
else else
{ {
@@ -166,15 +171,11 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
ESP_LOGD(TAG, "Releasing partition iterator"); ESP_LOGD(TAG, "Releasing partition iterator");
esp_partition_iterator_release(it); esp_partition_iterator_release(it);
if(partition != NULL){ if(partition != NULL){
log_send_messaging(MESSAGING_INFO, "Found application partition %s sub type %u", partition->label,partition_subtype); log_send_messaging(MESSAGING_INFO, "Rebooting to %s", partition->label);
err=esp_ota_set_boot_partition(partition); err=esp_ota_set_boot_partition(partition);
if(err!=ESP_OK){ if(err!=ESP_OK){
bFound=false;
log_send_messaging(MESSAGING_ERROR,"Unable to select partition for reboot: %s",esp_err_to_name(err)); log_send_messaging(MESSAGING_ERROR,"Unable to select partition for reboot: %s",esp_err_to_name(err));
} }
else{
bFound=true;
}
} }
else else
{ {
@@ -183,13 +184,7 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
} }
ESP_LOGD(TAG, "Yielding to other processes"); ESP_LOGD(TAG, "Yielding to other processes");
taskYIELD(); taskYIELD();
if(bFound) { simple_restart();
if(!wait_for_commit()){
log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration changes. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
}
} }
return ESP_OK; return ESP_OK;
@@ -197,46 +192,31 @@ esp_err_t guided_boot(esp_partition_subtype_t partition_subtype)
static int restart(int argc, char **argv) static int restart(int argc, char **argv)
{ {
log_send_messaging(MESSAGING_WARNING, "\n\nPerforming a simple restart to the currently active partition."); simple_restart();
if(!wait_for_commit()){
cmd_send_messaging(argv[0],MESSAGING_WARNING,"Unable to commit configuration. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
return 0; return 0;
} }
void simple_restart()
{
log_send_messaging(MESSAGING_WARNING,"System reboot requested.");
if(!wait_for_commit()){
log_send_messaging(MESSAGING_WARNING,"Unable to commit configuration. ");
}
vTaskDelay(750/ portTICK_PERIOD_MS);
esp_restart();
}
esp_err_t guided_restart_ota(){ esp_err_t guided_restart_ota(){
log_send_messaging(MESSAGING_WARNING,"System reboot to Application requested"); log_send_messaging(MESSAGING_WARNING,"Booting to Squeezelite");
guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0); guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
return ESP_FAIL; // return fail. This should never return... we're rebooting! return ESP_FAIL; // return fail. This should never return... we're rebooting!
} }
esp_err_t guided_factory(){ esp_err_t guided_factory(){
log_send_messaging(MESSAGING_WARNING,"System reboot to recovery requested"); log_send_messaging(MESSAGING_WARNING,"Booting to recovery");
guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY); guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
return ESP_FAIL; // return fail. This should never return... we're rebooting! return ESP_FAIL; // return fail. This should never return... we're rebooting!
} }
static int restart_factory(int argc, char **argv) static int restart_factory(int argc, char **argv)
{ {
cmd_send_messaging(argv[0],MESSAGING_WARNING, "Executing guided boot into recovery"); cmd_send_messaging(argv[0],MESSAGING_WARNING, "Booting to Recovery");
guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY); guided_boot(ESP_PARTITION_SUBTYPE_APP_FACTORY);
return 0; // return fail. This should never return... we're rebooting! return 0; // return fail. This should never return... we're rebooting!
} }
static int restart_ota(int argc, char **argv) static int restart_ota(int argc, char **argv)
{ {
cmd_send_messaging(argv[0],MESSAGING_WARNING, "Executing guided boot into ota app 0"); cmd_send_messaging(argv[0],MESSAGING_WARNING, "Booting to Squeezelite");
guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0); guided_boot(ESP_PARTITION_SUBTYPE_APP_OTA_0);
return 0; // return fail. This should never return... we're rebooting! return 0; // return fail. This should never return... we're rebooting!
} }
@@ -248,7 +228,9 @@ static void register_restart()
.hint = NULL, .hint = NULL,
.func = &restart, .func = &restart,
}; };
#if CONFIG_WITH_CONFIG_UI
cmd_to_json(&cmd); cmd_to_json(&cmd);
#endif
ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) ); ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
} }
static void register_restart_ota() static void register_restart_ota()
@@ -259,7 +241,9 @@ static void register_restart_ota()
.hint = NULL, .hint = NULL,
.func = &restart_ota, .func = &restart_ota,
}; };
#if CONFIG_WITH_CONFIG_UI
cmd_to_json(&cmd); cmd_to_json(&cmd);
#endif
ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) ); ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
} }
@@ -271,7 +255,9 @@ static void register_factory_boot()
.hint = NULL, .hint = NULL,
.func = &restart_factory, .func = &restart_factory,
}; };
#if CONFIG_WITH_CONFIG_UI
cmd_to_json(&cmd); cmd_to_json(&cmd);
#endif
ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) ); ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
} }
/** 'free' command prints available heap memory */ /** 'free' command prints available heap memory */
@@ -287,11 +273,14 @@ static void register_free()
{ {
const esp_console_cmd_t cmd = { const esp_console_cmd_t cmd = {
.command = "free", .command = "free",
.help = "Get the current size of free heap memory", .help = "Get free heap memory",
.hint = NULL, .hint = NULL,
.func = &free_mem, .func = &free_mem,
}; };
#if CONFIG_WITH_CONFIG_UI
cmd_to_json(&cmd); cmd_to_json(&cmd);
#endif
ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) ); ESP_ERROR_CHECK( esp_console_cmd_register(&cmd) );
} }
static int dump_heap(int argc, char **argv) static int dump_heap(int argc, char **argv)
@@ -303,16 +292,16 @@ static int dump_heap(int argc, char **argv)
/* 'heap' command prints minumum heap size */ /* 'heap' command prints minumum heap size */
static int heap_size(int argc, char **argv) static int heap_size(int argc, char **argv)
{ {
ESP_LOGI(TAG,"Heap internal:%zu (min:%zu) (largest block:%zu)\nexternal:%zu (min:%zu) (largest block:%zd)\ndma :%zu (min:%zu) (largest block:%zd)", // ESP_LOGI(TAG,"Heap internal:%zu (min:%zu) (largest block:%zu)\nexternal:%zu (min:%zu) (largest block:%zd)\ndma :%zu (min:%zu) (largest block:%zd)",
heap_caps_get_free_size(MALLOC_CAP_INTERNAL), // heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL), // heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL), // heap_caps_get_largest_free_block(MALLOC_CAP_INTERNAL),
heap_caps_get_free_size(MALLOC_CAP_SPIRAM), // heap_caps_get_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM), // heap_caps_get_minimum_free_size(MALLOC_CAP_SPIRAM),
heap_caps_get_largest_free_block(MALLOC_CAP_SPIRAM), // heap_caps_get_largest_free_block(MALLOC_CAP_SPIRAM),
heap_caps_get_free_size(MALLOC_CAP_DMA), // heap_caps_get_free_size(MALLOC_CAP_DMA),
heap_caps_get_minimum_free_size(MALLOC_CAP_DMA), // heap_caps_get_minimum_free_size(MALLOC_CAP_DMA),
heap_caps_get_largest_free_block(MALLOC_CAP_DMA)); // heap_caps_get_largest_free_block(MALLOC_CAP_DMA));
cmd_send_messaging(argv[0],MESSAGING_INFO,"Heap internal:%zu (min:%zu) (largest block:%zu)\nexternal:%zu (min:%zu) (largest block:%zd)\ndma :%zu (min:%zu) (largest block:%zd)", cmd_send_messaging(argv[0],MESSAGING_INFO,"Heap internal:%zu (min:%zu) (largest block:%zu)\nexternal:%zu (min:%zu) (largest block:%zd)\ndma :%zu (min:%zu) (largest block:%zd)",
heap_caps_get_free_size(MALLOC_CAP_INTERNAL), heap_caps_get_free_size(MALLOC_CAP_INTERNAL),
heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL), heap_caps_get_minimum_free_size(MALLOC_CAP_INTERNAL),
@@ -457,9 +446,8 @@ static int setdevicename(int argc, char **argv)
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0],&buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
return 1; return 1;
} }
nerrors+=setnamevar("a2dp_dev_name", f, name); nerrors+=setnamevar("a2dp_dev_name", f, name);
@@ -488,11 +476,13 @@ static void register_heap()
{ {
const esp_console_cmd_t heap_cmd = { const esp_console_cmd_t heap_cmd = {
.command = "heap", .command = "heap",
.help = "Get minimum size of free heap memory found during execution", .help = "Get minimum size of free heap memory",
.hint = NULL, .hint = NULL,
.func = &heap_size, .func = &heap_size,
}; };
#if CONFIG_WITH_CONFIG_UI
cmd_to_json(&heap_cmd); cmd_to_json(&heap_cmd);
#endif
ESP_ERROR_CHECK( esp_console_cmd_register(&heap_cmd) ); ESP_ERROR_CHECK( esp_console_cmd_register(&heap_cmd) );
} }
@@ -521,6 +511,7 @@ static void register_setdevicename()
.func = &setdevicename, .func = &setdevicename,
.argtable = &name_args .argtable = &name_args
}; };
cmd_to_json_with_cb(&set_name,&setdevicename_cb); cmd_to_json_with_cb(&set_name,&setdevicename_cb);
ESP_ERROR_CHECK(esp_console_cmd_register(&set_name)); ESP_ERROR_CHECK(esp_console_cmd_register(&set_name));
} }
@@ -618,9 +609,7 @@ static void register_deep_sleep()
const esp_console_cmd_t cmd = { const esp_console_cmd_t cmd = {
.command = "deep_sleep", .command = "deep_sleep",
.help = "Enter deep sleep mode. " .help = "Enter deep sleep mode. ",
"Two wakeup modes are supported: timer and GPIO. "
"If no wakeup option is specified, will sleep indefinitely.",
.hint = NULL, .hint = NULL,
.func = &deep_sleep, .func = &deep_sleep,
.argtable = &deep_sleep_args .argtable = &deep_sleep_args
@@ -649,9 +638,8 @@ static int do_set_services(int argc, char **argv)
} }
char *buf = NULL; char *buf = NULL;
size_t buf_size = 0; size_t buf_size = 0;
FILE *f = open_memstream(&buf, &buf_size); FILE *f = system_open_memstream(argv[0],&buf, &buf_size);
if (f == NULL) { if (f == NULL) {
cmd_send_messaging(argv[0],MESSAGING_ERROR,"Unable to open memory stream.");
return 1; return 1;
} }
@@ -674,7 +662,7 @@ static int do_set_services(int argc, char **argv)
if(err!=ESP_OK){ if(err!=ESP_OK){
nerrors++; nerrors++;
fprintf(f,"Error setting telnet service to %s. %s\n",set_services_args.telnet->sval[0], esp_err_to_name(err)); fprintf(f,"Error setting telnet to %s. %s\n",set_services_args.telnet->sval[0], esp_err_to_name(err));
} }
else { else {
fprintf(f,"Telnet service changed to %s\n",set_services_args.telnet->sval[0]); fprintf(f,"Telnet service changed to %s\n",set_services_args.telnet->sval[0]);
@@ -706,7 +694,6 @@ cJSON * set_services_cb(){
#if WITH_TASKS_INFO #if WITH_TASKS_INFO
console_set_bool_parameter(values,"stats",set_services_args.stats); console_set_bool_parameter(values,"stats",set_services_args.stats);
#endif #endif
if ((p = config_alloc_get(NVS_TYPE_STR, "telnet_enable")) != NULL) { if ((p = config_alloc_get(NVS_TYPE_STR, "telnet_enable")) != NULL) {
if(strcasestr("YX",p)!=NULL){ if(strcasestr("YX",p)!=NULL){
cJSON_AddStringToObject(values,set_services_args.telnet->hdr.longopts,"Telnet Only"); cJSON_AddStringToObject(values,set_services_args.telnet->hdr.longopts,"Telnet Only");
@@ -717,7 +704,6 @@ cJSON * set_services_cb(){
else { else {
cJSON_AddStringToObject(values,set_services_args.telnet->hdr.longopts,"Disabled"); cJSON_AddStringToObject(values,set_services_args.telnet->hdr.longopts,"Disabled");
} }
FREE_AND_NULL(p); FREE_AND_NULL(p);
} }

1
components/platform_console/cmd_system.h
View File

@@ -17,6 +17,7 @@ void register_system();
esp_err_t guided_factory(); esp_err_t guided_factory();
esp_err_t guided_restart_ota(); esp_err_t guided_restart_ota();
void simple_restart(); void simple_restart();
FILE * system_open_memstream(const char * cmdname,char **buf,size_t *buf_size);
#ifdef __cplusplus #ifdef __cplusplus
} }

2
components/platform_console/cmd_wifi.c
View File

@@ -204,8 +204,10 @@ void register_wifi_join()
void register_wifi() void register_wifi()
{ {
#ifdef WIFI_CMDLINE
register_wifi_join(); register_wifi_join();
if(bypass_network_manager){ if(bypass_network_manager){
initialise_wifi(); initialise_wifi();
} }
#endif
} }

2
components/services/accessors.h
View File

@@ -13,7 +13,7 @@
#include "driver/i2s.h" #include "driver/i2s.h"
#include "driver/spi_master.h" #include "driver/spi_master.h"
#include "gpio_exp.h" #include "gpio_exp.h"
#include "cJSON.h"
extern const char *i2c_name_type; extern const char *i2c_name_type;
extern const char *spi_name_type; extern const char *spi_name_type;

3
components/wifi-manager/webapp/package.json
View File

@@ -22,7 +22,6 @@
"babel": "^6.23.0", "babel": "^6.23.0",
"babel-loader": "^8.2.3", "babel-loader": "^8.2.3",
"babel-runtime": "^6.26.0", "babel-runtime": "^6.26.0",
"bootswatch": "file:src/bootswatch",
"clean-webpack-plugin": "^4.0.0", "clean-webpack-plugin": "^4.0.0",
"commander": "^8.3.0", "commander": "^8.3.0",
"compression-webpack-plugin": "^9.2.0", "compression-webpack-plugin": "^9.2.0",
@@ -75,8 +74,10 @@
"@babel/runtime": "^7.16.7", "@babel/runtime": "^7.16.7",
"async-mutex": "^0.3.2", "async-mutex": "^0.3.2",
"bootstrap": "^5.1.3", "bootstrap": "^5.1.3",
"bootswatch": "^5.3.2",
"jquery": "^3.6.0", "jquery": "^3.6.0",
"npm": "^10.1.0", "npm": "^10.1.0",
"optipng-bin": "^9.0.0",
"popper.js": "^1.16.1", "popper.js": "^1.16.1",
"webpack-visualizer-plugin": "^0.1.11", "webpack-visualizer-plugin": "^0.1.11",
"webpack-visualizer-plugin2": "^1.0.0" "webpack-visualizer-plugin2": "^1.0.0"

12
components/wifi-manager/webapp/src/index.ejs
View File

@@ -99,7 +99,7 @@
<div class="tab-pane fade" id="tab-cfg-gen"></div> <div class="tab-pane fade" id="tab-cfg-gen"></div>
<div class="tab-pane fade" id="tab-cfg-fw"> <div class="tab-pane fade" id="tab-cfg-fw">
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">Software Updates</div> <div class="card-header">Software Updates</div>
<div class="card-body"> <div class="card-body">
<table class="table table-hover table-striped table-dark"> <table class="table table-hover table-striped table-dark">
@@ -171,7 +171,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">Local Firmware Upload</div> <div class="card-header">Local Firmware Upload</div>
<div class="card-body"> <div class="card-body">
<div id="uploaddiv" class="form-group row "> <div id="uploaddiv" class="form-group row ">
@@ -216,7 +216,7 @@
</div> </div>
<div class="tab-pane fade" id="tab-cfg-audio"> <div class="tab-pane fade" id="tab-cfg-audio">
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">Usage Templates</div> <div class="card-header">Usage Templates</div>
<div class="card-body"> <div class="card-body">
<fieldset class="form-group" id="output-tmpl"> <fieldset class="form-group" id="output-tmpl">
@@ -355,7 +355,7 @@
</div> </div>
</div> </div>
<div class="tab-pane fade active show" id="tab-wifi"> <div class="tab-pane fade active show" id="tab-wifi">
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">WiFi Status</div> <div class="card-header">WiFi Status</div>
<div class="card-body if_eth" style="display: none"> <div class="card-body if_eth" style="display: none">
@@ -527,7 +527,7 @@
</div> </div>
<!-- syslog --> <!-- syslog -->
<div class="tab-pane fade " id="tab-credits"> <div class="tab-pane fade " id="tab-credits">
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">Credits</div> <div class="card-header">Credits</div>
<div class="card-body"> <div class="card-body">
<p><strong><a <p><strong><a
@@ -554,7 +554,7 @@
</ul> </ul>
</div> </div>
</div> </div>
<div class="card text-white mb-3"> <div class="card mb-3">
<div class="card-header">Extras/Overrides</div> <div class="card-header">Extras/Overrides</div>
<div class="card-body"> <div class="card-body">
<fieldset> <fieldset>

2
components/wifi-manager/webapp/src/js/custom.js
View File

@@ -2097,7 +2097,7 @@ function getCommands() {
const isConfig = cmdParts[0] === 'cfg'; const isConfig = cmdParts[0] === 'cfg';
const targetDiv = '#tab-' + cmdParts[0] + '-' + cmdParts[1]; const targetDiv = '#tab-' + cmdParts[0] + '-' + cmdParts[1];
let innerhtml = ''; let innerhtml = '';
innerhtml += `<div class="card text-white mb-3"><div class="card-header">${command.help.encodeHTML().replace(/\n/g, '<br />')}</div><div class="card-body"><fieldset id="flds-${command.name}">`; innerhtml += `<div class="card mb-3"><div class="card-header">${command.help.encodeHTML().replace(/\n/g, '<br />')}</div><div class="card-body"><fieldset id="flds-${command.name}">`;
if (command.argtable) { if (command.argtable) {
command.argtable.forEach(function (arg) { command.argtable.forEach(function (arg) {
let placeholder = arg.datatype || ''; let placeholder = arg.datatype || '';

4
components/wifi-manager/webapp/src/sass/main.scss
View File

@@ -1,5 +1,5 @@
@import "~bootswatch/dist/darkly/variables"; // @import "~bootswatch/dist/darkly/variables"; -- remove darkly until bootswatch color is resolved
@import "utils/variables"; @import "utils/variables";
@import "~bootstrap/scss/bootstrap"; @import "~bootstrap/scss/bootstrap";
// @import "~bootstrap/scss/functions"; // @import "~bootstrap/scss/functions";
@@ -38,5 +38,5 @@
// // Utilities // // Utilities
// @import "~bootstrap/scss/utilities/api"; // @import "~bootstrap/scss/utilities/api";
@import "~bootswatch/dist/darkly/bootswatch"; // @import "~bootswatch/dist/darkly/bootswatch"; -- remove darkly until bootswatch color is resolved
@import "utils/style"; @import "utils/style";

117
components/wifi-manager/webapp/webpack/BuildEventsHook.js Normal file
View File

@@ -0,0 +1,117 @@
const path = require("path");
const fs = require('fs');
const zlib = require("zlib");
const glob = require('glob');
class BuildEventsHook {
constructor(name, fn, stage = 'afterEmit') {
this.name = name;
this.stage = stage;
this.function = fn;
}
apply(compiler) {
compiler.hooks[this.stage].tap(this.name, this.function);
}
}
function createBuildEventsHook(options){
return new BuildEventsHook('Update C App',
function (stats, arguments) {
if (options.mode !== "production") return;
let buildRootPath = path.join(process.cwd(), '..', '..', '..');
let wifiManagerPath = glob.sync(path.join(buildRootPath, 'components/**/wifi-manager*'))[0];
let buildCRootPath = glob.sync(buildRootPath)[0];
fs.appendFileSync('./dist/index.html.gz',
zlib.gzipSync(fs.readFileSync('./dist/index.html'),
{
chunckSize: 65536,
level: zlib.constants.Z_BEST_COMPRESSION
}));
let getDirectories = function getDirectories (src, callback) {
let searchPath = path.posix.join(src, '/**/*(*.gz|favicon-32x32.png)');
console.log(`Post build: Getting file list from ${searchPath}`);
glob(searchPath, callback);
};
let cleanUpPath = path.posix.join(buildCRootPath, '/build/*.S');
console.log(`Post build: Cleaning up previous builds in ${cleanUpPath}`);
glob(cleanUpPath, function (err, list) {
if (err) {
console.error('Error', err);
} else {
list.forEach(fileName => {
try {
console.log(`Post build: Purging old binary file ${fileName} from C project.`);
fs.unlinkSync(fileName)
//file removed
} catch (ferr) {
console.error(ferr)
}
});
}
},
'afterEmit'
);
console.log('Generating C include files from webpack build output');
getDirectories('./dist', function (err, list) {
console.log(`Post build: found ${list.length} files. Relative path: ${wifiManagerPath}.`);
if (err) {
console.log('Error', err);
} else {
let exportDefHead =
`/***********************************
webpack_headers
${arguments[1]}
***********************************/
#pragma once
#include <inttypes.h>
extern const char * resource_lookups[];
extern const uint8_t * resource_map_start[];
extern const uint8_t * resource_map_end[];`;
let exportDef = '// Automatically generated. Do not edit manually!.\n' +
'#include <inttypes.h>\n';
let lookupDef = 'const char * resource_lookups[] = {\n';
let lookupMapStart = 'const uint8_t * resource_map_start[] = {\n';
let lookupMapEnd = 'const uint8_t * resource_map_end[] = {\n';
let cMake = '';
list.forEach(foundFile => {
let exportName = path.basename(foundFile).replace(/[\. \-]/gm, '_');
//take the full path of the file and make it relative to the build directory
let cmakeFileName = path.posix.relative(wifiManagerPath, glob.sync(path.resolve(foundFile))[0]);
let httpRelativePath = path.posix.join('/', path.posix.relative('dist', foundFile));
exportDef += `extern const uint8_t _${exportName}_start[] asm("_binary_${exportName}_start");\nextern const uint8_t _${exportName}_end[] asm("_binary_${exportName}_end");\n`;
lookupDef += `\t"${httpRelativePath}",\n`;
lookupMapStart += '\t_' + exportName + '_start,\n';
lookupMapEnd += '\t_' + exportName + '_end,\n';
cMake += `target_add_binary_data( __idf_wifi-manager ${cmakeFileName} BINARY)\n`;
console.log(`Post build: adding cmake file reference to ${cmakeFileName} from C project, with web path ${httpRelativePath}.`);
});
lookupDef += '""\n};\n';
lookupMapStart = lookupMapStart.substring(0, lookupMapStart.length - 2) + '\n};\n';
lookupMapEnd = lookupMapEnd.substring(0, lookupMapEnd.length - 2) + '\n};\n';
try {
fs.writeFileSync('webapp.cmake', cMake);
fs.writeFileSync('webpack.c', exportDef + lookupDef + lookupMapStart + lookupMapEnd);
fs.writeFileSync('webpack.h', exportDefHead);
//file written successfully
} catch (e) {
console.error(e);
}
}
});
console.log('Post build completed.');
})
}
module.exports = {
BuildEventsHook,
createBuildEventsHook
}

4
components/wifi-manager/webapp/webpack/webpack.dev.js
View File

@@ -6,7 +6,7 @@ const HtmlWebPackPlugin = require('html-webpack-plugin');
const { Command } = require('commander'); const { Command } = require('commander');
let cmdLines= { }; let cmdLines= { };
var { parseArgsStringToArgv } = require('string-argv'); var { parseArgsStringToArgv } = require('string-argv');
const PORT = 9100; const PORT = 5000;
const data = { const data = {
messages: require("../mock/messages.json"), messages: require("../mock/messages.json"),
@@ -159,7 +159,7 @@ module.exports ={
open: true, open: true,
compress: true, compress: true,
port: PORT, port: PORT,
host: '127.0.0.1',//your ip address host: '0.0.0.0',
allowedHosts: "all", allowedHosts: "all",
headers: {'Access-Control-Allow-Origin': '*', 'Accept-Encoding': 'identity'}, headers: {'Access-Control-Allow-Origin': '*', 'Accept-Encoding': 'identity'},
client: { client: {

91
docker/ToggleGitTracking.ps1 Normal file
View File

@@ -0,0 +1,91 @@
param (
[Parameter(Position=0, Mandatory=$false)]
[ValidateSet("t", "u", "d")]
[string]$option
)
# Get the current directory
$currentDir = Get-Location
# Define target directories
$targetDir = "components\wifi-manager\webapp"
$distDir = "$targetDir\dist"
# Get list of files from the 'dist' directory
$fsFiles = Get-ChildItem -Recurse $distDir -File | ForEach-Object {
$_.FullName.Substring($currentDir.Path.Length + 1).Replace("\", "/")
}
# Define additional files to include
$additionalFiles = @("webpack.c", "webpack.h", "webapp.cmake")
# Check if additional files exist in $targetDir and format them
$additionalFilesFormatted = @()
Get-ChildItem $targetDir -File | ForEach-Object {
if ($additionalFiles -contains $_.Name) {
$formatted = $_.FullName.Substring($currentDir.Path.Length + 1).Replace("\", "/")
$additionalFilesFormatted += $formatted
Write-Host "Found $formatted"
}
}
# Get list of files from the Git index
$indexFiles = git ls-files -s $distDir | ForEach-Object {
($_ -split "\s+")[3]
}
# Combine and remove duplicates
$allFiles = $fsFiles + $additionalFilesFormatted + $indexFiles | Sort-Object -Unique
# ... (previous code remains unchanged)
# Apply the git command based on the option
$allFiles | ForEach-Object {
$relativePath = $_
$isInIndex = $indexFiles -contains $relativePath
if ($null -eq $option) {
$gitStatus = & git status --porcelain -- $relativePath
if ($gitStatus) {
$status = ($gitStatus -split "\s")[0]
Write-Host "$relativePath has Git status: $status"
} else {
Write-Host "$relativePath is not tracked"
}
}
elseif ($isInIndex) {
if ($option -eq "d") {
$resetResult = & git reset -- $relativePath 2>&1
if ($resetResult -match 'error:') {
Write-Host "Error resetting ${relativePath}: $resetResult"
continue
}
$checkoutResult = & git checkout -- $relativePath 2>&1
if ($checkoutResult -match 'error:') {
Write-Host "Error checking out ${relativePath}: $checkoutResult"
continue
}
Write-Host "Discarded changes in $relativePath"
}
# ... (rest of the code remains unchanged)
}
# else {
# # if ($option -eq "d") {
# # Remove-Item -Path $relativePath -Force
# # Write-Host "Removed untracked file $relativePath"
# # } else {
# # Write-Host "File $relativePath is not tracked."
# # }
# }
else {
if ($option -eq "t") {
git add $relativePath
git update-index --no-skip-worktree $relativePath
Write-Host "Started tracking changes in $relativePath"
} else {
Write-Host "File $relativePath is not tracked."
}
}
}

141
main/esp_app_main.c
View File

@@ -68,7 +68,68 @@ bool cold_boot=true;
extern const char _ctype_[]; extern const char _ctype_[];
const char* __ctype_ptr__ = _ctype_; const char* __ctype_ptr__ = _ctype_;
#endif #endif
typedef struct {
const char *key;
const char *value;
} DefaultStringVal;
typedef struct {
const char *key;
unsigned int uint_value;
bool is_signed;
} DefaultNumVal;
const DefaultNumVal defaultNumVals[] = {
{"ota_erase_blk", OTA_FLASH_ERASE_BLOCK, 0},
{"ota_stack", OTA_STACK_SIZE, 0},
{"ota_prio", OTA_TASK_PRIOTITY, 1}
};
const DefaultStringVal defaultStringVals[] = {
{"equalizer", ""},
{"loudness", "0"},
{"actrls_config", ""},
{"lms_ctrls_raw", "n"},
{"rotary_config", CONFIG_ROTARY_ENCODER},
{"display_config", CONFIG_DISPLAY_CONFIG},
{"eth_config", CONFIG_ETH_CONFIG},
{"i2c_config", CONFIG_I2C_CONFIG},
{"spi_config", CONFIG_SPI_CONFIG},
{"set_GPIO", CONFIG_SET_GPIO},
{"sleep_config", ""},
{"led_brightness", ""},
{"spdif_config", ""},
{"dac_config", ""},
{"dac_controlset", ""},
{"jack_mutes_amp", "n"},
{"gpio_exp_config", CONFIG_GPIO_EXP_CONFIG},
{"bat_config", ""},
{"metadata_config", ""},
{"telnet_enable", ""},
{"telnet_buffer", "40000"},
{"telnet_block", "500"},
{"stats", "n"},
{"rel_api", CONFIG_RELEASE_API},
{"pollmx", "600"},
{"pollmin", "15"},
{"ethtmout", "8"},
{"dhcp_tmout", "8"},
{"target", CONFIG_TARGET},
{"led_vu_config", ""},
#ifdef CONFIG_BT_SINK
{"bt_sink_pin", STR(CONFIG_BT_SINK_PIN)},
{"bt_sink_volume", "127"},
// Note: register_default_with_mac("bt_name", CONFIG_BT_NAME); is a special case
{"enable_bt_sink", STR(CONFIG_BT_SINK)},
{"a2dp_dev_name", CONFIG_A2DP_DEV_NAME},
{"a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS)},
{"a2dp_ctrld", STR(CONFIG_A2DP_CONTROL_DELAY_MS)},
{"a2dp_sink_name", CONFIG_A2DP_SINK_NAME},
{"autoexec", "1"},
#ifdef CONFIG_AIRPLAY_SINK
{"airplay_port", CONFIG_AIRPLAY_PORT},
{"enable_airplay", STR(CONFIG_AIRPLAY_SINK)}
#endif
#endif
};
static bool bNetworkConnected=false; static bool bNetworkConnected=false;
// as an exception _init function don't need include // as an exception _init function don't need include
@@ -80,7 +141,9 @@ extern void target_init(char *target);
const char * str_or_unknown(const char * str) { return (str?str:unknown_string_placeholder); } const char * str_or_unknown(const char * str) { return (str?str:unknown_string_placeholder); }
const char * str_or_null(const char * str) { return (str?str:null_string_placeholder); } const char * str_or_null(const char * str) { return (str?str:null_string_placeholder); }
bool is_recovery_running; bool is_recovery_running;
bool is_network_connected(){
return bNetworkConnected;
}
void cb_connection_got_ip(nm_state_t new_state, int sub_state){ void cb_connection_got_ip(nm_state_t new_state, int sub_state){
const char *hostname; const char *hostname;
static ip4_addr_t ip; static ip4_addr_t ip;
@@ -163,7 +226,7 @@ void set_log_level(char * tag, char * level){
} }
#define DEFAULT_NAME_WITH_MAC(var,defval) char var[strlen(defval)+sizeof(macStr)]; strcpy(var,defval); strcat(var,macStr) #define DEFAULT_NAME_WITH_MAC(var,defval) char var[strlen(defval)+sizeof(macStr)]; strcpy(var,defval); strcat(var,macStr)
void register_default_string_val(const char * key, char * value){ void register_default_string_val(const char * key, const char * value){
char * existing =(char *)config_alloc_get(NVS_TYPE_STR,key ); char * existing =(char *)config_alloc_get(NVS_TYPE_STR,key );
ESP_LOGD(TAG,"Register default called with: %s= %s",key,value ); ESP_LOGD(TAG,"Register default called with: %s= %s",key,value );
if(!existing) { if(!existing) {
@@ -175,7 +238,15 @@ void register_default_string_val(const char * key, char * value){
} }
FREE_AND_NULL(existing); FREE_AND_NULL(existing);
} }
void register_single_default_num_val(const DefaultNumVal *entry) {
char number_buffer[101] = {};
if (entry->is_signed) {
snprintf(number_buffer, sizeof(number_buffer) - 1, "%d", entry->uint_value);
} else {
snprintf(number_buffer, sizeof(number_buffer) - 1, "%u", entry->uint_value);
}
register_default_string_val(entry->key, number_buffer);
}
char * alloc_get_string_with_mac(const char * val) { char * alloc_get_string_with_mac(const char * val) {
uint8_t mac[6]; uint8_t mac[6];
char macStr[LOCAL_MAC_SIZE + 1]; char macStr[LOCAL_MAC_SIZE + 1];
@@ -220,77 +291,25 @@ void register_default_nvs(){
else { else {
register_default_string_val("cspot_config", ""); register_default_string_val("cspot_config", "");
} }
} }
#endif #endif
#ifdef CONFIG_AIRPLAY_SINK #ifdef CONFIG_AIRPLAY_SINK
register_default_with_mac("airplay_name", CONFIG_AIRPLAY_NAME); register_default_with_mac("airplay_name", CONFIG_AIRPLAY_NAME);
register_default_string_val("airplay_port", CONFIG_AIRPLAY_PORT);
register_default_string_val( "enable_airplay", STR(CONFIG_AIRPLAY_SINK));
#endif #endif
#ifdef CONFIG_BT_SINK #ifdef CONFIG_BT_SINK
register_default_string_val( "bt_sink_pin", STR(CONFIG_BT_SINK_PIN));
register_default_string_val( "bt_sink_volume", "127");
register_default_with_mac("bt_name", CONFIG_BT_NAME); register_default_with_mac("bt_name", CONFIG_BT_NAME);
register_default_string_val( "enable_bt_sink", STR(CONFIG_BT_SINK));
register_default_string_val("a2dp_dev_name", CONFIG_A2DP_DEV_NAME);
register_default_string_val("a2dp_ctmt", STR(CONFIG_A2DP_CONNECT_TIMEOUT_MS));
register_default_string_val("a2dp_ctrld", STR(CONFIG_A2DP_CONTROL_DELAY_MS));
register_default_string_val("a2dp_sink_name", CONFIG_A2DP_SINK_NAME);
#endif #endif
register_default_with_mac("host_name", DEFAULT_HOST_NAME); register_default_with_mac("host_name", DEFAULT_HOST_NAME);
register_default_with_mac("ap_ssid", CONFIG_DEFAULT_AP_SSID); register_default_with_mac("ap_ssid", CONFIG_DEFAULT_AP_SSID);
register_default_string_val("autoexec","1");
register_default_with_mac("autoexec1",CONFIG_DEFAULT_COMMAND_LINE " -n " DEFAULT_HOST_NAME); register_default_with_mac("autoexec1",CONFIG_DEFAULT_COMMAND_LINE " -n " DEFAULT_HOST_NAME);
for (int i = 0; i < sizeof(defaultStringVals) / sizeof(DefaultStringVal); ++i) {
register_default_string_val(defaultStringVals[i].key, defaultStringVals[i].value);
}
for (int i = 0; i < sizeof(defaultNumVals) / sizeof(DefaultNumVal); ++i) {
register_single_default_num_val(&defaultNumVals[i]);
}
register_default_string_val("release_url", CONFIG_SQUEEZELITE_ESP32_RELEASE_URL);
register_default_string_val("ap_ip_address",CONFIG_DEFAULT_AP_IP);
register_default_string_val("ap_ip_gateway",CONFIG_DEFAULT_AP_GATEWAY );
register_default_string_val("ap_ip_netmask",CONFIG_DEFAULT_AP_NETMASK);
register_default_string_val("ap_channel",STR(CONFIG_DEFAULT_AP_CHANNEL));
register_default_string_val("ap_pwd", CONFIG_DEFAULT_AP_PASSWORD);
register_default_string_val("bypass_wm", "0");
register_default_string_val("equalizer", "");
register_default_string_val("loudness", "0");
register_default_string_val("actrls_config", "");
register_default_string_val("lms_ctrls_raw", "n");
register_default_string_val("rotary_config", CONFIG_ROTARY_ENCODER);
char number_buffer[101] = {};
snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_FLASH_ERASE_BLOCK);
register_default_string_val( "ota_erase_blk", number_buffer);
snprintf(number_buffer,sizeof(number_buffer)-1,"%u",OTA_STACK_SIZE);
register_default_string_val( "ota_stack", number_buffer);
snprintf(number_buffer,sizeof(number_buffer)-1,"%d",OTA_TASK_PRIOTITY);
register_default_string_val( "ota_prio", number_buffer);
register_default_string_val( "display_config", CONFIG_DISPLAY_CONFIG);
register_default_string_val( "eth_config", CONFIG_ETH_CONFIG);
register_default_string_val( "i2c_config", CONFIG_I2C_CONFIG);
register_default_string_val( "spi_config", CONFIG_SPI_CONFIG);
register_default_string_val( "set_GPIO", CONFIG_SET_GPIO);
register_default_string_val( "sleep_config", "");
register_default_string_val( "led_brightness", "");
register_default_string_val( "spdif_config", "");
register_default_string_val( "dac_config", "");
register_default_string_val( "dac_controlset", "");
register_default_string_val( "jack_mutes_amp", "n");
register_default_string_val("gpio_exp_config", CONFIG_GPIO_EXP_CONFIG);
register_default_string_val( "bat_config", "");
register_default_string_val( "metadata_config", "");
register_default_string_val( "telnet_enable", "");
register_default_string_val( "telnet_buffer", "40000");
register_default_string_val( "telnet_block", "500");
register_default_string_val( "stats", "n");
register_default_string_val( "rel_api", CONFIG_RELEASE_API);
register_default_string_val("pollmx","600");
register_default_string_val("pollmin","15");
register_default_string_val("ethtmout","8");
register_default_string_val("dhcp_tmout","8");
register_default_string_val("target", CONFIG_TARGET);
register_default_string_val("led_vu_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.");
} }