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

Kyosho updqte

Browse Source 
fixed crash
This commit is contained in:
pascallanger 2024-01-30 12:06:37 +01:00
parent 2888d3e937
commit 8ac53657ec
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Multiprotocol/A7105_SPI.ino
View File

@ -418,10 +418,10 @@ void A7105_Init(void)
#ifdef KYOSHO_A7105_INO #ifdef KYOSHO_A7105_INO
if(protocol==PROTO_KYOSHO) if(protocol==PROTO_KYOSHO)
{ {
if(sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO) if(sub_protocol==KYOSHO_HYPE)
A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
else
A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs; A7105_Regs=(uint8_t*)KYOSHO_HYPE_A7105_regs;
else //FHSS && SYNCRO
A7105_Regs=(uint8_t*)KYOSHO_A7105_regs;
} }
#endif #endif
} }
@ -446,7 +446,7 @@ void A7105_Init(void)
} }
A7105_Strobe(A7105_STANDBY); A7105_Strobe(A7105_STANDBY);
if(protocol==PROTO_KYOSHO && (sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO)) if(protocol==PROTO_KYOSHO && sub_protocol!=KYOSHO_HYPE)
{//strange calibration... {//strange calibration...
//IF Filter Bank Calibration //IF Filter Bank Calibration
A7105_WriteReg(A7105_02_CALC,0x0F); A7105_WriteReg(A7105_02_CALC,0x0F);

8
Multiprotocol/Kyosho_a7105.ino
View File

@ -59,7 +59,7 @@ static void __attribute__((unused)) KYOSHO_send_packet()
packet[ 0] = 0x58; // normal packet packet[ 0] = 0x58; // normal packet
//FHSS 14 channels: steering, throttle, ... //FHSS 14 channels: steering, throttle, ...
//Syncro 6 channels: steering, throttle, ... //Syncro 6 channels: steering, throttle, ...
for(uint8_t i = 0; i < sub_protocol==KYOSHO_FHSS?14:6; i++) for(uint8_t i = 0; i < (sub_protocol==KYOSHO_FHSS?14:6); i++)
{ {
uint16_t temp=convert_channel_ppm(i); uint16_t temp=convert_channel_ppm(i);
packet[9 + i*2]=temp&0xFF; // low byte of servo timing(1000-2000us) packet[9 + i*2]=temp&0xFF; // low byte of servo timing(1000-2000us)
@ -159,10 +159,10 @@ uint16_t KYOSHO_callback()
telemetry_set_input_sync(packet_period); telemetry_set_input_sync(packet_period);
#endif #endif
} }
if(sub_protocol==KYOSHO_FHSS || sub_protocol==KYOSHO_SYNCRO) if(sub_protocol==KYOSHO_HYPE)
KYOSHO_send_packet();
else//HYPE
KYOSHO_hype_send_packet(); KYOSHO_hype_send_packet();
else //FHSS && SYNCRO
KYOSHO_send_packet();
return packet_period; return packet_period;
} }

2
Multiprotocol/Multiprotocol.h
View File

@ -19,7 +19,7 @@
#define VERSION_MAJOR 1 #define VERSION_MAJOR 1
#define VERSION_MINOR 3 #define VERSION_MINOR 3
#define VERSION_REVISION 3 #define VERSION_REVISION 3
#define VERSION_PATCH_LEVEL 45 #define VERSION_PATCH_LEVEL 46
#define MODE_SERIAL 0 #define MODE_SERIAL 0