GPIO 7 might be used by error - release

remove large fonts - release

finalize equalizer/tone interaction

README.md

@@ -284,9 +284,64 @@ The NVS parameter "bat_config" sets the ADC1 channel used to measure battery/DC
 channel=0..7,scale=<scale>,cells=<2|3>
 ```
 NB: Set parameter to empty to disable battery reading. For well-known configuration, this is ignored (except for SqueezeAMP where number of cells is required)
+# Configuration
+## Setup WiFi
+- Boot the esp, look for a new wifi access point showing up and connect to it. Default build ssid and passwords are "squeezelite"/"squeezelite". 
+- Once connected, navigate to 192.168.4.1 
+- Wait for the list of access points visible from the device to populate in the web page.
+- Choose an access point and enter any credential as needed
+- Once connection is established, note down the address the device received; this is the address you will use to configure it going forward 
+
+## Setup squeezelite command line (optional)
+
+At this point, the device should have disabled its built-in access point and should be connected to a known WiFi network.
+- navigate to the address that was noted in step #1
+- Using the list of predefined options, choose the mode in which you want squeezelite to start
+- Generate the command
+- Add or change any additional command line option (for example player name, etc)
+- Activate squeezelite execution: this tells the device to automatiaclly run the command at start
+- Update the configuration
+- click on the "start toggle" button. This will force a reboot. 
+- The toggle switch should be set to 'ON' to ensure that squeezelite is active after booting (you might have to fiddle with it a few times)
+- You can enable accessto  NVS parameters under 'credits'
+
+## Monitor
+
+In addition of the esp-idf serial link monitor option, you can also enable a telnet server (see NVS parameters) where you'll have access to a ton of logs of what's happening inside the WROVER.
+
+## Update Squeezelite
+- From the firmware tab, click on "Check for Updates"
+- Look for updated binaries
+- Select a line
+- Click on "Flash!"
+- The system will reboot into recovery mode (if not already in that mode), wipe the squeezelite partition and download/flash the selected version 
+- You can choose a local file or have a local webserver
+
+## Recovery
+- From the firmware tab, click on the "Recovery" button. This will reboot the ESP32 into recovery, where additional configuration options are available from the NVS editor
+
+## Additional configuration notes (from the Web UI)
+The squeezelite options are very similar to the regular Linux ones. Differences are :
+
+	- the output is -o ["BT -n '<sinkname>' "] | [I2S]
+	- if you've compiled with RESAMPLE option, normal soxr options are available using -R [-u <options>]. Note that anything above LQ or MQ will overload the CPU
+	- if you've used RESAMPLE16, <options> are (b|l|m)[:i], with b = basic linear interpolation, l = 13 taps, m = 21 taps, i = interpolate filter coefficients
+
+For example, so use a BT speaker named MySpeaker, accept audio up to 192kHz and resample everything to 44100 and use 16 bits resample with medium quality, the command line is:
+	
+	squeezelite -o "BT -n 'BT <sinkname>'" -b 500:2000 -R -u m -Z 192000 -r "44100-44100"
+
+See squeezlite command line, but keys options are
+
+	- Z <rate> : tell LMS what is the max sample rate supported before LMS resamples
+	- R (see above)
+	- r "<minrate>-<maxrate>"
+	- C <sec> : set timeout to switch off amp gpio
+	- W : activate WAV and AIFF header parsing
+# Building everything yourself
 ## Setting up ESP-IDF
 ### Docker
-You can use docker to build squeezelite-esp32  
+You can use docker to build squeezelite-esp32 (optional) 
 First you need to build the Docker container:
 ```
 docker build -t esp-idf .
@@ -304,9 +359,11 @@ If you want to use a more recent version of gcc and IDF (4.0 stable), move to cm
 
 You can install IDF manually on Linux or Windows (using the Subsystem for Linux) following the instructions at: https://www.instructables.com/id/ESP32-Development-on-Windows-Subsystem-for-Linux/
 And then copying the i2s.c patch file from this repo over to the esp-idf folder
-You also need to use esp-dsp recent version or at least make sure you have this patch https://github.com/espressif/esp-dsp/pull/12/commits/8b082c1071497d49346ee6ed55351470c1cb4264
+You also need to use esp-dsp recent version or at least make sure you have this patch https://github.com/espressif/esp-dsp/pull/12/commits/8b082c1071497d49346ee6ed55351470c1cb4264. As of this writing (08.2020), espressif has patched esp-dsp so this is no more needed
 
 ## Building Squeezelite-esp32
+Don't forget the to choose one of the config files in build_scripts/ and rename it sdkconfig.defaults or sdkconfig as many important WiFi/BT options are set there. The codecs libraries will not be rebuilt by these scripts (it's a tedious process - see below)
+### Usng make (deprecated)
 MOST IMPORTANT: create the right default config file
 - make defconfig
 (Note: You can also copy over config files from the build-scripts folder to ./sdkconfig)
@@ -337,55 +394,13 @@ You can also manually download the recovery & initial boot
 ```
 python ${IDF_PATH}/components/esptool_py/esptool/esptool.py --chip esp32 --port ${ESPPORT} --baud ${ESPBAUD} --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 80m --flash_size detect 0xd000 ./build/ota_data_initial.bin 0x1000 ./build/bootloader/bootloader.bin 0x10000 ./build/recovery.bin 0x8000 ./build/partitions.bin
 ```
- 
-# Configuration
-1/ setup WiFi
-- Boot the esp, look for a new wifi access point showing up and connect to it. Default build ssid and passwords are "squeezelite"/"squeezelite". 
-- Once connected, navigate to 192.168.4.1 
-- Wait for the list of access points visible from the device to populate in the web page.
-- Choose an access point and enter any credential as needed
-- Once connection is established, note down the address the device received; this is the address you will use to configure it going forward 
-
-2/ setup squeezelite command line (optional)
-
-At this point, the device should have disabled its built-in access point and should be connected to a known WiFi network.
-- navigate to the address that was noted in step #1
-- Using the list of predefined options, hoose the mode in which you want squeezelite to start
-- Generate the command
-- Add or change any additional command line option (for example player name, etc)
-- Activate squeezelite execution: this tells the device to automatiaclly run the command at start
-- Update the configuration
-- click on the "start toggle" button. This will force a reboot. 
-- The toggle switch should be set to 'ON' to ensure that squeezelite is active after booting
-
-3/ Updating Squeezelite
-- From the firmware tab, click on "Check for Updates"
-- Look for updated binaries
-- Select a line
-- Click on "Flash!"
-- The system will reboot into recovery mode (if not already in that mode), wipe the squeezelite partition and download/flash the selected version 
-
-3/ Recovery
-- From the firmware tab, click on the "Recovery" button. This will reboot the ESP32 into recovery, where additional configuration options are available from the NVS editor
-
-# Additional command line notes, configured from the http configuration
-The squeezelite options are very similar to the regular Linux ones. Differences are :
-
-	- the output is -o ["BT -n '<sinkname>' "] | [I2S]
-	- if you've compiled with RESAMPLE option, normal soxr options are available using -R [-u <options>]. Note that anything above LQ or MQ will overload the CPU
-	- if you've used RESAMPLE16, <options> are (b|l|m)[:i], with b = basic linear interpolation, l = 13 taps, m = 21 taps, i = interpolate filter coefficients
-
-For example, so use a BT speaker named MySpeaker, accept audio up to 192kHz and resample everything to 44100 and use 16 bits resample with medium quality, the command line is:
-	
-	squeezelite -o "BT -n 'BT <sinkname>'" -b 500:2000 -R -u m -Z 192000 -r "44100-44100"
-
-See squeezlite command line, but keys options are
-
-	- Z <rate> : tell LMS what is the max sample rate supported before LMS resamples
-	- R (see above)
-	- r "<minrate>-<maxrate>"
-
-## Additional misc notes to do you build
+### Using cmake
+Create you config using 'idf.py menuconfig' then build binaries using 'idf.py all'. It will build the recovery and the application (squeezelite) itself. See the recommended command to upload everything. Otherwise, if you just want to download squeezelite, do
+```
+python.exe <idf_path>\components\esptool_py\esptool\esptool.py -p COM<n> -b 921600 --before default_reset --after hard_reset write_flash --flash_mode dio --flash_size detect --flash_freq 80m 0x150000 build\squeezelite.bin
+```
+Use 'idf monitor' to monitor the application (see esp-idf documentation)
+## Additional misc notes to do you build (kitchen sink)
 - as of this writing, ESP-IDF has a bug int he way the PLL values are calculated for i2s, so you *must* use the i2s.c file in the patch directory
 - for codecs libraries, add -mlongcalls if you want to rebuild them, but you should not (use the provided ones in codecs/lib). if you really want to rebuild them, open an issue
 - libmad, libflac (no esp's version), libvorbis (tremor - not esp's version), alac work
@@ -396,16 +411,14 @@ See squeezlite command line, but keys options are
 			#pragma GCC push_options
 			#pragma GCC optimize ("O0")
 			#pragma GCC pop_options
+- better use helixaac						
 - opus & opusfile
 	- for opus, the ESP-provided library seems to work, but opusfile is still needed
 	- per mad & few others, edit configure and change $ac_link to add -c (faking link)
 	- change ac_files to remove ''
 	- add DEPS_CFLAGS and DEPS_LIBS to avoid pkg-config to be required
 	- stack consumption can be very high with some codec variants, so set NONTHREADSAFE_PSEUDOSTACK and GLOBAL_STACK_SIZE=32000 and unset VAR_ARRAYS in config.h
-- better use helixaac			
 - set IDF_PATH=/home/esp-idf
-- set ESPPORT=COM9
-- update flash partition size
 - other compiler #define
 	- use no resampling or set RESAMPLE (soxr) or set RESAMPLE16 for fast fixed 16 bits resampling
 	- use LOOPBACK (mandatory)
@@ -413,10 +426,8 @@ See squeezlite command line, but keys options are
 	- LINKALL (mandatory)
 	- NO_FAAD unless you want to us faad, which currently overloads the CPU
 	- TREMOR_ONLY (mandatory)
+- better use helixaac			
 - When initially cloning the repo, make sure you do it recursively. For example: 
 	- git clone --recursive https://github.com/sle118/squeezelite-esp32.git
 - If you have already cloned the repository and you are getting compile errors on one of the submodules (e.g. telnet), run the following git command in the root of the repository location
 	-  git submodule update --init --recursive
-
-
-

components/display/core/gds_text.c

@@ -35,12 +35,20 @@ static const struct GDS_FontDef *GuessFont( struct GDS_Device *Device, int FontT
 	case GDS_FONT_MEDIUM:			
 	default:		
 		return &Font_droid_sans_fallback_15x17;	
+#ifdef USE_LARGE_FONTS
 	case GDS_FONT_LARGE:	
 		return &Font_droid_sans_fallback_24x28;
 		break;		
 	case GDS_FONT_SEGMENT:			
 		if (Device->Height == 32) return &Font_Tarable7Seg_16x32;
 		else return &Font_Tarable7Seg_32x64;
+#else
+	case GDS_FONT_LARGE:	
+	case GDS_FONT_SEGMENT:			
+		ESP_LOGW(TAG, "large fonts disabled");
+		return &Font_droid_sans_fallback_15x17;
+		break;		
+#endif	
 	}
 }
 

components/squeezelite/output_i2s.c

@@ -228,7 +228,7 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 	char *dac_config = config_alloc_get_str("dac_config", CONFIG_DAC_CONFIG, "model=i2s,bck=" STR(CONFIG_I2S_BCK_IO) 
 											",ws=" STR(CONFIG_I2S_WS_IO) ",do=" STR(CONFIG_I2S_DO_IO) 
 											",sda=" STR(CONFIG_I2C_SDA) ",scl=" STR(CONFIG_I2C_SCL)
-											",mute" STR(CONFIG_MUTE_GPIO));	
+											",mute=" STR(CONFIG_MUTE_GPIO));	
 
 	i2s_pin_config_t i2s_dac_pin, i2s_spdif_pin;											
 	set_i2s_pin(spdif_config, &i2s_spdif_pin);										
@@ -284,7 +284,7 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 		char model[32] = "i2s";
 		if ((p = strcasestr(dac_config, "model")) != NULL) sscanf(p, "%*[^=]=%31[^,]", model);
 		if ((p = strcasestr(dac_config, "mute")) != NULL) {
-			char mute[8];
+			char mute[8] = "";
 			sscanf(p, "%*[^=]=%7[^,]", mute);
 			mute_control.gpio = atoi(mute);
 			if ((p = strchr(mute, ':')) != NULL) mute_control.active = atoi(p + 1);
@@ -292,7 +292,7 @@ void output_init_i2s(log_level level, char *device, unsigned output_buf_size, ch
 
 		for (int i = 0; adac == &dac_external && dac_set[i]; i++) if (strcasestr(dac_set[i]->model, model)) adac = dac_set[i];
 		res = adac->init(dac_config, I2C_PORT, &i2s_config) ? ESP_OK : ESP_FAIL;
-		
+
 		res |= i2s_driver_install(CONFIG_I2S_NUM, &i2s_config, 0, NULL);
 		res |= i2s_set_pin(CONFIG_I2S_NUM, &i2s_dac_pin);
 		

plugin/SqueezeESP32/Player.pm

@@ -9,17 +9,95 @@ use List::Util qw(min);
 use Slim::Utils::Log;
 use Slim::Utils::Prefs;
 
+my $sprefs = preferences('server');
 my $prefs = preferences('plugin.squeezeesp32');
 my $log   = logger('plugin.squeezeesp32');
 
+{
+	__PACKAGE__->mk_accessor('rw', 'tone_update');
+}
+
+sub new {
+	my $class = shift;
+	my $client = $class->SUPER::new(@_);
+	$client->init_accessor(
+		tone_update	=> 0,
+	);
+	return $client;
+}
+
+our $defaultPrefs = {
+	'analogOutMode'        => 0,
+	'bass'                 => 0,
+	'treble'               => 0,
+	'lineInAlwaysOn'       => 0, 
+	'lineInLevel'          => 50, 
+	'menuItem'             => [qw(
+		NOW_PLAYING
+		BROWSE_MUSIC
+		RADIO
+		PLUGIN_MY_APPS_MODULE_NAME
+		PLUGIN_APP_GALLERY_MODULE_NAME
+		FAVORITES
+		GLOBAL_SEARCH
+		PLUGIN_LINE_IN
+		PLUGINS
+		SETTINGS
+		SQUEEZENETWORK_CONNECT
+	)],
+};
+
+my $handlersAdded;
+
 sub model { 'squeezeesp32' }
 sub modelName { 'SqueezeESP32' }
-sub hasIR { 0 }
+
+sub hasScrolling { 1 }
+sub hasIR { 1 }
+# TODO: add in settings when ready
+sub hasLineIn { 0 }
+sub hasHeadSubOut { 1 }
+sub maxTreble {	20 }
+sub minTreble {	-13 }
+sub maxBass { 20 }
+sub minBass { -13 }
 
 sub init {
 	my $client = shift;
+	
+	if (!$handlersAdded) {
+	
+		# Add a handler for line-in/out status changes
+		Slim::Networking::Slimproto::addHandler( LIOS => \&lineInOutStatus );
+	
+		# Create a new event for sending LIOS updates
+		Slim::Control::Request::addDispatch(
+			['lios', '_state'],
+			[1, 0, 0, undef],
+		   );
+		
+		Slim::Control::Request::addDispatch(
+			['lios', 'linein', '_state'],
+			[1, 0, 0, undef],
+		   );
+		
+		Slim::Control::Request::addDispatch(
+			['lios', 'lineout', '_state'],
+			[1, 0, 0, undef],
+		   );
+		
+		$handlersAdded = 1;
+
+	}
+	
 	$client->SUPER::init(@_);
-	$client->config_artwork();
+	$client->config_artwork;
+}
+
+sub initPrefs {
+	my $client = shift;
+	$sprefs->client($client)->init($defaultPrefs);
+	$client->SUPER::initPrefs;
 }
 
 # Allow the player to define it's display width (and probably more)
@@ -50,12 +128,42 @@ sub playerSettingsFrame {
 	$client->SUPER::playerSettingsFrame($data_ref);
 }
 
-sub hasScrolling {
-	return 1;
+sub bass {
+	my ($client, $new) = @_;
+	my $value = $client->SUPER::bass($new);
+	
+	$client->update_equalizer($value, [2, 1, 3]) if defined $new;
+	
+	return $value;
 }
 
-sub hasIR { 
-	return 1; 
+sub treble {
+	my ($client, $new) = @_;
+	my $value = $client->SUPER::treble($new);
+	
+	$client->update_equalizer($value, [8, 9, 7]) if defined $new;
+
+	return $value;
+}
+
+sub update_equalizer {
+	my ($client, $value, $index) = @_;
+	return if $client->tone_update;
+	
+	my $equalizer = $prefs->client($client)->get('equalizer');	
+	$equalizer->[$index->[0]] = $value;
+	$equalizer->[$index->[1]] = int($value / 2 + 0.5);
+	$equalizer->[$index->[2]] = int($value / 4 + 0.5);
+	$prefs->client($client)->set('equalizer', $equalizer);
+}
+
+sub update_tones {
+	my ($client, $equalizer) = @_;
+
+	$client->tone_update(1);
+	$sprefs->client($client)->set('bass', int(($equalizer->[1] * 2 + $equalizer->[2] + $equalizer->[3] * 4) / 7 + 0.5));
+	$sprefs->client($client)->set('treble', int(($equalizer->[7] * 4 + $equalizer->[8] + $equalizer->[9] * 2) / 7 + 0.5));
+	$client->tone_update(0);	
 }
 
 sub update_artwork {
@@ -131,4 +239,61 @@ sub reconnect {
 	$client->SUPER::reconnect(@_);
 }
 
+# Change the analog output mode between headphone and sub-woofer
+# If no mode is specified, the value of the client's analogOutMode preference is used.
+# Otherwise the mode is temporarily changed to the given value without altering the preference.
+sub setAnalogOutMode {
+	my $client = shift;
+	# 0 = headphone (internal speakers off), 1 = sub out,
+	# 2 = always on (internal speakers on), 3 = always off
+	my $mode = shift;
+
+	if (! defined $mode) {
+		$mode = $sprefs->client($client)->get('analogOutMode');
+	}
+
+	my $data = pack('C', $mode);
+	$client->sendFrame('audo', \$data);
+}
+
+# LINE_IN 	0x01
+# LINE_OUT	0x02
+# HEADPHONE	0x04
+
+sub lineInConnected {
+	my $state = Slim::Networking::Slimproto::voltage(shift) || return 0;
+	return $state & 0x01 || 0;
+}
+
+sub lineOutConnected {
+	my $state = Slim::Networking::Slimproto::voltage(shift) || return 0;
+	return $state & 0x02 || 0;
+}
+
+sub lineInOutStatus {
+	my ( $client, $data_ref ) = @_;
+	
+	my $state = unpack 'n', $$data_ref;
+
+	my $oldState = {
+		in  => $client->lineInConnected(),
+		out => $client->lineOutConnected(),
+	};
+	
+	Slim::Networking::Slimproto::voltage( $client, $state );
+
+	Slim::Control::Request::notifyFromArray( $client, [ 'lios', $state ] );
+	
+	if ($oldState->{in} != $client->lineInConnected()) {
+		Slim::Control::Request::notifyFromArray( $client, [ 'lios', 'linein', $client->lineInConnected() ] );
+		if ( Slim::Utils::PluginManager->isEnabled('Slim::Plugin::LineIn::Plugin')) {
+			Slim::Plugin::LineIn::Plugin::lineInItem($client, 1);
+		}
+	}
+
+	if ($oldState->{out} != $client->lineOutConnected()) {
+		Slim::Control::Request::notifyFromArray( $client, [ 'lios', 'lineout', $client->lineOutConnected() ] );
+	}
+}
+
 1;

plugin/SqueezeESP32/PlayerSettings.pm

@@ -73,6 +73,7 @@ sub handler {
 			$equalizer->[$i] = $paramRef->{"pref_equalizer.$i"} || 0;
 		}
 		$cprefs->set('equalizer', $equalizer);
+		$client->update_tones($equalizer);
 	}
 
 	if ($client->displayWidth) {

plugin/SqueezeESP32/install.xml

@@ -10,6 +10,6 @@
   <name>PLUGIN_SQUEEZEESP32</name>
   <description>PLUGIN_SQUEEZEESP32_DESC</description>
   <module>Plugins::SqueezeESP32::Plugin</module>
-    <version>0.94</version>
+    <version>0.103</version>
   <creator>Philippe</creator>
 </extensions>

plugin/repo.xml

@@ -1,10 +1,10 @@
 <?xml version='1.0' standalone='yes'?>
 <extensions>
   <plugins>
-    <plugin version="0.94" name="SqueezeESP32" minTarget="7.9" maxTarget="*">
+    <plugin version="0.103" name="SqueezeESP32" minTarget="7.9" maxTarget="*">
       <link>https://github.com/sle118/squeezelite-esp32</link>
       <creator>Philippe</creator>
-      <sha>a9bf10b47d13508ba051e4067cdabc2c283f4824</sha>
+      <sha>d07bb3b0a283fbde50e5533dca695a4505971f03</sha>
       <email>philippe_44@outlook.com</email>
       <desc lang="EN">SqueezeESP32 additional player id (100)</desc>
       <url>http://github.com/sle118/squeezelite-esp32/raw/master/plugin/SqueezeESP32.zip</url>