mirror of
https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git
synced 2025-02-04 21:58:10 +00:00
Update DSM_cyrf6936.ino
This commit is contained in:
parent
1b9ce32e89
commit
26b0b6bd20
@ -21,8 +21,8 @@
|
|||||||
//#define DEBUG_BIND 1
|
//#define DEBUG_BIND 1
|
||||||
|
|
||||||
#define CLONE_BIT_MASK 0x20
|
#define CLONE_BIT_MASK 0x20
|
||||||
|
#define DSM_BIND_CHANNEL 0x0D //13 This can be any odd channel
|
||||||
#define DSM_BIND_CHANNEL 0x0d //13 This can be any odd channel
|
#define DSM2_SFC_PERIOD 16500
|
||||||
|
|
||||||
//During binding we will send BIND_COUNT packets
|
//During binding we will send BIND_COUNT packets
|
||||||
//One packet each 10msec
|
//One packet each 10msec
|
||||||
@ -387,7 +387,7 @@ uint16_t DSM_callback()
|
|||||||
if(sub_protocol!=DSM2_SFC)
|
if(sub_protocol!=DSM2_SFC)
|
||||||
telemetry_set_input_sync(11000); // Always request 11ms spacing even if we don't use half of it in 22ms mode
|
telemetry_set_input_sync(11000); // Always request 11ms spacing even if we don't use half of it in 22ms mode
|
||||||
else
|
else
|
||||||
telemetry_set_input_sync(6500);
|
telemetry_set_input_sync(DSM2_SFC_PERIOD);
|
||||||
#endif
|
#endif
|
||||||
#ifndef MULTI_AIR
|
#ifndef MULTI_AIR
|
||||||
if(sub_protocol == DSMR)
|
if(sub_protocol == DSMR)
|
||||||
@ -444,7 +444,7 @@ uint16_t DSM_callback()
|
|||||||
return 11000 - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
return 11000 - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
||||||
}
|
}
|
||||||
if(sub_protocol==DSM2_SFC)
|
if(sub_protocol==DSM2_SFC)
|
||||||
return 6500 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
||||||
#endif
|
#endif
|
||||||
return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY - DSM_READ_DELAY;
|
||||||
case DSM_CH2_READ_A:
|
case DSM_CH2_READ_A:
|
||||||
@ -481,7 +481,7 @@ uint16_t DSM_callback()
|
|||||||
phase = DSM_CH2_READ_B;
|
phase = DSM_CH2_READ_B;
|
||||||
#ifndef MULTI_AIR
|
#ifndef MULTI_AIR
|
||||||
if(sub_protocol==DSM2_SFC)
|
if(sub_protocol==DSM2_SFC)
|
||||||
return 6500;
|
return DSM2_SFC_PERIOD;
|
||||||
#endif
|
#endif
|
||||||
return 11000;
|
return 11000;
|
||||||
}
|
}
|
||||||
@ -505,7 +505,7 @@ uint16_t DSM_callback()
|
|||||||
phase = DSM_CH1_WRITE_A; // change from CH2_CHECK_A to CH1_WRITE_A (ie no upper)
|
phase = DSM_CH1_WRITE_A; // change from CH2_CHECK_A to CH1_WRITE_A (ie no upper)
|
||||||
#ifndef MULTI_AIR
|
#ifndef MULTI_AIR
|
||||||
if(sub_protocol==DSM2_SFC)
|
if(sub_protocol==DSM2_SFC)
|
||||||
return 6500 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
||||||
#endif
|
#endif
|
||||||
return 22000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
return 22000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
||||||
}
|
}
|
||||||
@ -514,7 +514,7 @@ uint16_t DSM_callback()
|
|||||||
phase = DSM_CH1_WRITE_A; // change from CH2_CHECK_B to CH1_WRITE_A (upper already transmitted so transmit lower)
|
phase = DSM_CH1_WRITE_A; // change from CH2_CHECK_B to CH1_WRITE_A (upper already transmitted so transmit lower)
|
||||||
#ifndef MULTI_AIR
|
#ifndef MULTI_AIR
|
||||||
if(sub_protocol==DSM2_SFC)
|
if(sub_protocol==DSM2_SFC)
|
||||||
return 6500 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
return DSM2_SFC_PERIOD - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY ;
|
||||||
#endif
|
#endif
|
||||||
return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY;
|
return 11000 - DSM_CH1_CH2_DELAY - DSM_WRITE_DELAY;
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
x
Reference in New Issue
Block a user