gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2026-01-02 03:53:15 +00:00
Code Issues Projects Releases Wiki Activity

Switch all protocols to use a resolution of 2048

Browse Source 
- Change how PPM is handled with a resolution of 2048 and scaled to match serial input range. PPM is now fully scaled for all protocols which was not the case before. If you are using PPM, you might have to adjust the end points depending on the protocols.
 - Change all range conversions to use 2048 where possible
 - Updated all protocols with new range functions
 - Protocols which are taking advantage of 2048 are Assan, FrSky V/D/X, DSM, Devo, WK2x01
 - Renamed AUX xto CHx for code readbility
This commit is contained in:
Pascal Langer
2018-01-08 19:37:14 +01:00
parent 11287cb9c0
commit 984aa3f413
39 changed files with 462 additions and 506 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
Multiprotocol/ESky150_nrf24l01.ino
View File

@@ -84,19 +84,19 @@ static void __attribute__((unused)) ESKY150_bind_init()
static void __attribute__((unused)) ESKY150_send_packet()
{
// Build packet
uint16_t throttle=convert_channel_16b(THROTTLE,1000,2000);
uint16_t aileron=convert_channel_16b(AILERON,1000,2000);
uint16_t elevator=convert_channel_16b(ELEVATOR,1000,2000);
uint16_t rudder=convert_channel_16b(RUDDER,1000,2000);
uint16_t throttle=convert_channel_16b_limit(THROTTLE,1000,2000);
uint16_t aileron=convert_channel_16b_limit(AILERON,1000,2000);
uint16_t elevator=convert_channel_16b_limit(ELEVATOR,1000,2000);
uint16_t rudder=convert_channel_16b_limit(RUDDER,1000,2000);
//set unused channels to zero, for compatibility with older 4 channel models
uint8_t flight_mode=0;
uint16_t aux_ch6=0;
uint8_t aux_ch7=0;
if(option==1)
{
flight_mode=ESKY150_convert_2bit_channel(AUX1);
aux_ch6=convert_channel_16b(AUX2,1000,2000);
aux_ch7=ESKY150_convert_2bit_channel(AUX3);
flight_mode=ESKY150_convert_2bit_channel(CH5);
aux_ch6=convert_channel_16b_limit(CH6,1000,2000);
aux_ch7=ESKY150_convert_2bit_channel(CH7);
}
packet[0] = hopping_frequency[0];
packet[1] = hopping_frequency[1];
@@ -137,13 +137,13 @@ static void __attribute__((unused)) ESKY150_send_packet()
uint8_t ESKY150_convert_2bit_channel(uint8_t num)
{
if(Servo_data[num] > PPM_MAX_COMMAND)
if(Channel_data[num] > CHANNEL_MAX_COMMAND)
return 0x03;
else
if(Servo_data[num] < PPM_MIN_COMMAND)
if(Channel_data[num] < CHANNEL_MIN_COMMAND)
return 0x00;
else
if(Servo_data[num] > PPM_SWITCH)
if(Channel_data[num] > CHANNEL_SWITCH)
return 0x02;
return 0x01;
}