Merge pull request #119 from RFD-FHEM/dev-r33

Release Version 3.3.1
RFD-FHEM · Dec 3, 2019 · bc3331b · bc3331b
2 parents 6921f82 + 0cd77ae
commit bc3331b
Show file tree

Hide file tree

Showing 47 changed files with 9,619 additions and 1,579 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -0,0 +1,10 @@
+[submodule "win32arduino"]
+	path = tests/win32arduino
+	url = https://github.com/end2endzone/win32Arduino.git
+[submodule "src/_micro-api/libraries/WIFIManager"]
+	path = src/_micro-api/libraries/WIFIManager
+	url = https://github.com/tzapu/WiFiManager.git
+	branch = ota
+[submodule "src/_micro-api/libraries/ArduinoJson"]
+	path = src/_micro-api/libraries/ArduinoJson
+	url = https://github.com/bblanchon/ArduinoJson.git
diff --git a/.travis.yml b/.travis.yml
@@ -0,0 +1,149 @@
+language: cpp
+sudo: required 
+env:
+  matrix: 
+    env: 
+      - BOARD=nano328 RECEIVER=cc1101
+      - BOARD=radiono RECEIVER=cc1101  
+      - BOARD=promini 
+      - BOARD=ESP8266 RECEIVER=cc1101
+  global:
+#  - IDE_VERSION=1.8.8
+  - secure: JuFfMHl8rC9ZeUF2LWHvWb99xWHn7e+sQcGiFkUrVztrmH6L18r7wyOdCbEpxdHJphQdsBPj6S0qnA4RXuKoMizAQfEmZ01v9ZPXr1y6A+QF+ri3M2ZMicwEUfyT80oPUp+o33HPE7cKG8sq8eM4qlALTFf4VL8QsM4DLyMuZlfkMLa1SkglA6Z7W15Ftm3kPxzFqHt7g/Y0QbFus9NrmS28pE3uZKzMjPvMv5Uyq47Ua6dRGV8brXutN9qsx1La87VtunelOECE1s8RvkjuLVlcQS2YmGkqRWSdGQPKVnK4pH3EtJDZ3010hRfJCus02VsGXNqssDmfOYv8JxS/7TxI6d88VS+YpKrqWfsZ3e9KWL4SiCaTuh3V3OG3iddYWuU13dyZeXviJVaSmKcm0AKs+WdugsApB691d6wQ19ujPwdIaeR9+K68b7jjMJeftkYuheMY4iJHteJO10E5m1BC/VDl8ptWSFdGPmGRTV+uzhJINLkzuc/p8vj/XQh4lcCwssxvfYy1qF5xD+gmtpEvzHNN/lAy3AsJdAf+Ay1PC/3Uo5WP9NtlsYwY6QadDpM4fyObGCapTsLDf7J3sgD1YpZSUvjdDSFz4C8TbXCHfiogcCR+fPKrlctqNX76VnE871pAUdF45E33gFKTndL6s3E8EHmJFiLGVeMJp9Q=
+
+script:
+  - chmod +x ./build.sh;
+  - ./build.sh;
+before_install:
+  - mkdir $PWD/SIGNALDuino
+# - find $PWD/src/_micro-api/libraries -maxdepth 1 -depth -type d -not -name "libraries"    | xargs -i find  {}/src/ -maxdepth 1 -not -name "src" -not -name "examples" | xargs cp -a -t $PWD/SIGNALDuino/;
+  - find $PWD -maxdepth 1 -name "*.h" -or -name "*.cpp" -or -name "*.ino"  | xargs cp -a -t $PWD/SIGNALDuino/
+  - wget http://downloads.arduino.cc/arduino-$IDE_VERSION-linux64.tar.xz
+install:
+  - tar xf arduino-$IDE_VERSION-linux64.tar.xz;   
+  - sudo mv arduino-$IDE_VERSION /usr/local/share/arduino;  
+  - sudo ln -s /usr/local/share/arduino/arduino /usr/local/bin/arduino;
+  - ln -s $PWD/src/_micro-api/libraries/bitstore /usr/local/share/arduino/libraries/bitstore
+  - ln -s $PWD/src/_micro-api/libraries/output /usr/local/share/arduino/libraries/output
+  - ln -s $PWD/src/_micro-api/libraries/signalDecoder /usr/local/share/arduino/libraries/signalDecoder
+  - ln -s $PWD/src/_micro-api/libraries/SimpleFIFO /usr/local/share/arduino/libraries/simpleFIFO
+  - ln -s $PWD/src/_micro-api/libraries/fastdelegate /usr/local/share/arduino/libraries/fastdelegate
+  - ln -s $PWD/src/_micro-api/libraries/TimerOne /usr/local/share/arduino/libraries/TimerOne
+  - ln -s $PWD/src/_micro-api/libraries/WIFIManager /usr/local/share/arduino/libraries/WIFIManager
+  - ln -s $PWD/src/_micro-api/libraries/ArduinoJson /usr/local/share/arduino/libraries/ArduinoJson
+  - arduino --pref "compiler.warning_level=all" --save-prefs;
+  - mkdir $PWD/release;
+  - arduino --pref "build.path=$PWD/release" --save-prefs;
+after_success:
+  - mv $PWD/release/SIGNALDuino.ino.hex $PWD/release/SIGNALDuino_${BOARD}${RECEIVER}${TRAVIS_TAG}.hex
+before_deploy:
+  - git config --global user.email "[email protected]";
+  - git config --global user.name "Travis CI";
+  - export GIT_TAG=`grep "#define PROGVERS" $PWD/SIGNALDuino.ino  | cut -d\" -f2`;
+  - git fetch --tags --force;
+  - git rev-parse -q --verify "refs/tags/$GIT_TAG" || 
+       { git tag $GIT_TAG -a -m "Generated tag from TravisCI for build $TRAVIS_BUILD_NUMBER" ; 
+         git push -q https://$GH_API_KEY:[email protected]/RFD-FHEM/SIGNALDuino --tags;
+       };
+  - ls -R;
+  - chmod +x ./deploy.sh;
+deploy:
+ # - ./deploy.sh
+  skip_cleanup: true
+  provider: releases
+  api_key:
+    secure: X2FfofClmMfz7Uch6QZYcBCDHfRblljHjMioNOvZdRU0eL1SapPnbCAL4Aff5eox4loJHm0sjRMemCXEDWkbgGxIjGqYaXe9eLdQn/jXUMuGlF+UgWxJsU5xj0kvMA3e6qMD/8gwnmfCFmLamDrYzvOgUOnNLnTmWFHiERLRBdd+b+LZ/68kX1VHnkmEKDEGIt+QfhQM5dO4fZF1MdPsho9mXlPGLSj81S3njAdMKnWVatBWXdNSAMwhJDARO+nfGXHSNoEY/RBmzmt7VTPScnCXrASjsuzHFmU0GvjG1zV8pBPNmj26TlST74xdtWGA7Czl7mLbYup1Q/GATy1s4LrQP/wXHHKKBccg2czlD7I6YgeuTbwgLncmtk918hcqnu4Zn8I2tuUxlB8V1G0u2XMeyQx3jcodxF4I36c1yge+VrW2FeDIl2qOGJwn5Azff4T1SAd49YJGyLMZfVkZljzhUVb92rKrcX33TW2eVyG4kNd6aOi/mH8niNJlsU5osfjhtBP0zQM89QroMV9AMpLfltmMBFGlcH4hxb9gjCWFZXwGqgka5fEAVTCJhp/GNhwuCN754/vdoGaA78zHkOPPIZ2CIBvX93BH2QtaRz+8inY6xA6g4ScVVp3lMjrqe1NdCCR6j927vkp+lvCPj6OLBhkcM4QcYQffRqmaAHY=
+  file: $PWD/release/SIGNALDuino_${BOARD}${RECEIVER}${TRAVIS_TAG}.hex
+  on:
+     repo: RFD-FHEM/SIGNALDuino
+     tags: true
+     prerelease: true
+     draft: true
+     condition: $TRAVIS_BUILD_STAGE_NAME = "Deploy"
+     #condition: "$TRAVIS_EVENT_TYPE = cron"
+     #condition: $TRAVIS_TAG =~ ^release.*$
+     all_branches: true
+     #condition: $TRAVIS_BRANCH =~ ^dev-r33.*
+
+jobs: 
+  include: 
+    - 
+      stage: deploy
+      env: 
+        - BOARD=nano
+        - RECEIVER=cc1101
+    - 
+      stage: deploy
+      env: 
+        - BOARD=nano328
+    - 
+     stage: deploy
+     env:
+      - BOARD=radino
+      - RECEIVER=cc1101
+     before_script:
+           - arduino --pref boardsmanager.additional.urls=http://library.radino.cc/Arduino_1_8/package_radino_radino32_index.json --save-prefs;
+    - 
+     stage: deploy
+     env:
+      - BOARD=minicul
+      - RECEIVER=cc1101
+    - 
+     stage: deploy
+     env:
+      - BOARD=promini
+    - 
+     stage: deploy
+     env:
+       - BOARD=ESP8266
+       - RECEIVER=cc1101
+#       - IDE_VERSION=1.8.5
+     before_script:
+#           - git clone --branch ota http://github.com/tzapu/WiFiManager.git /usr/local/share/arduino/libraries/WIFIManager
+           - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs
+#           - arduino --install-library "ArduinoJson:5.13.2";
+           - arduino --install-boards esp8266:esp8266:2.4.2
+           - arduino --board esp8266:esp8266:generic:CpuFrequency=80,ResetMethod=ck,CrystalFreq=26,FlashFreq=40,FlashMode=dio,FlashSize=1M64,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,UploadSpeed=115200 --save-prefs
+     after_success:
+           - mv $PWD/release/SIGNALDuino.ino.bin $PWD/release/SIGNALDuino_${BOARD}${RECEIVER}${TRAVIS_TAG}.hex
+    - 
+     stage: deploy
+     env:
+       - BOARD=ESP8266
+     before_script:
+           - arduino --pref "boardsmanager.additional.urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json" --save-prefs
+           - arduino --install-boards esp8266:esp8266:2.4.2
+           - arduino --board esp8266:esp8266:generic:CpuFrequency=80,ResetMethod=ck,CrystalFreq=26,FlashFreq=40,FlashMode=dio,FlashSize=1M64,LwIPVariant=v2mss536,Debug=Disabled,DebugLevel=None____,UploadSpeed=115200 --save-prefs
+     after_success:
+           - mv $PWD/release/SIGNALDuino.ino.bin $PWD/release/SIGNALDuino_${BOARD}${RECEIVER}${TRAVIS_TAG}.hex
+    - 
+      stage: unittest
+      install: skip 
+      before_install: skip
+      before_deploy: skip
+      env:
+         - CMAKE_PREFIX_PATH=$TRAVIS_BUILD_DIR/tests/install
+         - GTEST_ROOT=$CMAKE_PREFIX_PATH/googletest
+      script: 
+           - chmod +x $TRAVIS_BUILD_DIR/tests/ci/*.sh
+           - cd $TRAVIS_BUILD_DIR/tests/ci
+           - ./install_googletest.sh
+           - cd $TRAVIS_BUILD_DIR/tests/ci
+           - ./install_rapidassist.sh
+           - cd $TRAVIS_BUILD_DIR/tests/ci
+           - ./build_win32arduino.sh
+           - cd $TRAVIS_BUILD_DIR/tests/ci
+           - ./build_signalDecoderTests.sh
+           - cd $TRAVIS_BUILD_DIR/
+           - ls -l
+           - cd $TRAVIS_BUILD_DIR/tests/build
+           - ls -l
+           - ./bin/TestProject 
+allow_failures: 
+notifications:
+  email:
+    on_success: change
+    on_failure: change
+stages:
+  - unittest
+  - stage: deploy
diff --git a/README.md b/README.md
@@ -1,11 +1,14 @@
-# SIGNALDuino uC v3.3-0 
-
-System to receive digital signals and provide them to other systems pro demodulatiob. Currently tested with 433 MHZ, but not limited to that frequency or media.
+# SIGNALDuino uC v3.3.1  with cc1101 support 
+[![Build Status](https://travis-ci.org/RFD-FHEM/SIGNALDuino.svg?branch=master)](https://travis-ci.org/RFD-FHEM/SIGNALDuino)
 
 ### Getting started
 
 
-Just clone the repo and open the project file with Visual Studio and the Visual Micro addon. (sorry, but this works only for windows)
+System to receive digital signals and provide them to other systems pro demodulatiob. Currently tested with 433 MHZ, but not limited to that frequency or media.
+
+
+Just clone the repo and open the project file with visualstudio. (only available for windows)
+You can also open it with the Arduino IDE. 
 Compile it and have fun.
 If you are using the Arduino IDE, you have to copy all the libs into your sketch folder and alter some includes.
 
@@ -16,9 +19,17 @@ You find more Information here:
 http://www.fhemwiki.de/wiki/SIGNALDuino
 
 
+
 ### Tested microcontrollers
 
 * Aduino Nano
+* RadinoCC1101
+* ESP8266
+
+### ESP32 Notes
+
+If you encounter problems compiling for ESP32, sorry the code for this microcontroller is currently not finished. Contributors are welcome. If you have mane errors from fastDelegate.h try adding this compiler flag:
+ -Wno-unused-local-typedef
 
 ### Signal from my device ist not detected