Mirror/squeezelite-esp32
1
0
Fork 0
mirror of https://github.com/sle118/squeezelite-esp32.git synced 2026-01-27 04:40:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

big merge

Browse Source
This commit is contained in:
Philippe G
2021-12-18 21:04:23 -08:00
parent 955692f8ad
commit 898998efb0
583 changed files with 84472 additions and 1965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
main/CMakeLists.txt
View File

@@ -1,7 +1,7 @@
idf_component_register(SRC_DIRS .
idf_component_register(SRC_DIRS .
PRIV_REQUIRES esp_common wifi-manager pthread squeezelite-ota platform_console telnet display
INCLUDE_DIRS .
EMBED_FILES ../server_certs/github.pem
LDFRAGMENTS "linker.lf"
)
#get_target_property(ill ${COMPONENT_LIB} INTERFACE_LINK_LIBRARIES)
#message("${COMPONENT_LIB} INTERFACE_LINK_LIBRARIES = ${ill}")

225
main/Kconfig.projbuild
View File

@@ -1,40 +1,45 @@
# This is a hack but it overrides some LWIP Kconfig
# parameters because we are first
config LWIP_MAX_SOCKETS
range 1 32
menu "Squeezelite-ESP32"
menu "Logging"
config LOGGING_SLIMPROTO
string "logging level for slimproto"
default "info"
help
string "logging level for slimproto"
default "info"
help
Set logging level info|debug|sdebug
config LOGGING_STREAM
string "logging level for stream"
default "info"
help
string "logging level for stream"
default "info"
help
Set logging level info|debug|sdebug
config LOGGING_DECODE
string "logging level for decode"
string "logging level for decode"
default "info"
help
Set logging level info|debug|sdebug
config LOGGING_OUTPUT
string "logging level for output"
default "info"
help
Set logging level info|debug|sdebug
help
Set logging level info|debug|sdebug
config LOGGING_OUTPUT
string "logging level for output"
default "info"
help
Set logging level info|debug|sdebug
endmenu
config JACK_LOCKED
bool
config BAT_LOCKED
config BAT_LOCKED
bool
config I2C_LOCKED
bool
config SPDIF_LOCKED
bool
bool
config LED_LOCKED
bool
bool
config SPKFAULT_LOCKED
bool
bool
config MUTE_GPIO_LEVEL
int
int
default 0
menu "Target"
choice OUTPUT_TYPE
@@ -42,7 +47,7 @@ menu "Squeezelite-ESP32"
default BASIC_I2C_BT
help
Type of hardware platform
config SQUEEZEAMP
config SQUEEZEAMP
bool "SqueezeAMP"
select JACK_LOCKED
select BAT_LOCKED
@@ -50,47 +55,50 @@ menu "Squeezelite-ESP32"
select LED_LOCKED
select SPKFAULT_LOCKED
config BASIC_I2C_BT
bool "Generic I2S & Bluetooth"
config TWATCH2020
bool "T-WATCH2020 by LilyGo"
select I2C_LOCKED
endchoice
bool "Generic I2S & Bluetooth"
config TWATCH2020
bool "T-WATCH2020 by LilyGo"
select I2C_LOCKED
endchoice
config RELEASE_API
string "Software update URL"
string "Software update URL"
default "https://api.github.com/repos/sle118/squeezelite-esp32/releases"
help
Set the URL of the API that the front-end UI will use to fetch software updates
help
Set the URL of the API that the front-end UI will use to fetch software updates
config SQUEEZELITE_ESP32_RELEASE_URL
string "Release URL"
default "https://github.com/sle118/squeezelite-esp32/releases"
help
Set the URL where users can see a list of releases
# you can't change default values once they are set so changing "Target" will not reset
# project name if they are visible config - they have to be silent strings
# project name if they are visible config - they have to be silent strings
config PROJECT_NAME
string
default "SqueezeAMP" if SQUEEZEAMP
default "Squeezelite-TWATCH" if TWATCH2020
default "Squeezelite-ESP32"
config FW_PLATFORM_NAME
string
string
default "SqueezeAmp" if SQUEEZEAMP
default "TWATCH" if TWATCH2020
default "ESP32"
# AGGREGATES - begin
# these parameters are "aggregates" that take precedence. They must have a default value
# these parameters are "aggregates" that take precedence. They must have a default value
config DAC_CONFIG
string
string
default "model=TAS57xx,bck=33,ws=25,do=32,sda=27,scl=26,mute=14:0" if SQUEEZEAMP
default "model=I2S,bck=26,ws=25,do=33,i2c=53,sda=21,scl=22" if TWATCH2020
default ""
config SPDIF_CONFIG
config SPDIF_CONFIG
string
default "bck=33,ws=25,do=15" if SQUEEZEAMP
default ""
config GPIO_EXP_CONFIG
string
default ""
config SPI_CONFIG
string
default "dc=27,data=19,clk=18" if TWATCH2020
default "dc=27,data=19,clk=18" if TWATCH2020
default ""
config DISPLAY_CONFIG
string
@@ -102,87 +110,87 @@ menu "Squeezelite-ESP32"
config DAC_CONTROLSET
string
default '{ "init": [ {"reg":41, "val":128}, {"reg":18, "val":255} ], "poweron": [ {"reg":18, "val":64, "mode":"or"} ], "poweroff": [ {"reg":18, "val":191, "mode":"and" } ] }' if TWATCH2020
default ""
# AGGREGATES - end
default ""
# AGGREGATES - end
endmenu
menu "Audio settings"
menu "DAC settings"
menu "DAC settings"
visible if BASIC_I2C_BT
menu "I2S settings"
config I2S_NUM
int "I2S channel (0 or 1)."
config I2S_NUM
int "I2S channel (0 or 1)"
default 0
help
I2S dma channel to use.
config I2S_BCK_IO
int "I2S Bit clock GPIO number."
default -1
I2S dma channel to use.
config I2S_BCK_IO
int "I2S Bit clock GPIO number"
default -1
help
I2S Bit Clock gpio pin to use.
config I2S_WS_IO
int "I2S Word Select GPIO number."
default -1
I2S Bit Clock gpio pin to use.
config I2S_WS_IO
int "I2S Word Select GPIO number"
default -1
help
I2S Word Select gpio pin to use.
config I2S_DO_IO
int "I2S Data Output GPIO number."
config I2S_DO_IO
int "I2S Data Output GPIO number"
default -1
help
I2S data output gpio pin to use.
config I2S_DI_IO
int "I2S Data Input GPIO number."
config I2S_DI_IO
int "I2S Data Input GPIO number"
default -1
help
I2S data input gpio pin to use (not used mostly, leave it to -1).
I2S data input gpio pin to use (not used mostly, leave it to -1).
endmenu
menu "I2C settings"
menu "I2C settings"
config I2C_SDA
int "I2C SDA GPIO number for DAC control."
int "I2C SDA GPIO number for DAC control"
default -1
help
I2C data gpio pin to use with DAC (not used mostly, leave it to -1).
I2C data gpio pin to use with DAC (not used mostly, leave it to -1).
config I2C_SCL
int "I2C SCL GPIO number for DAC control."
int "I2C SCL GPIO number for DAC control"
default -1
help
I2C clock gpio pin to use with DAC (not used mostly, leave it to -1).
endmenu
I2C clock gpio pin to use with DAC (not used mostly, leave it to -1).
endmenu
config MUTE_GPIO
int "GPIO for muting DAC"
default -1
default -1
help
GPIO used to mute DAC (not used mostly, leave it to -1).
GPIO used to mute DAC (not used mostly, leave it to -1).
config MUTE_GPIO_LEVEL
int "Mute GPIO active level"
depends on MUTE_GPIO != -1
default 1
default 1
endmenu
menu "SPDIF settings"
menu "SPDIF settings"
visible if BASIC_I2C_BT
config SDIF_NUM
config SDIF_NUM
int "I2S channel for SDPIF (0 or 1)"
default 0
default 0
help
I2S dma channel to use.
config SPDIF_BCK_IO
I2S dma channel to use.
config SPDIF_BCK_IO
int "SDPIF Bit clock GPIO number"
default I2S_BCK_IO
help
Must be set as SPDIF re-uses I2S but only needs DO (recommendation: set it to I2S Bit clock value)
config SPDIF_WS_IO
config SPDIF_WS_IO
int "SPDIF Word Select GPIO number"
default I2S_WS_IO
help
Must be set as SPDIF re-uses I2S but only needs DO (recommendation: set it to I2S Word select value)
config SPDIF_DO_IO
config SPDIF_DO_IO
int "SPDIF Data I/O GPIO number"
default -1
help
I2S data output IO use to simulate SPDIF
endmenu
menu "A2DP settings"
config A2DP_SINK_NAME
string "Name of Bluetooth A2DP device"
@@ -195,19 +203,18 @@ menu "Squeezelite-ESP32"
help
This is the name of the device that the Bluetooth speaker will see when it is connected to.
config A2DP_CONTROL_DELAY_MS
int "Control loop delay."
int "Control loop delay"
default 500
help
Decreasing this will lead to a more responsive BT control,
but might lead to noisy log files if debug is enabled.
Decreasing this will lead to a more responsive BT control, but might lead to noisy log files if debug is enabled.
config A2DP_CONNECT_TIMEOUT_MS
int "Time out duration when trying to connect to an A2DP audio sink"
default 1000
help
Increasing this value will give more chance for less stable connections to be established.
Increasing this value will give more chance for less stable connections to be established.
endmenu
endmenu
menu "Audio Input"
config BT_SINK
bool "Bluetooth receiver"
@@ -219,9 +226,9 @@ menu "Squeezelite-ESP32"
string "Name of Bluetooth A2DP device"
default "ESP32-BT"
help
This is the name of the bluetooth speaker that will be broadcasted
config BT_SINK_PIN
depends on BT_SINK
This is the name of the bluetooth speaker that will be broadcasted
config BT_SINK_PIN
depends on BT_SINK
int "Bluetooth PIN code"
default 1234
config AIRPLAY_SINK
@@ -232,14 +239,19 @@ menu "Squeezelite-ESP32"
string "Name of AirPlay device"
default "ESP32-AirPlay"
help
This is the name of the AirPlay speaker that will be broadcasted
This is the name of the AirPlay speaker that will be broadcasted
config AIRPLAY_PORT
depends on AIRPLAY_SINK
string "AirPlay listening port"
default "5000"
help
help
AirPlay service listening port
endmenu
config CSPOT_SINK
bool "Spotify (cspot) receiver"
default y
help
Enable Spotify connect using CSpot
endmenu
menu "Display Screen"
depends on !TWATCH2020
@@ -249,8 +261,8 @@ menu "Squeezelite-ESP32"
Set parameters for display screen, leave empty for no screen
I2C,driver=<model>,width=<pixels>,height=<pixels>[address=<i2c_address>][,HFlip][,VFlip][,rotate]
SPI,driver=<model>,width=<pixels>,height=<pixels>,cs=<gpio>[,HFlip][,VFlip][,rotate]
endmenu
endmenu
menu "Various I/O"
visible if !TWATCH2020
config I2C_CONFIG
@@ -263,14 +275,14 @@ menu "Squeezelite-ESP32"
string "SPI system configuration"
help
Set parameters of shared SPI interface
data=<gpio>,clk=<gpio>[,d/c=<num>][,host=<0|1|2>]
config SET_GPIO
data=<gpio>,clk=<gpio>[,d/c=<num>][,host=<0|1|2>]
config SET_GPIO
string "Special GPIO configuration"
default ""
help
Set parameters of shared GPIO with special values.
Set parameters of shared GPIO with special values.
<gpio_1>=Vcc|GND|amp[:0|1]|jack[:0|1][,<gpio_n>=Vcc|GND|amp[:0|1]|jack[:0|1]]
'amp' => GPIO that is set when playback starts
'amp' => GPIO that is set when playback starts
'jack' => GPIO used for audio jack detection
'green', 'red' => GPIO for status LED
'[:0|1] means set the active value for that GPIO can be low or high
@@ -280,21 +292,26 @@ menu "Squeezelite-ESP32"
help
Set GPIO for rotary encoder (quadrature phase). See README on SqueezeESP32 project's GitHub for more details
A=<gpio>,B=<gpio>[,SW=gpio>[[,knobonly[=<ms>]|[,volume][,longpress]]
config GPIO_EXP_CONFIG
string "GPIO expander configuration"
help
Set parameters of GPIO extender
model=<model>[,addr=<addr>][,base=<100..N>][,count=<0..32>][,intr=<gpio>][,port=dac|system]
endmenu
menu "LED configuration"
visible if !SQUEEZEAMP && !TWATCH2020
config LED_GREEN_GPIO
int "Green led GPIO"
default 12 if SQUEEZEAMP
default -1
default 12 if SQUEEZEAMP
default -1
help
Set to -1 for no LED
config LED_GREEN_GPIO_LEVEL
int "Green led ON level"
depends on LED_GREEN_GPIO != -1
default 0 if SQUEEZEAMP
default 1
config LED_RED_GPIO
default 1
config LED_RED_GPIO
int "Red led GPIO"
default 13 if SQUEEZEAMP
default -1
@@ -306,45 +323,45 @@ menu "Squeezelite-ESP32"
default 0 if SQUEEZEAMP
default 1
endmenu
menu "Audio JACK"
menu "Audio JACK"
visible if !SQUEEZEAMP && !TWATCH2020
config JACK_GPIO
config JACK_GPIO
int "Jack insertion GPIO"
default 34 if SQUEEZEAMP
default -1
help
GPIO to detect speaker jack insertion. Set to -1 for no detection.
GPIO to detect speaker jack insertion. Set to -1 for no detection.
config JACK_GPIO_LEVEL
depends on JACK_GPIO != -1
int "Level when inserted (0/1)"
default 0
endmenu
menu "Speaker Fault"
endmenu
menu "Speaker Fault"
visible if !SQUEEZEAMP && !TWATCH2020
config SPKFAULT_GPIO
config SPKFAULT_GPIO
int "Speaker fault GPIO"
default 2 if SQUEEZEAMP
default -1
help
GPIO to detect speaker fault condition. Set to -1 for no detection.
GPIO to detect speaker fault condition. Set to -1 for no detection.
config SPKFAULT_GPIO_LEVEL
depends on SPKFAULT_GPIO != -1
int "Level when fault (0/1)"
default 0
endmenu
menu "Battery measure"
endmenu
menu "Battery measure"
visible if !SQUEEZEAMP && !TWATCH2020
config BAT_CHANNEL
config BAT_CHANNEL
int "Set channel (0..7)"
default 7 if SQUEEZEAMP
default -1
default -1
help
Read a value every 10s on ADC1 on set Channel
config BAT_SCALE
config BAT_SCALE
string "Set scaling factor"
depends on BAT_CHANNEL != -1
default "20.24" if SQUEEZEAMP
default ""
default ""
help
Set the scaling factor for this 12 bits ADC
endmenu

52
main/esp_app_main.c
View File

@@ -45,7 +45,14 @@
#include "display.h"
#include "accessors.h"
#include "cmd_system.h"
#include "globdefs.h"
#include "tools.h"
#ifndef CONFIG_DAC_KNOWN_CONFIGURATIONS
#define CONFIG_DAC_KNOWN_CONFIGURATIONS ""
#endif
#ifndef CONFIG_DAC_KNOWN_CONFIGURATIONS_GPIOS
#define CONFIG_DAC_KNOWN_CONFIGURATIONS_GPIOS ""
#endif
static const char certs_namespace[] = "certificates";
static const char certs_key[] = "blob";
@@ -230,7 +237,6 @@ const char * get_certificate(){
size_t len;
esp_err = nvs_get_blob(handle, certs_key, NULL, &len);
if( esp_err == ESP_OK) {
//blob = (char *) heap_caps_malloc(len+1, (MALLOC_CAP_INTERNAL|MALLOC_CAP_8BIT));
blob = (char *) malloc_init_external(len+1);
if(!blob){
log_send_messaging(MESSAGING_ERROR,"Unable to retrieve HTTPS certificates. %s","Memory allocation failed");
@@ -288,33 +294,40 @@ void register_default_with_mac(const char* key, char* defval) {
}
}
#ifndef CONFIG_DAC_KNOWN_CONFIGURATIONS
#define CONFIG_DAC_KNOWN_CONFIGURATIONS ""
#endif
#ifndef CONFIG_DAC_KNOWN_CONFIGURATIONS_GPIOS
#define CONFIG_DAC_KNOWN_CONFIGURATIONS_GPIOS ""
#endif
void register_default_nvs(){
register_default_with_mac("bt_name", CONFIG_BT_NAME);
register_default_with_mac("host_name", DEFAULT_HOST_NAME);
#ifdef CONFIG_CSPOT_SINK
register_default_string_val("enable_cspot", STR(CONFIG_CSPOT_SINK));
#endif
#ifdef CONFIG_AIRPLAY_SINK
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
#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_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
register_default_with_mac("host_name", DEFAULT_HOST_NAME);
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_string_val("a2dp_sink_name", CONFIG_A2DP_SINK_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("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("airplay_port", CONFIG_AIRPLAY_PORT);
register_default_string_val("a2dp_dev_name", CONFIG_A2DP_DEV_NAME);
register_default_string_val("bypass_wm", "0");
register_default_string_val("equalizer", "");
register_default_string_val("actrls_config", "");
@@ -327,10 +340,6 @@ void register_default_nvs(){
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( "enable_bt_sink", STR(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_string_val( "enable_airplay", STR(CONFIG_AIRPLAY_SINK));
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);
@@ -341,6 +350,7 @@ void register_default_nvs(){
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", "");

4
main/linker.lf Normal file
View File

@@ -0,0 +1,4 @@
[mapping:cpp]
archive: libstdc++.a
entries:
* (extram_bss)

1
main/platform_esp32.h
View File

@@ -16,7 +16,6 @@
#define CONFIG_SQUEEZELITE_ESP32_RELEASE_URL "https://github.com/sle118/squeezelite-esp32/releases"
#endif
extern void run_command(char * line);
extern bool wait_for_wifi();
extern void console_start();
extern pthread_cond_t wifi_connect_suspend_cond;