From 9a4de77138861e45e424a204a08922718dad7605 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 12 Apr 2021 10:08:52 +0200 Subject: [PATCH 1/8] Update CREDITS.txt --- CREDITS.txt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 0daa8f9e01..6af50b1d58 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2225,3 +2225,9 @@ Radomir Sterba Ignacio Barrio Bradley Murchie Emmanuel Balintec +Rowell Torres +Christopher Kokis +Ken Bryan +Eric Yoder +Olav Roth +Rowell Torres From 0f65c3d4384f274a64e81e2fb667617204a950d1 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Mon, 12 Apr 2021 10:10:05 +0200 Subject: [PATCH 2/8] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index 6af50b1d58..f315beaa51 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2231,3 +2231,5 @@ Ken Bryan Eric Yoder Olav Roth Rowell Torres +Christopher Kokis +Ken Bryan From 451e8cff9bf54ddafa1d17cfab5bee4671abb981 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Apr 2021 09:52:23 +0200 Subject: [PATCH 3/8] Update CREDITS.txt --- CREDITS.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/CREDITS.txt b/CREDITS.txt index f315beaa51..2e3977a06d 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2233,3 +2233,5 @@ Olav Roth Rowell Torres Christopher Kokis Ken Bryan +Glenn Noonan +Michael Jakob From aa4c4615d428189a27b2392c9369c26e94e3530c Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Tue, 13 Apr 2021 20:12:47 +0200 Subject: [PATCH 4/8] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index 2e3977a06d..f2417bd3b3 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2235,3 +2235,4 @@ Christopher Kokis Ken Bryan Glenn Noonan Michael Jakob +Dean Berg From 8e851386596a1d63337c3939e07b627782deea8d Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Wed, 14 Apr 2021 09:57:01 +0200 Subject: [PATCH 5/8] Cosmetics --- radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp b/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp index 794c497656..e918f174a5 100755 --- a/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp +++ b/radio/src/targets/common/arm/stm32/intmodule_serial_driver.cpp @@ -169,7 +169,7 @@ void intmoduleSendBuffer(const uint8_t * data, uint8_t size) void intmoduleSendNextFrame() { - switch(moduleState[INTERNAL_MODULE].protocol) { + switch (moduleState[INTERNAL_MODULE].protocol) { #if defined(PXX2) case PROTOCOL_CHANNELS_PXX2_HIGHSPEED: intmoduleSendBuffer(intmodulePulsesData.pxx2.getData(), intmodulePulsesData.pxx2.getSize()); From 88c476af22a58f1978fa39acbe24fd024bb910cf Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 15 Apr 2021 08:40:17 +0200 Subject: [PATCH 6/8] Fix T8 testing --- tools/commit-tests.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/commit-tests.sh b/tools/commit-tests.sh index be5940308d..8ef5e85fba 100755 --- a/tools/commit-tests.sh +++ b/tools/commit-tests.sh @@ -142,7 +142,7 @@ fi if [[ " T8 X7 ALL " =~ \ ${FLAVOR}\ ]] ; then # OpenTX on T8 rm -rf ./* - cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=TX12 -DHELI=YES -DGVARS=YES "${SRCDIR}" + cmake "${COMMON_OPTIONS}" -DPCB=X7 -DPCBREV=T8 -DHELI=YES -DGVARS=YES "${SRCDIR}" make -j"${CORES}" ${FIRMARE_TARGET} make -j"${CORES}" libsimulator make -j"${CORES}" tests-radio From b1812ce90c1f98ea9bb386ce190a82193931183c Mon Sep 17 00:00:00 2001 From: 3djc Date: Thu, 15 Apr 2021 09:42:41 +0200 Subject: [PATCH 7/8] Fix T8 --- radio/src/io/frsky_firmware_update.cpp | 6 ++++++ radio/src/io/multi_firmware_update.cpp | 6 ++++++ radio/src/pulses/pulses.cpp | 4 ++++ radio/src/targets/taranis/CMakeLists.txt | 5 ++++- radio/src/tasks.cpp | 2 ++ 5 files changed, 22 insertions(+), 1 deletion(-) diff --git a/radio/src/io/frsky_firmware_update.cpp b/radio/src/io/frsky_firmware_update.cpp index eb1ab0df4b..b019cd21c9 100644 --- a/radio/src/io/frsky_firmware_update.cpp +++ b/radio/src/io/frsky_firmware_update.cpp @@ -484,8 +484,10 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename) INTERNAL_MODULE_OFF(); #endif +#if defined(HARDWARE_EXTERNAL_MODULE) uint8_t extPwr = IS_EXTERNAL_MODULE_ON(); EXTERNAL_MODULE_OFF(); +#endif uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON(); SPORT_UPDATE_POWER_OFF(); @@ -527,10 +529,12 @@ const char * FrskyDeviceFirmwareUpdate::flashFirmware(const char * filename) } #endif +#if defined(HARDWARE_EXTERNAL_MODULE) if (extPwr) { EXTERNAL_MODULE_ON(); setupPulsesExternalModule(); } +#endif if (spuPwr) { SPORT_UPDATE_POWER_ON(); @@ -792,10 +796,12 @@ const char * FrskyChipFirmwareUpdate::flashFirmware(const char * filename, bool } #endif +#if defined(HARDWARE_EXTERNAL_MODULE) if (extPwr) { EXTERNAL_MODULE_ON(); setupPulsesExternalModule(); } +#endif if (spuPwr) { SPORT_UPDATE_POWER_ON(); diff --git a/radio/src/io/multi_firmware_update.cpp b/radio/src/io/multi_firmware_update.cpp index 2a6e5f149f..125ef900f3 100644 --- a/radio/src/io/multi_firmware_update.cpp +++ b/radio/src/io/multi_firmware_update.cpp @@ -128,7 +128,9 @@ class MultiExternalUpdateDriver: public MultiFirmwareUpdateDriver void sendByte(uint8_t byte) const override { +#if defined(HARDWARE_EXTERNAL_MODULE) extmoduleSendInvertedByte(byte); +#endif } void clear() const override @@ -589,8 +591,10 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename, MultiModuleTyp INTERNAL_MODULE_OFF(); #endif +#if defined(HARDWARE_EXTERNAL_MODULE) uint8_t extPwr = IS_EXTERNAL_MODULE_ON(); EXTERNAL_MODULE_OFF(); +#endif uint8_t spuPwr = IS_SPORT_UPDATE_POWER_ON(); SPORT_UPDATE_POWER_OFF(); @@ -635,10 +639,12 @@ bool multiFlashFirmware(uint8_t moduleIdx, const char * filename, MultiModuleTyp } #endif +#if defined(HARDWARE_EXTERNAL_MODULE) if (extPwr) { EXTERNAL_MODULE_ON(); setupPulsesExternalModule(); } +#endif if (spuPwr) { SPORT_UPDATE_POWER_ON(); diff --git a/radio/src/pulses/pulses.cpp b/radio/src/pulses/pulses.cpp index 128e11976e..7c034a06f3 100755 --- a/radio/src/pulses/pulses.cpp +++ b/radio/src/pulses/pulses.cpp @@ -218,6 +218,7 @@ uint8_t getRequiredProtocol(uint8_t module) return protocol; } +#if defined(HARDWARE_EXTERNAL_MODULE) void enablePulsesExternalModule(uint8_t protocol) { // start new protocol hardware here @@ -444,6 +445,7 @@ bool setupPulsesExternalModule(uint8_t protocol) return false; } } +#endif #if defined(HARDWARE_INTERNAL_MODULE) static void enablePulsesInternalModule(uint8_t protocol) @@ -601,6 +603,7 @@ bool setupPulsesInternalModule() } #endif +#if defined(HARDWARE_EXTERNAL_MODULE) void stopPulsesExternalModule() { if (moduleState[EXTERNAL_MODULE].protocol != PROTOCOL_CHANNELS_UNINITIALIZED) { @@ -625,6 +628,7 @@ bool setupPulsesExternalModule() return setupPulsesExternalModule(protocol); } } +#endif void setCustomFailsafe(uint8_t moduleIndex) { diff --git a/radio/src/targets/taranis/CMakeLists.txt b/radio/src/targets/taranis/CMakeLists.txt index 162dc5c38b..c292250e14 100644 --- a/radio/src/targets/taranis/CMakeLists.txt +++ b/radio/src/targets/taranis/CMakeLists.txt @@ -444,7 +444,6 @@ set(TARGET_SRC ${TARGET_SRC} ${LED_DRIVER} backlight_driver.cpp - extmodule_driver.cpp trainer_driver.cpp ../common/arm/stm32/timers_driver.cpp ../common/arm/stm32/audio_dac_driver.cpp @@ -499,6 +498,10 @@ if(INTERNAL_MODULE_PPM) endif() if(EXTERNAL_MODULE) + set(TARGET_SRC + ${TARGET_SRC} + extmodule_driver.cpp + ) add_definitions(-DHARDWARE_EXTERNAL_MODULE) endif() diff --git a/radio/src/tasks.cpp b/radio/src/tasks.cpp index a051cc5098..f44e1cb168 100644 --- a/radio/src/tasks.cpp +++ b/radio/src/tasks.cpp @@ -102,10 +102,12 @@ void sendSynchronousPulses(uint8_t runMask) } #endif +#if defined(HARDWARE_EXTERNAL_MODULE) if ((runMask & (1 << EXTERNAL_MODULE)) && isModuleSynchronous(EXTERNAL_MODULE)) { if (setupPulsesExternalModule()) extmoduleSendNextFrame(); } +#endif } uint32_t nextMixerTime[NUM_MODULES]; From af0a10ec1284a323291c5d649d7f6eeb34739f02 Mon Sep 17 00:00:00 2001 From: Bertrand Songis Date: Thu, 15 Apr 2021 10:33:48 +0200 Subject: [PATCH 8/8] Update CREDITS.txt --- CREDITS.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/CREDITS.txt b/CREDITS.txt index f2417bd3b3..3b31f56046 100644 --- a/CREDITS.txt +++ b/CREDITS.txt @@ -2236,3 +2236,4 @@ Ken Bryan Glenn Noonan Michael Jakob Dean Berg +David Hankins