From f20048da1d847e2f0cd42898649d2ca5bcae9b1c Mon Sep 17 00:00:00 2001 From: "A. Binzxxxxxx" Date: Thu, 14 Mar 2019 23:56:59 +0100 Subject: [PATCH] added platform io and travis config --- Multiprotocol/.gitignore | 6 +++- Multiprotocol/.travis.yml | 31 +++++++++++++++++++ Multiprotocol/{ => include}/FrSkyD_cc2500.h | 0 Multiprotocol/{ => include}/Multiprotocol.h | 0 Multiprotocol/{ => include}/Validate.h | 0 Multiprotocol/{ => include}/cc2500_spi.h | 0 Multiprotocol/{ => include}/common.h | 0 Multiprotocol/{ => include}/config.h | 0 Multiprotocol/{ => include}/debug.h | 0 Multiprotocol/{ => include}/eeprom.h | 0 Multiprotocol/{ => include}/input.h | 0 Multiprotocol/{ => include}/pins.h | 0 Multiprotocol/{ => include}/spi.h | 0 Multiprotocol/{ => include}/state.h | 0 Multiprotocol/{ => include}/tx_def.h | 0 Multiprotocol/platformio.ini | 18 +++++++++++ Multiprotocol/{ => src}/FrSkyD_cc2500.cpp | 0 .../Multiprotocol.cpp} | 17 +++++++--- Multiprotocol/{ => src}/cc2500_spi.cpp | 0 Multiprotocol/{ => src}/common.cpp | 0 Multiprotocol/{ => src}/config.cpp | 0 Multiprotocol/{ => src}/input.cpp | 0 Multiprotocol/{mi.ino => src/mi.cpp} | 2 ++ Multiprotocol/{ => src}/spi.cpp | 0 Multiprotocol/{ => src}/state.cpp | 0 25 files changed, 68 insertions(+), 6 deletions(-) create mode 100644 Multiprotocol/.travis.yml rename Multiprotocol/{ => include}/FrSkyD_cc2500.h (100%) rename Multiprotocol/{ => include}/Multiprotocol.h (100%) rename Multiprotocol/{ => include}/Validate.h (100%) rename Multiprotocol/{ => include}/cc2500_spi.h (100%) rename Multiprotocol/{ => include}/common.h (100%) rename Multiprotocol/{ => include}/config.h (100%) rename Multiprotocol/{ => include}/debug.h (100%) rename Multiprotocol/{ => include}/eeprom.h (100%) rename Multiprotocol/{ => include}/input.h (100%) rename Multiprotocol/{ => include}/pins.h (100%) rename Multiprotocol/{ => include}/spi.h (100%) rename Multiprotocol/{ => include}/state.h (100%) rename Multiprotocol/{ => include}/tx_def.h (100%) create mode 100644 Multiprotocol/platformio.ini rename Multiprotocol/{ => src}/FrSkyD_cc2500.cpp (100%) rename Multiprotocol/{Multiprotocol.ino => src/Multiprotocol.cpp} (98%) rename Multiprotocol/{ => src}/cc2500_spi.cpp (100%) rename Multiprotocol/{ => src}/common.cpp (100%) rename Multiprotocol/{ => src}/config.cpp (100%) rename Multiprotocol/{ => src}/input.cpp (100%) rename Multiprotocol/{mi.ino => src/mi.cpp} (95%) rename Multiprotocol/{ => src}/spi.cpp (100%) rename Multiprotocol/{ => src}/state.cpp (100%) diff --git a/Multiprotocol/.gitignore b/Multiprotocol/.gitignore index 378eac2..f152028 100644 --- a/Multiprotocol/.gitignore +++ b/Multiprotocol/.gitignore @@ -1 +1,5 @@ -build +.pio +.pioenvs +.piolibdeps +.clang_complete +.gcc-flags.json diff --git a/Multiprotocol/.travis.yml b/Multiprotocol/.travis.yml new file mode 100644 index 0000000..250f4b6 --- /dev/null +++ b/Multiprotocol/.travis.yml @@ -0,0 +1,31 @@ +# Continuous Integration (CI) is the practice, in software +# engineering, of merging all developer working copies with a shared mainline +# several times a day < https://docs.platformio.org/page/ci/index.html > +# +# Documentation: +# +# * Travis CI Embedded Builds with PlatformIO +# < https://docs.travis-ci.com/user/integration/platformio/ > +# +# * PlatformIO integration with Travis CI +# < https://docs.platformio.org/page/ci/travis.html > +# +# * User Guide for `platformio ci` command +# < https://docs.platformio.org/page/userguide/cmd_ci.html > +# + +language: python +python: + - "2.7" + +sudo: false +cache: +directories: + - "~/.platformio" + +install: + - pip install -U platformio + - platformio update + +script: + - platformio run diff --git a/Multiprotocol/FrSkyD_cc2500.h b/Multiprotocol/include/FrSkyD_cc2500.h similarity index 100% rename from Multiprotocol/FrSkyD_cc2500.h rename to Multiprotocol/include/FrSkyD_cc2500.h diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/include/Multiprotocol.h similarity index 100% rename from Multiprotocol/Multiprotocol.h rename to Multiprotocol/include/Multiprotocol.h diff --git a/Multiprotocol/Validate.h b/Multiprotocol/include/Validate.h similarity index 100% rename from Multiprotocol/Validate.h rename to Multiprotocol/include/Validate.h diff --git a/Multiprotocol/cc2500_spi.h b/Multiprotocol/include/cc2500_spi.h similarity index 100% rename from Multiprotocol/cc2500_spi.h rename to Multiprotocol/include/cc2500_spi.h diff --git a/Multiprotocol/common.h b/Multiprotocol/include/common.h similarity index 100% rename from Multiprotocol/common.h rename to Multiprotocol/include/common.h diff --git a/Multiprotocol/config.h b/Multiprotocol/include/config.h similarity index 100% rename from Multiprotocol/config.h rename to Multiprotocol/include/config.h diff --git a/Multiprotocol/debug.h b/Multiprotocol/include/debug.h similarity index 100% rename from Multiprotocol/debug.h rename to Multiprotocol/include/debug.h diff --git a/Multiprotocol/eeprom.h b/Multiprotocol/include/eeprom.h similarity index 100% rename from Multiprotocol/eeprom.h rename to Multiprotocol/include/eeprom.h diff --git a/Multiprotocol/input.h b/Multiprotocol/include/input.h similarity index 100% rename from Multiprotocol/input.h rename to Multiprotocol/include/input.h diff --git a/Multiprotocol/pins.h b/Multiprotocol/include/pins.h similarity index 100% rename from Multiprotocol/pins.h rename to Multiprotocol/include/pins.h diff --git a/Multiprotocol/spi.h b/Multiprotocol/include/spi.h similarity index 100% rename from Multiprotocol/spi.h rename to Multiprotocol/include/spi.h diff --git a/Multiprotocol/state.h b/Multiprotocol/include/state.h similarity index 100% rename from Multiprotocol/state.h rename to Multiprotocol/include/state.h diff --git a/Multiprotocol/tx_def.h b/Multiprotocol/include/tx_def.h similarity index 100% rename from Multiprotocol/tx_def.h rename to Multiprotocol/include/tx_def.h diff --git a/Multiprotocol/platformio.ini b/Multiprotocol/platformio.ini new file mode 100644 index 0000000..5bdcc19 --- /dev/null +++ b/Multiprotocol/platformio.ini @@ -0,0 +1,18 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[platformio] +env_default = blackpill_f103c8 + +[env:blackpill_f103c8] +platform = ststm32 +board = blackpill_f103c8 +framework = arduino +lib_deps = LiquidCrystal_I2C diff --git a/Multiprotocol/FrSkyD_cc2500.cpp b/Multiprotocol/src/FrSkyD_cc2500.cpp similarity index 100% rename from Multiprotocol/FrSkyD_cc2500.cpp rename to Multiprotocol/src/FrSkyD_cc2500.cpp diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/src/Multiprotocol.cpp similarity index 98% rename from Multiprotocol/Multiprotocol.ino rename to Multiprotocol/src/Multiprotocol.cpp index af1e8c1..116e60d 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/src/Multiprotocol.cpp @@ -24,6 +24,7 @@ #define DEBUG_SERIAL // Only for STM32_BOARD compiled with Upload method "Serial"->usart1, "STM32duino bootloader"->USB serial +#include //adds types like unit_16_t #include "config.h" #include "tx_def.h" @@ -117,6 +118,12 @@ float TIMER_PRESCALE = 5.82; typedef uint16_t (*void_function_t) (void);//pointer to a function with no parameters which return an uint16_t integer void_function_t remote_callback = 0; +//forward declarations +void modules_reset(); +uint32_t random_id(bool create_new); +static void protocol_init(); +uint8_t Update_All(); + // Init void setup() { @@ -274,11 +281,11 @@ void loop() if (next_callback > 4000) { uint32_t s; - + s =micros(); input.update(); debugln("input took %lu", (micros()-s)); - + s =micros(); update_state(); debugln("state took %lu", (micros()-s)); @@ -298,7 +305,7 @@ void loop() } uint8_t Update_All() { - + #ifdef ENABLE_BIND_CH if(IS_AUTOBIND_FLAG_on && IS_BIND_CH_PREV_off && @@ -381,12 +388,12 @@ void update_serial_data() RANGE_FLAG_on; else RANGE_FLAG_off; - + if(rx_ok_buff[1]&0x40) //check autobind AUTOBIND_FLAG_on; else AUTOBIND_FLAG_off; - + if(rx_ok_buff[2]&0x80) //if rx_ok_buff[2] ==1,power is low ,0-power high POWER_FLAG_off; //power low else diff --git a/Multiprotocol/cc2500_spi.cpp b/Multiprotocol/src/cc2500_spi.cpp similarity index 100% rename from Multiprotocol/cc2500_spi.cpp rename to Multiprotocol/src/cc2500_spi.cpp diff --git a/Multiprotocol/common.cpp b/Multiprotocol/src/common.cpp similarity index 100% rename from Multiprotocol/common.cpp rename to Multiprotocol/src/common.cpp diff --git a/Multiprotocol/config.cpp b/Multiprotocol/src/config.cpp similarity index 100% rename from Multiprotocol/config.cpp rename to Multiprotocol/src/config.cpp diff --git a/Multiprotocol/input.cpp b/Multiprotocol/src/input.cpp similarity index 100% rename from Multiprotocol/input.cpp rename to Multiprotocol/src/input.cpp diff --git a/Multiprotocol/mi.ino b/Multiprotocol/src/mi.cpp similarity index 95% rename from Multiprotocol/mi.ino rename to Multiprotocol/src/mi.cpp index ffeb6f7..cd51893 100644 --- a/Multiprotocol/mi.ino +++ b/Multiprotocol/src/mi.cpp @@ -16,6 +16,8 @@ /************************************/ /** Arduino replacement routines **/ /************************************/ +#include //adds types like unit_16_t + // replacement map() int16_t map16b( int16_t x, int16_t in_min, int16_t in_max, int16_t out_min, int16_t out_max) { diff --git a/Multiprotocol/spi.cpp b/Multiprotocol/src/spi.cpp similarity index 100% rename from Multiprotocol/spi.cpp rename to Multiprotocol/src/spi.cpp diff --git a/Multiprotocol/state.cpp b/Multiprotocol/src/state.cpp similarity index 100% rename from Multiprotocol/state.cpp rename to Multiprotocol/src/state.cpp