From e51615f520b28dee5c286055b992bf20b9f56228 Mon Sep 17 00:00:00 2001 From: pascallanger Date: Thu, 1 Sep 2016 14:00:42 +0200 Subject: [PATCH] DSM2 renamed to DSM --- Multiprotocol/{DSM2_cyrf6936.ino => DSM_cyrf6936.ino} | 6 +++--- Multiprotocol/FrSky1_cc2500.ino | 1 + Multiprotocol/Multiprotocol.h | 10 +++++----- Multiprotocol/Multiprotocol.ino | 10 +++++----- Multiprotocol/Telemetry.ino | 8 ++++---- Multiprotocol/_Config.h | 8 ++++---- 6 files changed, 22 insertions(+), 21 deletions(-) rename Multiprotocol/{DSM2_cyrf6936.ino => DSM_cyrf6936.ino} (99%) diff --git a/Multiprotocol/DSM2_cyrf6936.ino b/Multiprotocol/DSM_cyrf6936.ino similarity index 99% rename from Multiprotocol/DSM2_cyrf6936.ino rename to Multiprotocol/DSM_cyrf6936.ino index 85f8029..f1c213e 100644 --- a/Multiprotocol/DSM2_cyrf6936.ino +++ b/Multiprotocol/DSM_cyrf6936.ino @@ -13,7 +13,7 @@ along with Multiprotocol. If not, see . */ -#if defined(DSM2_CYRF6936_INO) +#if defined(DSM_CYRF6936_INO) #include "iface_cyrf6936.h" @@ -408,7 +408,7 @@ static void __attribute__((unused)) calc_dsmx_channel() } } -uint16_t ReadDsm2() +uint16_t ReadDsm() { #define DSM_CH1_CH2_DELAY 4010 // Time between write of channel 1 and channel 2 #define DSM_WRITE_DELAY 1550 // Time after write to verify write complete @@ -536,7 +536,7 @@ uint16_t ReadDsm2() return 0; } -uint16_t initDsm2() +uint16_t initDsm() { CYRF_Reset(); CYRF_GetMfgData(cyrfmfg_id);// diff --git a/Multiprotocol/FrSky1_cc2500.ino b/Multiprotocol/FrSky1_cc2500.ino index 53d056c..ac6558d 100644 --- a/Multiprotocol/FrSky1_cc2500.ino +++ b/Multiprotocol/FrSky1_cc2500.ino @@ -92,6 +92,7 @@ static uint8_t __attribute__((unused)) FRSKY1_crc8_le(uint8_t init, uint8_t *dat else result = result >> 1; } + return result; } static void __attribute__((unused)) FRSKY1_build_bind_packet() diff --git a/Multiprotocol/Multiprotocol.h b/Multiprotocol/Multiprotocol.h index f4eccd3..a4e0941 100644 --- a/Multiprotocol/Multiprotocol.h +++ b/Multiprotocol/Multiprotocol.h @@ -34,7 +34,7 @@ enum PROTOCOLS MODE_FRSKY = 3, // =>CC2500 MODE_HISKY = 4, // =>NRF24L01 MODE_V2X2 = 5, // =>NRF24L01 - MODE_DSM2 = 6, // =>CYRF6936 + MODE_DSM = 6, // =>CYRF6936 MODE_DEVO = 7, // =>CYRF6936 MODE_YD717 = 8, // =>NRF24L01 MODE_KN = 9, // =>NRF24L01 @@ -68,7 +68,7 @@ enum Hisky Hisky = 0, HK310 = 1 }; -enum DSM2 +enum DSM { DSM2 = 0, DSMX = 1 @@ -460,7 +460,7 @@ enum CYRF_POWER #define CYRF_HIGH_POWER CYRF_POWER_7 #define CYRF_LOW_POWER CYRF_POWER_3 #define CYRF_RANGE_POWER CYRF_POWER_1 // 1/30 of the full power distance -#define CYRF_BIND_POWER CYRF_POWER_1 +#define CYRF_BIND_POWER CYRF_POWER_0 enum TXRX_State { TXRX_OFF, @@ -498,7 +498,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- Frsky 3 Hisky 4 V2x2 5 - DSM2 6 + DSM 6 Devo 7 YD717 8 KN 9 @@ -532,7 +532,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p -- sub_protocol==Hisky Hisky 0 HK310 1 - sub_protocol==DSM2 + sub_protocol==DSM DSM2 0 DSMX 1 sub_protocol==YD717 diff --git a/Multiprotocol/Multiprotocol.ino b/Multiprotocol/Multiprotocol.ino index e8b72fa..5f15ad0 100644 --- a/Multiprotocol/Multiprotocol.ino +++ b/Multiprotocol/Multiprotocol.ino @@ -386,7 +386,7 @@ TX_OFF; update_led_status(); #if defined(TELEMETRY) uint8_t protocol=cur_protocol[0]&0x1F; - if( (protocol==MODE_FRSKY) || (protocol==MODE_HUBSAN) || (protocol==MODE_FRSKYX) || (protocol==MODE_DSM2) ) + if( (protocol==MODE_FRSKY) || (protocol==MODE_HUBSAN) || (protocol==MODE_FRSKYX) || (protocol==MODE_DSM) ) TelemetryUpdate(); #endif TX_ON; @@ -529,12 +529,12 @@ static void protocol_init() remote_callback = ReadSFHSS; break; #endif -#if defined(DSM2_CYRF6936_INO) - case MODE_DSM2: +#if defined(DSM_CYRF6936_INO) + case MODE_DSM: CTRL2_on; //antenna RF4 - next_callback = initDsm2(); + next_callback = initDsm(); //Servo_data[2]=1500;//before binding - remote_callback = ReadDsm2; + remote_callback = ReadDsm; break; #endif #if defined(DEVO_CYRF6936_INO) diff --git a/Multiprotocol/Telemetry.ino b/Multiprotocol/Telemetry.ino index 74a892c..f6ba047 100644 --- a/Multiprotocol/Telemetry.ino +++ b/Multiprotocol/Telemetry.ino @@ -42,7 +42,7 @@ struct t_serial_bash #endif #if defined DSM_TELEMETRY -void DSM2_frame() +void DSM_frame() { Serial_write(0xAA); // Start for (uint8_t i = 0; i < 17; i++) // RSSI value followed by 16 bytes of telemetry data @@ -452,9 +452,9 @@ void TelemetryUpdate() #endif #if defined DSM_TELEMETRY - if(telemetry_link && (cur_protocol[0]&0x1F) == MODE_DSM2 ) - { // DSM2 - DSM2_frame(); + if(telemetry_link && (cur_protocol[0]&0x1F) == MODE_DSM ) + { // DSM + DSM_frame(); telemetry_link=0; return; } diff --git a/Multiprotocol/_Config.h b/Multiprotocol/_Config.h index f54e086..878128a 100644 --- a/Multiprotocol/_Config.h +++ b/Multiprotocol/_Config.h @@ -45,7 +45,7 @@ #endif #ifdef CYRF6936_INSTALLED #define DEVO_CYRF6936_INO - #define DSM2_CYRF6936_INO + #define DSM_CYRF6936_INO #define J6PRO_CYRF6936_INO #endif #ifdef CC2500_INSTALLED @@ -88,7 +88,7 @@ //Comment a line to disable a protocol telemetry #if defined(TELEMETRY) - #if defined DSM2_CYRF6936_INO + #if defined DSM_CYRF6936_INO #define DSM_TELEMETRY #endif #if defined FRSKYX_CC2500_INO @@ -151,7 +151,7 @@ const PPM_Parameters PPM_prot[15]= { /* 3 */ {MODE_FRSKY , 0 , 0 , P_HIGH , NO_AUTOBIND , 40 }, // option=fine freq tuning /* 4 */ {MODE_HISKY , Hisky , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 5 */ {MODE_V2X2 , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, -/* 6 */ {MODE_DSM2 , DSM2 , 0 , P_HIGH , NO_AUTOBIND , 2 }, // option=2=6 channels @ 22ms +/* 6 */ {MODE_DSM , DSM2 , 0 , P_HIGH , NO_AUTOBIND , 2 }, // option=2=6 channels @ 22ms /* 7 */ {MODE_DEVO , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 8 */ {MODE_YD717 , YD717 , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 9 */ {MODE_KN , WLTOYS , 0 , P_HIGH , NO_AUTOBIND , 0 }, @@ -177,7 +177,7 @@ const PPM_Parameters PPM_prot[15]= { HK310 MODE_V2X2 NONE - MODE_DSM2 + MODE_DSM DSM2 DSMX MODE_DEVO