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

merge Equalizer - release

Browse Source
This commit is contained in:
Sebastien
2020-04-17 14:18:39 -04:00
parent 0caaadc774
commit 29737f720e
6 changed files with 33 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
components/audio/CMakeLists.txt Normal file
View File

@@ -0,0 +1,5 @@
idf_component_register( SRC_DIRS .
INCLUDE_DIRS . inc
)
add_prebuilt_library(esp_processing lib/libesp_processing.a)
target_link_libraries(${COMPONENT_LIB} PRIVATE esp_processing)

3
components/audio/link_helper.c Normal file
View File

@@ -0,0 +1,3 @@
void dummy_obj() {
return;
}

21
components/platform_console/cmd_i2ctools.c
View File

@@ -383,9 +383,6 @@ static int do_i2c_set_display(int argc, char **argv)
return 0; return 0;
} }
/* Check "--address" option */ /* Check "--address" option */
if (i2cdisp_args.address->count) { if (i2cdisp_args.address->count) {
address=i2cdisp_args.address->ival[0]; address=i2cdisp_args.address->ival[0];
@@ -778,10 +775,10 @@ static void register_i2c_set_display(){
i2cdisp_args.height = arg_int0("h", "height", "<n>", "Set the display height"); i2cdisp_args.height = arg_int0("h", "height", "<n>", "Set the display height");
i2cdisp_args.name = arg_str0("t", "type", "<I2C|SPI>", "Set the display type. default I2C"); i2cdisp_args.name = arg_str0("t", "type", "<I2C|SPI>", "Set the display type. default I2C");
i2cdisp_args.driver = arg_str0("d", "driver", "<string>", "Set the display driver name. Default SSD1306"); i2cdisp_args.driver = arg_str0("d", "driver", "<string>", "Set the display driver name. Default SSD1306");
i2cdisp_args.clear = arg_litn(NULL, "clear", 0, 1, "clear configuration and return"); i2cdisp_args.clear = arg_lit0(NULL, "clear", "clear configuration and return");
i2cdisp_args.hflip = arg_litn(NULL, "hf", 0, 1, "Flip picture horizontally"); i2cdisp_args.hflip = arg_lit0(NULL, "hf", "Flip picture horizontally");
i2cdisp_args.vflip = arg_litn(NULL, "vf", 0, 1, "Flip picture vertically"); i2cdisp_args.vflip = arg_lit0(NULL, "vf", "Flip picture vertically");
i2cdisp_args.rotate = arg_litn("r", "rotate", 0, 1, "Rotate the picture 180 deg"); i2cdisp_args.rotate = arg_lit0("r", "rotate", "Rotate the picture 180 deg");
i2cdisp_args.end = arg_end(8); i2cdisp_args.end = arg_end(8);
const esp_console_cmd_t i2c_set_display= { const esp_console_cmd_t i2c_set_display= {
.command = "setdisplay", .command = "setdisplay",
@@ -903,11 +900,11 @@ static void register_i2cstop(){
static void register_i2cconfig(void) static void register_i2cconfig(void)
{ {
i2cconfig_args.port = arg_int0("p", "port", "<0|1>", "Set the I2C bus port number"); i2cconfig_args.port = arg_int0("p", "port", "0|1", "Set the I2C bus port number");
i2cconfig_args.freq = arg_int0("f", "freq", "<Hz>", "Set the frequency(Hz) of I2C bus. e.g. 100000"); i2cconfig_args.freq = arg_int0("f", "freq", "int", "Set the frequency(Hz) of I2C bus. e.g. 100000");
i2cconfig_args.sda = arg_int0("d", "sda", "<gpio>", "Set the gpio for I2C SDA. e.g. 19"); i2cconfig_args.sda = arg_int0("d", "sda", "int", "Set the gpio for I2C SDA. e.g. 19");
i2cconfig_args.scl = arg_int0("c", "scl", "<gpio>", "Set the gpio for I2C SCL. e.g. 18"); i2cconfig_args.scl = arg_int0("c", "scl", "int", "Set the gpio for I2C SCL. e.g. 18");
i2cconfig_args.load = arg_litn("l", "load", 0, 1, "load existing configuration and return"); i2cconfig_args.load = arg_lit0("l", "load", "load existing configuration and return");
i2cconfig_args.end = arg_end(4); i2cconfig_args.end = arg_end(4);
const esp_console_cmd_t i2cconfig_cmd = { const esp_console_cmd_t i2cconfig_cmd = {
.command = "i2cconfig", .command = "i2cconfig",

2
components/platform_console/platform_console.c
View File

@@ -71,7 +71,7 @@ cJSON * ParmsToJSON(struct arg_hdr * * argtable){
ADD_TO_JSON(entry,table[tabindex],glossary); ADD_TO_JSON(entry,table[tabindex],glossary);
ADD_TO_JSON(entry,table[tabindex],longopts); ADD_TO_JSON(entry,table[tabindex],longopts);
ADD_TO_JSON(entry,table[tabindex],shortopts); ADD_TO_JSON(entry,table[tabindex],shortopts);
cJSON_AddBoolToObject(entry, "isoptional", table[tabindex]->flag & ARG_HASOPTVALUE); cJSON_AddBoolToObject(entry, "checkbox", (table[tabindex]->flag & ARG_HASOPTVALUE)==0 && (table[tabindex]->flag & ARG_HASVALUE)==0);
cJSON_AddBoolToObject(entry, "hasvalue", table[tabindex]->flag & ARG_HASVALUE); cJSON_AddBoolToObject(entry, "hasvalue", table[tabindex]->flag & ARG_HASVALUE);
cJSON_AddItemToArray(arg_list, entry); cJSON_AddItemToArray(arg_list, entry);
tabindex++; tabindex++;

1
components/squeezelite/CMakeLists.txt
View File

@@ -13,6 +13,7 @@ idf_component_register( SRC_DIRS . external a1s tas57xx
raop raop
display display
tools tools
audio
EMBED_FILES vu.data EMBED_FILES vu.data
) )

14
components/wifi-manager/code.js
View File

@@ -539,6 +539,7 @@ $(document).ready(function(){
//first time the page loads: attempt to get the connection status and start the wifi scan //first time the page loads: attempt to get the connection status and start the wifi scan
refreshAP(false); refreshAP(false);
getConfig(); getConfig();
getCommands();
//start timers //start timers
startCheckStatusInterval(); startCheckStatusInterval();
@@ -894,6 +895,19 @@ function checkStatus(){
}); });
} }
function getCommands() {
$.getJSON("/commands.json", function(data) {
console.log(data);
})
.fail(function(xhr, ajaxOptions, thrownError) {
console.log(xhr.status);
console.log(thrownError);
if (thrownError != '') showMessage(thrownError, 'MESSAGING_ERROR');
blockAjax = false;
});
}
function getConfig() { function getConfig() {
$.getJSON("/config.json", function(data) { $.getJSON("/config.json", function(data) {
Object.keys(data).sort().forEach(function(key, i) { Object.keys(data).sort().forEach(function(key, i) {