still trying to fix travis release scripts..

letscontrolit · Jan 2, 2018 · 53a2008 · 53a2008
1 parent 2525b0e
commit 53a2008
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 60 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -26,7 +26,7 @@ install:
 
 script:
   - cppcheck --enable=warning src/*.ino -q --force -I src --include=src/ESPEasy.ino --error-exitcode=1
-  - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump
+  # - ./memanalyzer.py ~/.platformio/packages/toolchain-xtensa/bin/xtensa-lx106-elf-objdump
   - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -s
 
 before_deploy:

diff --git a/dist/Release_notes.txt b/dist/Release_notes.txt
@@ -1,58 +1,3 @@
--------------------------------------------------
-Changes in release v2.0.0-dev13 (since v2.0.0-dev12)
--------------------------------------------------
-
-Release date: Tue Jan  2 14:24:08 CET 2018
-
-Edwin Eefting (25):
-      more fixes for #235
-      final fixes for #235, untested. all spiffs errors should be handled now and also show up in logs and webinterface
-      fixed obscure crash caused by not returning a value in #235. we need to adjust compiler flags to detect these kinds of issues.
-      always define PLUGIN_BUILD_NORMAL so normal plugins are compiled
-      cleaned up buildflags and created common build variable
-      solution for better error and warning highlighting when compiling with platformio
-      enabled warnings and started fixing all the warnings to reduce the noise. (because warnings where disabled wasted about 3 hours debugging a simple no-return bug)
-      cleaned up more warnings and fixed a few real bug along the way. #235
-      now using PRAGMA to enable warnings, so that we dont get warnings from core libraries. also warnings will be treated as errors in Travis, this makes approving pull requests less work for me.
-      travis fix
-      worked around error caused by upstream libraries
-      fixes
-      cleaned up notification stuff. fixed #502
-      warnings are treated as errors now, by travis
-      refactored and added automated test stuff
-      examples for the lone wanderer
-      cleaner errors
-      working on test stuff
-      update branching info
-      test library stuff
-      Simple fix for MH-Z19 B version. #529
-      set lcd to NULL by default. #584
-      fix #588. parseTemplate() now only checks enabled taskes for [] macros
-      automaticly updated release notes for v2.0.0-dev13
-      release all binaries by doing the full compile step as last
-
-Gijs Noorlander (9):
-      [INA219] Allow for multiple instances on the same controller (#519)
-      [INA219_v2.0] Improve logs for multiple devices (#546)
-      [LCD plugin] Added check of LCD object before dereferencing it (#584)
-      Move CO2 MH-Z19 plugin from "testing" to "normal" (#618)
-      [DNS/IP] Obey UseDNS setting for all controllers (#629)
-      [v2.0] Add more characters to the list not to escape in URLs (#635)
-      [>49.7 days uptime overflow] Use separate function to compute time differences (#621)
-      [WiFi] Avoid timeouts when not connected to WiFi (#639)
-      [PubSubClient] Bug in handling domainname (#660)
-
-Grovkillen (2):
-      Added categories... (#552)
-      Changed bin file names to be more descriptive. (#597)
-
-Neo (1):
-      [HT16K33_LED] Brightness control (#523)
-
-mvdbro (1):
-      Bugfix: %eventvalue% parsing on literal strings
-
-
 -------------------------------------------------
 Changes in release v2.0.0-dev12 (since v2.0.0-dev11)
 -------------------------------------------------

diff --git a/test/config.py b/test/config.py
@@ -4,18 +4,28 @@
         'type'      : 'wemos d1 mini v2.2.0',
         'port'      : '/dev/serial/by-path/pci-0000:00:14.0-usb-0:3.1:1.0-port0',
         'ip'        : '192.168.13.91',
-        'flash_cmd' : 'esptool.py --port {port} -b 1500000  write_flash 0x0 .pioenvs/dev_4096/firmware.bin --flash_size=32m -p',
-        'build_cmd' : 'platformio run --environment dev_4096'
+        'flash_cmd' : 'esptool.py --port {port} -b 1500000  write_flash 0x0 .pioenvs/dev_ESP8266_4096/firmware.bin --flash_size=32m -p',
+        'build_cmd' : 'platformio run --environment dev_ESP8266_4096'
     },
 
     {
         'node'      : 2,
         'type'      : 'nodemcu geekcreit ESP12E devkit v2',
         'port'      : '/dev/serial/by-path/pci-0000:00:14.0-usb-0:3.2:1.0-port0',
         'ip'        : '192.168.13.92',
-        'flash_cmd' : 'esptool.py --port {port} -b 1500000  write_flash 0x0 .pioenvs/dev_4096/firmware.bin --flash_size=32m -p',
-        'build_cmd' : 'platformio run --environment dev_4096'
+        'flash_cmd' : 'esptool.py --port {port} -b 1500000  write_flash 0x0 .pioenvs/dev_ESP8266_4096/firmware.bin --flash_size=32m -p',
+        'build_cmd' : 'platformio run --environment dev_ESP8266_4096'
     },
+
+    {
+        'node'      : 3,
+        'type'      : 'wemos d1 mini v2.2.0',
+        'port'      : '/dev/ttyUSB0',
+        'ip'        : '192.168.13.91',
+        'flash_cmd' : 'esptool.py --port {port} -b 1500000  write_flash 0x0 .pioenvs/dev_ESP8266_4096/firmware.bin --flash_size=32m -p',
+        'build_cmd' : 'platformio run --environment dev_ESP8266_4096'
+    },
+
 ]