Merge branch 'mega' into git-hooks

.github/issue_template.md

@@ -1,3 +1,4 @@
+<!--- If you self compile, please state this and PLEASE try to ONLY REPORT ISSUES WITH OFFICIAL BUILDS!  --->
 <!--- NOTE: This is not a support forum! For questions and support go here: --->
 <!--- https://www.letscontrolit.com/forum/viewforum.php?f=1 --->
 <!--- Remove topics that are not applicable to your feature request of issue --->
@@ -28,6 +29,7 @@ YOUR TEXT GOES HERE
 Hardware:
 
 <!--- You should also provide links to hardware pages etc where we can find more info  --->
+<!--- If you self compile, please state this and PLEASE try to ONLY REPORT ISSUES WITH OFFICIAL BUILDS!  --->
 ESP Easy version: 
 
 <!--- In order to have a better readablity of your issue then you should place screenshots here  --->

.gitignore

@@ -17,3 +17,4 @@
 lib/readme.txt
 src/Custom.h
 /ESPEasy
+test/output_export.cpp

.travis.yml

@@ -27,11 +27,13 @@ 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
-  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run 
+  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run
+  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run
 
   # patch platformio core libs for PUYA bug (https://github.com/letscontrolit/ESPEasy/issues/650)
   - cd patches; ./check_puya_patch; cd ..
   - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -s --environment dev_ESP8266PUYA_1024
+  - PLATFORMIO_BUILD_FLAGS="-D CONTINUOUS_INTEGRATION" platformio run -s --environment dev_ESP8266PUYA_1024
 
 
 before_deploy:

README.md

@@ -1,6 +1,9 @@
 # ESPEasy (development branch)
 
-Build status: [![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy)
+Badge  | Info  |
+-------|-------|
+[![Build Status](https://travis-ci.org/letscontrolit/ESPEasy.svg?branch=mega)](https://travis-ci.org/letscontrolit/ESPEasy) | build status |
+[![GitHub version](https://img.shields.io/github/release/letscontrolit/ESPEasy/all.svg)](https://github.com/letscontrolit/ESPEasy/releases/latest) | latest nightly |
 
 Introduction and wiki: https://www.letscontrolit.com/wiki/index.php/ESPEasy#Introduction
 

before_deploy

@@ -18,13 +18,16 @@ for ENV in \
   dev_ESP8266_4096\
   dev_ESP8285_1024\
   dev_ESP8266PUYA_1024\
-  dev_ESP8266PUYA_1024_VCC;\
+  dev_ESP8266PUYA_1024_VCC\
+  hard_SONOFF_POW\
+  esp32dev;\
 do
   echo
   echo "### Deploying environment $ENV for version $VERSION"
-  BIN=.pioenvs/$ENV/firmware.bin
+  BIN=.pioenvs/${ENV}/ESP_Easy_${VERSION}_${ENV}.bin
+  cp .pioenvs/${ENV}/firmware.bin $BIN
   python2 crc2.py $BIN
-  cp $BIN dist/"ESP_Easy_$VERSION""_$ENV.bin"
+  mv $BIN "dist/ESP_Easy_${VERSION}_${ENV}.bin"
 done
 
 

crc2.py

@@ -5,10 +5,10 @@
 import md5
 import os
 MD5DUMMY      = "MD5_MD5_MD5_MD5_BoundariesOfTheSegmentsGoHere..." #48 chars
-FILENAMEDUMMY = "ThisIsTheDummyPlaceHolderForTheBinaryFilename..." #48 chars
+FILENAMEDUMMY = "ThisIsTheDummyPlaceHolderForTheBinaryFilename64ByteLongFilenames" #64 chars
 
 MemorySegmentStart,MemorySegmentEnd,MemoryContent=[],[],[]
- 
+
 ##################################################################
 # this subroutine shows the segments of a  part
 ##################################################################
@@ -18,7 +18,7 @@ def showSegments (fileContent,offset):
     herestr =""
     herestr2 =""
     MemorySegmentStart.append(struct.pack("I",header[0]))
-    MemorySegmentEnd.append(struct.pack("I",header[0]+header[1])) 
+    MemorySegmentEnd.append(struct.pack("I",header[0]+header[1]))
     MemoryContent.append(fileContent[offset+8:offset+8+header[1]])
     if  fileContent.find( MD5DUMMY, offset+8, offset+8+header[1]) >0 :
         herestr= " <-- CRC is here."
@@ -42,7 +42,7 @@ def showParts(fileContent, offset):
     return nextSegmentOffset
 
 ##################################################################
-# MAIN 
+# MAIN
 ##################################################################
 
 #if len(sys.argv) !=2 :
@@ -71,46 +71,46 @@ def showParts(fileContent, offset):
 # 4: RAM
 
 for i in (1,2 ):     # use only stable segments, must be 4 in total. We use 2.
-    startArray =startArray + MemorySegmentStart[i] 
-    endArray =  endArray   + MemorySegmentEnd[i] 
+    startArray =startArray + MemorySegmentStart[i]
+    endArray =  endArray   + MemorySegmentEnd[i]
     hashString =hashString + MemoryContent[i]
     with open(FileName+str(i), mode='wb') as file: # b is important -> binary
       file.write(MemoryContent[i])
     includeStr = includeStr +" "+ str(i)
 print (includeStr)
-# IMPORTANT: pad array with zeros if you use only 3 segments (see above)    
-while len(startArray) < 16 : 
-	startArray =startArray + struct.pack("I",0) 
-	endArray =  endArray   + struct.pack("I",0) 
-# debug print (binascii.hexlify(startArray)) 
+# IMPORTANT: pad array with zeros if you use only 3 segments (see above)
+while len(startArray) < 16 :
+	startArray =startArray + struct.pack("I",0)
+	endArray =  endArray   + struct.pack("I",0)
+# debug print (binascii.hexlify(startArray))
 # debug print (binascii.hexlify(endArray))
 if (len(endArray) + len (startArray)) != 32 :
-    print("ERROR: please make sure you add / remove padding if you change the semgents.") 
+    print("ERROR: please make sure you add / remove padding if you change the semgents.")
 
 BinaryFileName = "";
 if  fileContent.find( FILENAMEDUMMY) < 0:
     print("ERROR: FILENAMEDUMMY dummy not found in binary")
 else:
 	BinaryFileName=os.path.basename(FileName) +"\0"
-	if len(BinaryFileName) >48:								# check that filename is <48 chars
-		BinaryFileName=BinaryFileName[0:48]					# truncate if necessary. 49th char in ESP is zero already
+	if len(BinaryFileName) >64:								# check that filename is <48 chars
+		BinaryFileName=BinaryFileName[0:64]					# truncate if necessary. 49th char in ESP is zero already
 	else:
-		BinaryFileName= BinaryFileName.ljust(48,'\0');		# pad with zeros. 	
-			
+		BinaryFileName= BinaryFileName.ljust(64,'\0');		# pad with zeros.
+
 
 if  fileContent.find( MD5DUMMY) < 0:
     print("ERROR: MD5 dummy not found in binary")
 else:
-    hashString=hashString.replace (MD5DUMMY,"",1) 
+    hashString=hashString.replace (MD5DUMMY,"",1)
     m = md5.new()
     m.update (hashString) #use segment 1
     md5hash = m.digest()
     print("MD5 hash: "+ m.hexdigest())
     print("\nwriting output file:\n" + FileName)
-	
+
     fileContent=fileContent.replace(MD5DUMMY,md5hash+startArray+endArray)
     fileContent=fileContent.replace(FILENAMEDUMMY,BinaryFileName)
 
     with open(FileName, mode='wb') as file: # b is important -> binary
       file.write(fileContent)
-#k=input("press close to exit") 
+#k=input("press close to exit")