From ffbedc4dccba7658b1d2b8ec8c61f487b934d876 Mon Sep 17 00:00:00 2001 From: sidey79 <7968127+sidey79@users.noreply.github.com> Date: Fri, 18 Dec 2020 23:24:30 +0100 Subject: [PATCH] Compile micro8 mhz (#155) * .github\workflows\unittest.yml - added radino board with incicuit board files - Added dependency between unittest and deploy jobs to run in sequence - renamed firmware to be compatible with flash command from module * Update README.md Updated badge in readme --- .github/workflows/unittest.yml | 74 ++++++++++++++++++---------------- README.md | 5 ++- 2 files changed, 42 insertions(+), 37 deletions(-) diff --git a/.github/workflows/unittest.yml b/.github/workflows/unittest.yml index d4536ff6..08b61e58 100644 --- a/.github/workflows/unittest.yml +++ b/.github/workflows/unittest.yml @@ -47,55 +47,59 @@ jobs: ls -l ./bin/TestProject deploy: + needs: unittest strategy: fail-fast: false matrix: - BOARD: - - nano328 - - leonardo - #- radino - - minicul - - promini - - ESP32 - RECEIVER: - - cc1101 - - simple - exclude: - - BOARD: radino - RECEIVER: simple - - BOARD: promini - RECEIVER: cc1101 - - BOARD: minicul - RECEIVER: simple - - BOARD: leonardo - RECEIVER: simple + #BOARD: + # - nano328 + # - micro + # #- radino + # - minicul + # - promini + # - ESP32 + # RECEIVER: + # - cc1101 + # - simple + # exclude: + # - BOARD: radino + # RECEIVER: simple + # - BOARD: promini + # RECEIVER: cc1101 + # - BOARD: minicul + # RECEIVER: simple + # - BOARD: micro + # RECEIVER: simple include: - - BOARD: nano328 + - BOARD: nano RECEIVER: cc1101 arduino-platform: 'arduino:avr' fqbn: 'arduino:avr:nano:cpu=atmega328' compilerflag: '\"-DOTHER_BOARD_WITH_CC1101=1\"' - BOARD: nano328 - RECEIVER: simple + RECEIVER: "" arduino-platform: 'arduino:avr' fqbn: 'arduino:avr:nano:cpu=atmega328' - # - BOARD: radino - # arduino-platform: 'arduino:avr In-Circuit:avr' - # fqbn: 'In-Circuit:avr:radinoCC1101' - # boardurl: '--additional-urls=http://library.radino.cc/Arduino_1_8/package_radino_radino32_index.json' - # compilerflag: \"-DARDUINO_AVR_ICT_BOARDS_ICT_BOARDS_AVR_RADINOCC1101=1\" \"-DUSB_VID=0x2341\" \"-DUSB_PID=0x8036\" - - BOARD: leonardo + - BOARD: radino RECEIVER: cc1101 - arduino-platform: 'arduino:avr' - fqbn: 'arduino:avr:leonardo' - compilerflag: \"-DARDUINO_AVR_ICT_BOARDS_ICT_BOARDS_AVR_RADINOCC1101=1\" + arduino-platform: 'arduino:avr In-Circuit:avr' + fqbn: 'In-Circuit:avr:radinoCC1101' + boardurl: '--additional-urls=http://library.radino.cc/Arduino_1_8/package_radino_radino32_index.json' + compilerflag: \"-DARDUINO_RADINOCC1101=1\" + build_param1: "compiler.path={runtime.tools.avr-gcc-7.3.0-atmel3.6.1-arduino7.path}/bin/" + #- BOARD: radino + # RECEIVER: cc1101 + # arduino-platform: 'arduino:avr' + # fqbn: 'arduino:avr:micro' + # compilerflag: \"-DARDUINO_RADINOCC1101=1\" + # build_param1: \"build.f_cpu=8000000L\" - BOARD: minicul RECEIVER: cc1101 arduino-platform: 'arduino:avr' fqbn: 'arduino:avr:pro:cpu=8MHzatmega328' compilerflag: \"-DARDUINO_ATMEGA328P_MINICUL=1\" - BOARD: promini - RECEIVER: simple + RECEIVER: "" arduino-platform: 'arduino:avr' fqbn: 'arduino:avr:pro:cpu=8MHzatmega328' - BOARD: ESP32 @@ -105,7 +109,7 @@ jobs: compilerflag: \"-DOTHER_BOARD_WITH_CC1101=1\" boardurl: '--additional-urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json' - BOARD: ESP32 - RECEIVER: simple + RECEIVER: "" arduino-platform: 'esp32:esp32' fqbn: 'esp32:esp32:esp32:FlashMode=qio,FlashFreq=80' boardurl: '--additional-urls=https://raw.githubusercontent.com/espressif/arduino-esp32/gh-pages/package_esp32_index.json' @@ -116,7 +120,7 @@ jobs: compilerflag: \"-DOTHER_BOARD_WITH_CC1101=1\" boardurl: '--additional-urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json' - BOARD: ESP8266 - RECEIVER: simple + RECEIVER: "" arduino-platform: 'esp8266:esp8266@2.6.3' fqbn: 'esp8266:esp8266:generic:xtal=80,eesz=1M64,FlashMode=qio,FlashFreq=40,dbg=Serial,lvl=CORE' boardurl: '--additional-urls=http://arduino.esp8266.com/stable/package_esp8266com_index.json' @@ -127,7 +131,7 @@ jobs: compilerflag: \"-DOTHER_BOARD_WITH_CC1101=1\" boardurl: '--additional-urls=https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json' - BOARD: MAPLEMINI_F103CB - RECEIVER: simple + RECEIVER: "" arduino-platform: 'STM32:stm32' fqbn: 'STM32:stm32:GenF1:pnum=MAPLEMINI_F103CB' boardurl: '--additional-urls=https://github.com/stm32duino/BoardManagerFiles/raw/master/STM32/package_stm_index.json' @@ -152,7 +156,7 @@ jobs: - name: Compile sketch id: compile_sketch run: | - arduino-cli compile --fqbn ${{ matrix.fqbn }} --build-property="compiler.cpp.extra_flags=${{ matrix.compilerflag }}" ${{ matrix.boardurl }} --output-dir=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/src/arduino-ide/SIGNALDuino/SIGNALDuino.ino + arduino-cli compile --fqbn ${{ matrix.fqbn }} --build-property="compiler.cpp.extra_flags=${{ matrix.compilerflag }}" ${{ matrix.boardurl }} --build-property="${{ matrix.build_param1 }}" --output-dir=$GITHUB_WORKSPACE $GITHUB_WORKSPACE/src/arduino-ide/SIGNALDuino/SIGNALDuino.ino echo "::set-output name=fileext::$(test -f $GITHUB_WORKSPACE/SIGNALDuino.ino.bin && echo "bin" || echo "hex")" # - name: rename firmwarefile # if: ${{ matrix.BOARD == 'ESP32' }} diff --git a/README.md b/README.md index 263f9338..04a5c243 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # SIGNALDuino uC v3.5.0-development with cc1101 support -[![Build Status](https://travis-ci.org/RFD-FHEM/SIGNALDuino.svg?branch=master)](https://travis-ci.org/RFD-FHEM/SIGNALDuino) +Development: ![unittest](https://github.com/RFD-FHEM/SIGNALDuino/workflows/unittest/badge.svg?branch=dev-r3.5_xFSK) +Master: ![unittest](https://github.com/RFD-FHEM/SIGNALDuino/workflows/unittest/badge.svg?branch=master) ### Getting started @@ -60,4 +61,4 @@ First, sorry. This software is not perfect. 4. Create a branch (git checkout -b my_branch) 5. Commit your changes (git commit -am "") 6 .Push to a developer branch (git push dev-my_branch) -7. Open a Pull Request, put some useful informations there, what your extension does and why we should add it, reference to the open issues which are fixed whith this pull requet. \ No newline at end of file +7. Open a Pull Request, put some useful informations there, what your extension does and why we should add it, reference to the open issues which are fixed whith this pull requet.