From ddd2150d8ef6b3a9f356187c71e21ae09b7cdf88 Mon Sep 17 00:00:00 2001 From: tipouic Date: Thu, 1 Dec 2016 20:57:11 +0100 Subject: [PATCH] correction bug --- Multiprotocol/DSM_cyrf6936.ino | 4 ---- Multiprotocol/Devo_cyrf6936.ino | 2 +- Multiprotocol/Multiprotocol.ino | 11 ----------- Multiprotocol/Validate.h | 19 +++++++++++++++++++ Multiprotocol/boards.txt | 2 +- Multiprotocol/sync.ffs_db | Bin 1113 -> 1116 bytes 6 files changed, 21 insertions(+), 17 deletions(-) diff --git a/Multiprotocol/DSM_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino index d80cf6e..acc4331 100644 --- a/Multiprotocol/DSM_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -411,9 +411,7 @@ uint16_t ReadDsm() if(len==10 && DSM_Check_RX_packet()) { pkt[0]=0x80; -#if defined(TELEMETRY) telemetry_link=1; // send received data on serial -#endif phase++; return 2000; } @@ -495,9 +493,7 @@ uint16_t ReadDsm() len=MAX_PKT-2; CYRF_ReadDataPacketLen(pkt+1, len); pkt[0]=CYRF_ReadRegister(CYRF_13_RSSI)&0x1F;// store RSSI of the received telemetry signal -#if defined(TELEMETRY) telemetry_link=1; -#endif } CYRF_WriteRegister(CYRF_29_RX_ABORT, 0x20); // Abort RX operation if (phase == DSM_CH2_READ_A && (sub_protocol==DSM2_22 || sub_protocol==DSMX_22) && DSM_num_ch < 8) // 22ms mode diff --git a/Multiprotocol/Devo_cyrf6936.ino b/Multiprotocol/Devo_cyrf6936.ino index e210c5a..885e6c0 100644 --- a/Multiprotocol/Devo_cyrf6936.ino +++ b/Multiprotocol/Devo_cyrf6936.ino @@ -13,7 +13,7 @@ along with Multiprotocol. If not, see . */ -#if defined(DEVO_CYRF6936_INO) && defined(CYRF6936_INSTALLED) +#if defined(DEVO_CYRF6936_INO) #include "iface_cyrf6936.h" diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index 1727a1e..27b0286 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -31,17 +31,6 @@ #include "TX_Def.h" #include "Validate.h" -#ifdef ENABLE_NUNCHUCK - #undef ENABLE_SERIAL - #undef ENABLE_PPM - - #undef TELEMETRY - - #undef CYRF6936_INSTALLED - #undef CC2500_INSTALLED - #undef NRF24L01_INSTALLED - -#endif #ifndef STM32_BOARD #include diff --git a/Multiprotocol/Validate.h b/Multiprotocol/Validate.h index 277d5b1..e92d6f1 100644 --- a/Multiprotocol/Validate.h +++ b/Multiprotocol/Validate.h @@ -18,6 +18,25 @@ #endif #endif +#ifdef ENABLE_NUNCHUCK + #if not defined(ARDUINO_AVR_PRO) && not defined(ARDUINO_AVR_MINI) && not defined(ARDUINO_AVR_NANO) + #error You must select one of these boards: "Multi 4-in-1", "Arduino Pro or Pro Mini" or "Arduino Mini" + #endif + #if F_CPU != 16000000L || not defined(__AVR_ATmega328P__) + #error You must select the processor type "ATmega328(5V, 16MHz)" + #endif + + #undef ENABLE_SERIAL + #undef ENABLE_PPM + + #undef TELEMETRY + + #undef CYRF6936_INSTALLED + #undef CC2500_INSTALLED + #undef NRF24L01_INSTALLED + +#endif + //Change/Force configuration if OrangeTX #ifdef ORANGE_TX #undef ENABLE_PPM // Disable PPM for OrangeTX module diff --git a/Multiprotocol/boards.txt b/Multiprotocol/boards.txt index 70dc5a6..c82a744 100644 --- a/Multiprotocol/boards.txt +++ b/Multiprotocol/boards.txt @@ -856,7 +856,7 @@ multi.bootloader.lock_bits=0x0F multi.build.board=AVR_PRO multi.build.core=arduino multi.build.variant=eightanaloginputs - +## -------------------------------------------------- multi.menu.cpu.16MHzatmega328=ATmega328 (3.3V, 16 MHz) multi.menu.cpu.16MHzatmega328.upload.maximum_size=32768 diff --git a/Multiprotocol/sync.ffs_db b/Multiprotocol/sync.ffs_db index 827f5beec3378d5d150ec294e1e72e41cd3ef148..b1813b47423348dfb15ac5e0334e5c2bf9d1a2dd 100644 GIT binary patch delta 1106 zcmV-Y1g-no2;2ye8Glt;TL{CaORkydqGkI#{{Aln000620002+0RR910001+Fal&j z%Q29yHxO6|QFel>*+n?**ReIcZh7X|DtH-_xz%p=g3~VdY0k0Z%4W z6l&_nbBPTllZXR<_J9$f!5jQ?G}fFDTTXO8|I3>jjEy*^<=9xLd^-FM6-;_KI}^>& z0K)lxBNc1S$$!RUcIdCT+KAHA^7&{E4>H0;CB4CUEy}W$-&k;hk%aA{4Iy#w$~Poj ztmYz#&wMiz64$kiCL|tlKi~ixtqOfmlDA^(B1=JW;c3{lMf^V%hHoQZ({_jKs6Oz~ zh0$v^>xN!#)ym?jdC5obX9Bj$v!!}jVK0ov9f4eWrGKjHQ}@m)-wc$jSIdp1n$)m` z#9-XP%+EL~C;wKD_EF;J6k`ZU2TH-BSsiUAL&D{)lxnyKLscGV**ASTXq z2O2>UT@-OB2-2!3h*XP1)Hoy>Q>TdT+__K$2XvtuK@cfuZBZfMwptZOYQ#3!O0nuf z-7Cd~;;`yMw76*A^$4CDULX)Y4(FbG?w^0=dw*)92z;!8@9kCI!I;w&_+=3pSp~%7 zGj(nio15{(KSKYjStI@lJS6ng^VB~lUH37G5_b;iSE?R(^UhoLsn)qBUY11>pMZZ; z@-_Ld!l!HCjJRLwW5nlzXXLXbd8F9#@V$P(|4%F5>!;*l!sq9HI%G~$kbi9DL;jSd z9)HU7CQon0EOy@KQ=UDSt`Fvil3Rq@XCe9=QSx*m&s>d<&b2|WCGHY0GT_DFH?JZn z=a9TtnDD;f{zq}&*_#vc9|OHL^u^Lg6AktR^0$Ml{g+B^7JrWWbMh$zSLdx9{BOr|@~<$^I}ErJd?<$h zUu&3u>u@glccZucHlDX0@XNMB(qG7V3kiDPDx4da!td?^*OHi5gR67mHsJ5Ti#&JK zXAOAedNk#%1wTsVbL+tU2brY*ihdl&ya(zH@-%>}`^O`Bs0cUn-dKO!V+-7WFH3q> z=f{aTRQVV9OlI+(^ns6FbN)GS)yD<@%| zJ_>N?E8U_f* zg_`>QMq)$BB;vq-{euyp!R!2TG&Y?7e~ zH5WEYk-ic`G*OSPF^@Ps5Ha;(seM{4n_%wmV=)^^T7& zj9#NrGxSokS`tsq3qE>Z6R=sDFV;#5dto&02;|bs6@OiyxOdk1W}sxfQmU_1rG}kN z45q%+lJE!o+W8VB;)nTS;&IhSeI!qUxDkNZ!Vd1^z>k{ht{^58bs0TnJh=a4%PeQxm!iz#W=0& zNB=6X2j9FoLG`uLqltF^Rr346)%@!vw||Jh*#UVPz}0zZ1V8GzO#UX5`hW=!f)C~K z{rZ6Ux4pbe{-?-otGk+b9DGg5`5Cx+zG1BEa`U-Iz_mi=&ETphYQkgSHTqx5vjse~ z>ZJbfgYSBH-B$3_b}7|=L_UF^{0_94^wSQmzCXI;St7^6@5Uf zb2SamSQ)>QN$}xA?tcbc^+ez={=}X&)GwXhpnPV*ryM23=l<<0#`j_#T%Gd;lYSP# V6Uw~xBOlj8p64ahp95w1c`i&UG06Y`