Merge pull request #3185 from TD-er/bugfix/build_gcc10.1

[Build] Fix using GCC 10.1 toolchain
letscontrolit · Jul 31, 2020 · c40410f · c40410f
2 parents d7a1e31 + 874cddf
commit c40410f
Show file tree

Hide file tree

Showing 5 changed files with 33 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -77,9 +77,9 @@ env:
   - ENV=test_ESP32_lolin-d32-pro
   - ENV=test_ESP8266_4M1M_VCC
   #- ENV=test_ESP8266_4M1M_VCC_MDNS_SD
-  #- ENV=test_alt_wifi_ESP8266_4M1M_VCC
-  #- ENV=test_beta_ESP8266_16M_LittleFS
-  #- ENV=test_beta_ESP8266_4M1M
+  - ENV=test_alt_wifi_ESP8266_4M1M_VCC
+  - ENV=test_beta_ESP8266_16M_LittleFS
+  - ENV=test_beta_ESP8266_4M1M
 
 script:
   - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -e $ENV

diff --git a/platformio_core_defs.ini b/platformio_core_defs.ini
@@ -134,8 +134,7 @@ build_flags               = ${esp82xx_2_6_x.build_flags}
                             -Wno-deprecated-declarations
 platform_packages         =
   framework-arduinoespressif8266 @ https://github.com/esp8266/Arduino.git
-  toolchain-xtensa @ https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu12/x86_64-w64-mingw32.xtensa-lx106-elf-0474ae9.200706.zip
-;  toolchain-xtensa @ https://github.com/earlephilhower/esp-quick-toolchain/releases/download/3.0.0-gnu12/x86_64-linux-gnu.xtensa-lx106-elf-0474ae9.200706.tar.gz
+  toolchain-xtensa @ ~2.100100.0
 
 
 

diff --git a/src/ESPEasy.ino b/src/ESPEasy.ino
@@ -191,6 +191,12 @@ void setup()
   lastADCvalue = analogRead(A0);
 #endif
 
+#ifdef ESP8266
+  // See https://github.com/esp8266/Arduino/commit/a67986915512c5304bd7c161cf0d9c65f66e0892
+  analogWriteRange(1023);
+#endif
+
+
   resetPluginTaskData();
 
   checkRAM(F("setup"));

diff --git a/src/Misc.ino b/src/Misc.ino
@@ -645,12 +645,10 @@ void analogWriteESP32(int pin, int value)
 /********************************************************************************************\
   Status LED
 \*********************************************************************************************/
-#if defined(ESP32)
-  #define PWMRANGE 1024
-#endif
-#define STATUS_PWM_NORMALVALUE (PWMRANGE>>2)
-#define STATUS_PWM_NORMALFADE (PWMRANGE>>8)
-#define STATUS_PWM_TRAFFICRISE (PWMRANGE>>1)
+#define PWMRANGE_FULL 1023
+#define STATUS_PWM_NORMALVALUE (PWMRANGE_FULL>>2)
+#define STATUS_PWM_NORMALFADE (PWMRANGE_FULL>>8)
+#define STATUS_PWM_TRAFFICRISE (PWMRANGE_FULL>>1)
 
 void statusLED(bool traffic)
 {
@@ -685,16 +683,16 @@ void statusLED(bool traffic)
     //AP mode is active
     else if (WifiIsAP(WiFi.getMode()))
     {
-      nStatusValue = ((millis()>>1) & PWMRANGE) - (PWMRANGE>>2); //ramp up for 2 sec, 3/4 luminosity
+      nStatusValue = ((millis()>>1) & PWMRANGE_FULL) - (PWMRANGE_FULL>>2); //ramp up for 2 sec, 3/4 luminosity
     }
     //Disconnected
     else
     {
-      nStatusValue = (millis()>>1) & (PWMRANGE>>2); //ramp up for 1/2 sec, 1/4 luminosity
+      nStatusValue = (millis()>>1) & (PWMRANGE_FULL>>2); //ramp up for 1/2 sec, 1/4 luminosity
     }
   }
 
-  nStatusValue = constrain(nStatusValue, 0, PWMRANGE);
+  nStatusValue = constrain(nStatusValue, 0, PWMRANGE_FULL);
 
   if (gnStatusValueCurrent != nStatusValue)
   {
@@ -703,7 +701,7 @@ void statusLED(bool traffic)
     long pwm = nStatusValue * nStatusValue; //simple gamma correction
     pwm >>= 10;
     if (Settings.Pin_status_led_Inversed)
-      pwm = PWMRANGE-pwm;
+      pwm = PWMRANGE_FULL-pwm;
 
     #if defined(ESP8266)
       analogWrite(Settings.Pin_status_led, pwm);

diff --git a/src/src/Helpers/CompiletimeDefines.cpp b/src/src/Helpers/CompiletimeDefines.cpp
@@ -13,7 +13,11 @@
 #endif // ifndef SET_BUILD_GIT_HEAD
 
 String get_binary_filename() {
-  return F(SET_BUILD_BINARY_FILENAME);
+  #ifndef CORE_POST_2_5_0
+    return F("firmware.bin");
+  #else
+    return F(SET_BUILD_BINARY_FILENAME);
+  #endif
 }
 
 String get_build_time() {
@@ -35,9 +39,17 @@ String get_build_origin() {
 }
 
 String get_build_platform() {
-  return F(SET_BUILD_PLATFORM);
+  #ifndef CORE_POST_2_5_0
+    return "";
+  #else
+    return F(SET_BUILD_PLATFORM);
+  #endif
 }
 
 String get_git_head() {
-  return F(SET_BUILD_GIT_HEAD);
+  #ifndef CORE_POST_2_5_0
+    return "";
+  #else
+    return F(SET_BUILD_GIT_HEAD);
+  #endif
 }