Merged changes for the new dev

This commit is contained in:
Glenn Arens
2019-04-05 12:01:13 +02:00
20 changed files with 1939 additions and 949 deletions

5
.gitignore vendored
View File

@@ -6,4 +6,9 @@
platformio.ini
lib/readme.txt
.travis.yml
<<<<<<< HEAD
*.py
=======
stackdmp.txt
*.jar
>>>>>>> upstream/dev