Merge branch 'develop'

# Solved Conflicts:
#	SOURCES/WEBAPP/ESP32/updater/aurora.ino.esp32.bin

SOURCES/WEBAPP/ESP32/aurora/aurora.ino

@@ -227,6 +227,8 @@ String presetAddonCfgFile[MAX_NUM_PRESETS] = { "/addoncfg.001", "/addoncfg.002",
 
 AsyncWebServer server( 80 );
 
+bool changeWifiState = false;
+
 //------------------------------------------------------------------------------
 //
 // Display Driver
@@ -4043,19 +4045,27 @@ void updateUI( void )
  */
 void setup()
 {
-  bool changeWifiState = false;
-
   Serial.begin(115200);
   Serial.println( "AURORA Debug Log" );
   Serial.println( VERSION_STR );
 
+  //----------------------------------------------------------------------------
+  //--- Init Rotary Encoder Handling
+  //----------------------------------------------------------------------------
+  #if HAVE_ROTARYENCODER
+  rotaryEncoder.init();
+  lastREsw = rotaryEncoder.getSwitchValue();
+  lastREval = rotaryEncoder.getRotationValue();
+  #endif
+
   //----------------------------------------------------------------------------
   //--- Is user pressing the rotary encoder switch during boot?
   //----------------------------------------------------------------------------
-  pinMode( ROTARYENCODER_PINSW, INPUT_PULLUP );
+  //rotaryEncoder.init();
+  //pinMode( ROTARYENCODER_PINSW, INPUT_PULLUP );
   if( !digitalRead( ROTARYENCODER_PINSW ) )
     changeWifiState = true;
-
+  
   //----------------------------------------------------------------------------
   //--- Configure I2C
   //----------------------------------------------------------------------------
@@ -4174,13 +4184,15 @@ void setup()
   changeChannelSummationADC();
   if( changeWifiState )
   {
+    Serial.print( F("Changing WiFi status......") );
     Settings.wifiOn = Settings.wifiOn ? false : true;
     writeSettings();
+    Serial.println( F("[OK]") );
   }
 
-  Serial.print( "Init user parameter......" );
+  Serial.print( F("Init user parameter......") );
   initUserParams();
-  Serial.println( "[OK]" );
+  Serial.println( F("[OK]") );
   readPluginMeta();
 
   //----------------------------------------------------------------------------
@@ -4213,7 +4225,7 @@ void setup()
   server.on( "/aurora.js", HTTP_GET, [](AsyncWebServerRequest *request )
   {
     //request->send( SPIFFS, "/aurora.js", "text/javascript" );
-    AsyncWebServerResponse* response = request->beginResponse(SPIFFS, "/aurora.js.gz", "text/javascript");
+    AsyncWebServerResponse* response = request->beginResponse(SPIFFS, "/aurora.jgz", "text/javascript");
     response->addHeader( "Content-Encoding", "gzip" );
     request->send( response );
   });
@@ -4385,14 +4397,6 @@ void setup()
   //----------------------------------------------------------------------------
   enableVolPot();
 
-  //----------------------------------------------------------------------------
-  //--- Init Rotary Encoder Handling
-  //----------------------------------------------------------------------------
-  #if HAVE_ROTARYENCODER
-  lastREsw = rotaryEncoder.getSwitchValue();
-  lastREval = rotaryEncoder.getRotationValue();
-  #endif
-
   //----------------------------------------------------------------------------
   //--- Init IR Receiver
   //----------------------------------------------------------------------------
@@ -4404,6 +4408,9 @@ void setup()
 
   updateUI();
 
+  lastREsw = rotaryEncoder.getSwitchValue();
+  lastREval = rotaryEncoder.getRotationValue();
+
   Serial.println( "Ready" );
 }
 
@@ -4421,14 +4428,19 @@ void loop()
   #if HAVE_ROTARYENCODER
   if( rotaryEncoder.getSwitchValue() != lastREsw )
   {
-    editMode++;
-    // we may have more then two modes in the future.
-    if( editMode > 1 )
-      editMode = 0;
-    delay( 300 );
+    if( changeWifiState )
+      changeWifiState = false;
+    else
+    {
+      editMode++;
+      // we may have more then two modes in the future.
+      if( editMode > 1 )
+        editMode = 0;
+      delay( 300 );
+      needUpdateUI = true;
+    }
     lastREsw = rotaryEncoder.getSwitchValue();
     lastREval = rotaryEncoder.getRotationValue();
-    needUpdateUI = true;
   }
   else if( rotaryEncoder.getRotationValue() > lastREval + 1 )
   {

SOURCES/WEBAPP/ESP32/aurora/data/dsp.html

@@ -873,7 +873,7 @@ <h2 id="msg">Please wait...</h2>
           html = file;
         if(file.name=="plugin.ini")
           plugin = file;
-        if(file.name=="aurora.js.gz")
+        if(file.name=="aurora.jgz")
           aurorajs = file;
       }
       var prg=document.getElementById('prg');
@@ -891,7 +891,7 @@ <h2 id="msg">Please wait...</h2>
         return fetch("/upload?fname=plugin.ini",{method:'POST',headers:{},body:plugin});})
       .then(function(response){
         prg.style.width="80%";
-        return fetch("/upload?fname=aurora.js.gz",{method:'POST',headers:{},body:aurorajs});})
+        return fetch("/upload?fname=aurora.jgz",{method:'POST',headers:{},body:aurorajs});})
       .then(function(response){
         prg.style.width="100%";
         return response;})

SOURCES/WEBAPP/ESP32/aurora/fallback.h

@@ -39,7 +39,7 @@ R"!^!(
         html = file;
       if(file.name=="plugin.ini")
         plugin = file;
-      if(file.name=="aurora.js.gz")
+      if(file.name=="aurora.jgz")
         aurorajs = file;
     }
     var prg=document.getElementById('prg');
@@ -58,7 +58,7 @@ R"!^!(
       return fetch("/upload?fname=plugin.ini",{method:'POST',headers:{},body:plugin});})
     .then(function(response){
       prg.style.width="80%";
-      return fetch("/upload?fname=aurora.js.gz",{method:'POST',headers:{},body:aurorajs});})
+      return fetch("/upload?fname=aurora.jgz",{method:'POST',headers:{},body:aurorajs});})
     .then(function(response){
       prg.style.width="100%";
       return response;})

SOURCES/WEBAPP/ESP32/aurora/rotaryencoder.cpp

@@ -63,6 +63,11 @@ void IRAM_ATTR isrRotaryEncoderSwitch()
 }
 
 RotaryEncoder::RotaryEncoder( void )
+{
+
+}
+
+void RotaryEncoder::init( void )
 {
   value = 0;
   sw = 0;

SOURCES/WEBAPP/ESP32/aurora/rotaryencoder.h

@@ -19,6 +19,8 @@ class RotaryEncoder
 
   void setCurrentState( uint8_t s ) { state = s; }
 
+  void init( void );
+
 private:
   long int value;
   long int sw;

SOURCES/WEBAPP/js/README.md

@@ -0,0 +1,3 @@
+Compress the javascript file with
+ cat aurora.js | gzip > aurora.jgz
+ else the WebApp won't work with Safari.

SOURCES/WEBAPP/plugins/4FIRs/dsp.html

@@ -504,7 +504,7 @@ <h2 id="msg">Please wait...</h2>
           html = file;
         if(file.name=="plugin.ini")
           plugin = file;
-        if(file.name=="aurora.js.gz")
+        if(file.name=="aurora.jgz")
           aurorajs = file;
       }
       var prg=document.getElementById('prg');
@@ -522,7 +522,7 @@ <h2 id="msg">Please wait...</h2>
         return fetch("/upload?fname=plugin.ini",{method:'POST',headers:{},body:plugin});})
       .then(function(response){
         prg.style.width="80%";
-        return fetch("/upload?fname=aurora.js.gz",{method:'POST',headers:{},body:aurorajs});})
+        return fetch("/upload?fname=aurora.jgz",{method:'POST',headers:{},body:aurorajs});})
       .then(function(response){
         prg.style.width="100%";
         return response;})

SOURCES/WEBAPP/plugins/4FIRs/plugin.ini

@@ -1,4 +1,5 @@
 {
+"name":"4FIRs",
 "nlp": 0,
 "xohp": [],
 "nhp": 0,

SOURCES/WEBAPP/plugins/8channels/dsp.html

@@ -873,7 +873,7 @@ <h2 id="msg">Please wait...</h2>
           html = file;
         if(file.name=="plugin.ini")
           plugin = file;
-        if(file.name=="aurora.js.gz")
+        if(file.name=="aurora.jgz")
           aurorajs = file;
       }
       var prg=document.getElementById('prg');
@@ -891,7 +891,7 @@ <h2 id="msg">Please wait...</h2>
         return fetch("/upload?fname=plugin.ini",{method:'POST',headers:{},body:plugin});})
       .then(function(response){
         prg.style.width="80%";
-        return fetch("/upload?fname=aurora.js.gz",{method:'POST',headers:{},body:aurorajs});})
+        return fetch("/upload?fname=aurora.jgz",{method:'POST',headers:{},body:aurorajs});})
       .then(function(response){
         prg.style.width="100%";
         return response;})

SOURCES/WEBAPP/plugins/8channels/plugin.ini

@@ -1,4 +1,5 @@
 {
+"name":"8channels",
 "nlp": 8,
 "xohp": [],
 "nhp": 8,

SOURCES/WEBAPP/plugins/homecinema71/dsp.html

@@ -873,7 +873,7 @@ <h2 id="msg">Please wait...</h2>
           html = file;
         if(file.name=="plugin.ini")
           plugin = file;
-        if(file.name=="aurora.js.gz")
+        if(file.name=="aurora.jgz")
           aurorajs = file;
       }
       var prg=document.getElementById('prg');
@@ -891,7 +891,7 @@ <h2 id="msg">Please wait...</h2>
         return fetch("/upload?fname=plugin.ini",{method:'POST',headers:{},body:plugin});})
       .then(function(response){
         prg.style.width="80%";
-        return fetch("/upload?fname=aurora.js.gz",{method:'POST',headers:{},body:aurorajs});})
+        return fetch("/upload?fname=aurora.jgz",{method:'POST',headers:{},body:aurorajs});})
       .then(function(response){
         prg.style.width="100%";
         return response;})

SOURCES/WEBAPP/plugins/homecinema71/plugin.ini

@@ -1,4 +1,5 @@
 {
+"name":"HomeCinema71",
 "nlp": 1,
 "xohp": [
 19690,