gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-02-04 18:48:11 +00:00
Code Issues Projects Releases Wiki Activity

DSM2 renamed to DSM

Browse Source
This commit is contained in:
pascallanger 2016-09-01 14:00:42 +02:00
parent 6e59897587
commit e51615f520
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Multiprotocol/DSM2_cyrf6936.ino → Multiprotocol/DSM_cyrf6936.ino
View File

@ -13,7 +13,7 @@
along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>. along with Multiprotocol. If not, see <http://www.gnu.org/licenses/>.
*/ */
#if defined(DSM2_CYRF6936_INO) #if defined(DSM_CYRF6936_INO)
#include "iface_cyrf6936.h" #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_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 #define DSM_WRITE_DELAY 1550 // Time after write to verify write complete
@ -536,7 +536,7 @@ uint16_t ReadDsm2()
return 0; return 0;
} }
uint16_t initDsm2() uint16_t initDsm()
{ {
CYRF_Reset(); CYRF_Reset();
CYRF_GetMfgData(cyrfmfg_id);// CYRF_GetMfgData(cyrfmfg_id);//

1
Multiprotocol/FrSky1_cc2500.ino
View File

@ -92,6 +92,7 @@ static uint8_t __attribute__((unused)) FRSKY1_crc8_le(uint8_t init, uint8_t *dat
else else
result = result >> 1; result = result >> 1;
} }
return result;
} }
static void __attribute__((unused)) FRSKY1_build_bind_packet() static void __attribute__((unused)) FRSKY1_build_bind_packet()

10
Multiprotocol/Multiprotocol.h
View File

@ -34,7 +34,7 @@ enum PROTOCOLS
MODE_FRSKY = 3, // =>CC2500 MODE_FRSKY = 3, // =>CC2500
MODE_HISKY = 4, // =>NRF24L01 MODE_HISKY = 4, // =>NRF24L01
MODE_V2X2 = 5, // =>NRF24L01 MODE_V2X2 = 5, // =>NRF24L01
MODE_DSM2 = 6, // =>CYRF6936 MODE_DSM = 6, // =>CYRF6936
MODE_DEVO = 7, // =>CYRF6936 MODE_DEVO = 7, // =>CYRF6936
MODE_YD717 = 8, // =>NRF24L01 MODE_YD717 = 8, // =>NRF24L01
MODE_KN = 9, // =>NRF24L01 MODE_KN = 9, // =>NRF24L01
@ -68,7 +68,7 @@ enum Hisky
Hisky = 0, Hisky = 0,
HK310 = 1 HK310 = 1
}; };
enum DSM2 enum DSM
{ {
DSM2 = 0, DSM2 = 0,
DSMX = 1 DSMX = 1
@ -460,7 +460,7 @@ enum CYRF_POWER
#define CYRF_HIGH_POWER CYRF_POWER_7 #define CYRF_HIGH_POWER CYRF_POWER_7
#define CYRF_LOW_POWER CYRF_POWER_3 #define CYRF_LOW_POWER CYRF_POWER_3
#define CYRF_RANGE_POWER CYRF_POWER_1 // 1/30 of the full power distance #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 { enum TXRX_State {
TXRX_OFF, TXRX_OFF,
@ -498,7 +498,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
Frsky 3 Frsky 3
Hisky 4 Hisky 4
V2x2 5 V2x2 5
DSM2 6 DSM 6
Devo 7 Devo 7
YD717 8 YD717 8
KN 9 KN 9
@ -532,7 +532,7 @@ Serial: 100000 Baud 8e2 _ xxxx xxxx p --
sub_protocol==Hisky sub_protocol==Hisky
Hisky 0 Hisky 0
HK310 1 HK310 1
sub_protocol==DSM2 sub_protocol==DSM
DSM2 0 DSM2 0
DSMX 1 DSMX 1
sub_protocol==YD717 sub_protocol==YD717

10
Multiprotocol/Multiprotocol.ino
View File

@ -386,7 +386,7 @@ TX_OFF;
update_led_status(); update_led_status();
#if defined(TELEMETRY) #if defined(TELEMETRY)
uint8_t protocol=cur_protocol[0]&0x1F; 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(); TelemetryUpdate();
#endif #endif
TX_ON; TX_ON;
@ -529,12 +529,12 @@ static void protocol_init()
remote_callback = ReadSFHSS; remote_callback = ReadSFHSS;
break; break;
#endif #endif
#if defined(DSM2_CYRF6936_INO) #if defined(DSM_CYRF6936_INO)
case MODE_DSM2: case MODE_DSM:
CTRL2_on; //antenna RF4 CTRL2_on; //antenna RF4
next_callback = initDsm2(); next_callback = initDsm();
//Servo_data[2]=1500;//before binding //Servo_data[2]=1500;//before binding
remote_callback = ReadDsm2; remote_callback = ReadDsm;
break; break;
#endif #endif
#if defined(DEVO_CYRF6936_INO) #if defined(DEVO_CYRF6936_INO)

8
Multiprotocol/Telemetry.ino
View File

@ -42,7 +42,7 @@ struct t_serial_bash
#endif #endif
#if defined DSM_TELEMETRY #if defined DSM_TELEMETRY
void DSM2_frame() void DSM_frame()
{ {
Serial_write(0xAA); // Start Serial_write(0xAA); // Start
for (uint8_t i = 0; i < 17; i++) // RSSI value followed by 16 bytes of telemetry data for (uint8_t i = 0; i < 17; i++) // RSSI value followed by 16 bytes of telemetry data
@ -452,9 +452,9 @@ void TelemetryUpdate()
#endif #endif
#if defined DSM_TELEMETRY #if defined DSM_TELEMETRY
if(telemetry_link && (cur_protocol[0]&0x1F) == MODE_DSM2 ) if(telemetry_link && (cur_protocol[0]&0x1F) == MODE_DSM )
{ // DSM2 { // DSM
DSM2_frame(); DSM_frame();
telemetry_link=0; telemetry_link=0;
return; return;
} }

8
Multiprotocol/_Config.h
View File

@ -45,7 +45,7 @@
#endif #endif
#ifdef CYRF6936_INSTALLED #ifdef CYRF6936_INSTALLED
#define DEVO_CYRF6936_INO #define DEVO_CYRF6936_INO
#define DSM2_CYRF6936_INO #define DSM_CYRF6936_INO
#define J6PRO_CYRF6936_INO #define J6PRO_CYRF6936_INO
#endif #endif
#ifdef CC2500_INSTALLED #ifdef CC2500_INSTALLED
@ -88,7 +88,7 @@
//Comment a line to disable a protocol telemetry //Comment a line to disable a protocol telemetry
#if defined(TELEMETRY) #if defined(TELEMETRY)
#if defined DSM2_CYRF6936_INO #if defined DSM_CYRF6936_INO
#define DSM_TELEMETRY #define DSM_TELEMETRY
#endif #endif
#if defined FRSKYX_CC2500_INO #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 /* 3 */ {MODE_FRSKY , 0 , 0 , P_HIGH , NO_AUTOBIND , 40 }, // option=fine freq tuning
/* 4 */ {MODE_HISKY , Hisky , 0 , P_HIGH , NO_AUTOBIND , 0 }, /* 4 */ {MODE_HISKY , Hisky , 0 , P_HIGH , NO_AUTOBIND , 0 },
/* 5 */ {MODE_V2X2 , 0 , 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 }, /* 7 */ {MODE_DEVO , 0 , 0 , P_HIGH , NO_AUTOBIND , 0 },
/* 8 */ {MODE_YD717 , YD717 , 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 }, /* 9 */ {MODE_KN , WLTOYS , 0 , P_HIGH , NO_AUTOBIND , 0 },
@ -177,7 +177,7 @@ const PPM_Parameters PPM_prot[15]= {
HK310 HK310
MODE_V2X2 MODE_V2X2
NONE NONE
MODE_DSM2 MODE_DSM
DSM2 DSM2
DSMX DSMX
MODE_DEVO MODE_DEVO