gomaomao/DIY-Multiprotocol-TX-Module
1
0
Fork 0
mirror of https://github.com/pascallanger/DIY-Multiprotocol-TX-Module.git synced 2025-07-01 10:17:53 +00:00
Code Issues Projects Releases Wiki Activity

Changed throttle failsafe value format

Browse Source
This commit is contained in:
Pascal Langer 2017-12-07 17:02:35 +01:00
parent 6e458ebd4a
commit fd4346cb64
3 changed files with 32 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Multiprotocol/Common.ino
View File

@ -14,11 +14,27 @@
*/ */
#ifdef FAILSAFE_ENABLE #ifdef FAILSAFE_ENABLE
#if FAILSAFE_THROTTLE_LOW < -125
#undef FAILSAFE_THROTTLE_LOW
#define FAILSAFE_THROTTLE_LOW -125
#elif FAILSAFE_THROTTLE_LOW > 125
#undef FAILSAFE_THROTTLE_LOW
#define FAILSAFE_THROTTLE_LOW 125
#endif
#define FAILSAFE_THROTTLE_LOW_VAL (((FAILSAFE_THROTTLE_LOW+125)*1024)/125)
#if FAILSAFE_THROTTLE_LOW_VAL == 0
#undef FAILSAFE_THROTTLE_LOW_VAL
#define FAILSAFE_THROTTLE_LOW_VAL 1
#elif (FAILSAFE_THROTTLE_LOW_VAL) >= 2046
#undef FAILSAFE_THROTTLE_LOW_VAL
#define FAILSAFE_THROTTLE_LOW_VAL 2046
#endif
//#define FAILSAFE_THROTTLE_LOW_VAL FAILSAFE_THROTTLE_LOW
void InitFailsafe() void InitFailsafe()
{ {
for(uint8_t i=0;i<NUM_CHN;i++) for(uint8_t i=0;i<NUM_CHN;i++)
Failsafe_data[i]=1024; Failsafe_data[i]=1024;
Failsafe_data[THROTTLE]=FAILSAFE_THROTTLE_LOW; //0=-125%, 204=-100% Failsafe_data[THROTTLE]=FAILSAFE_THROTTLE_LOW_VAL; //0=-125%, 204=-100%
FAILSAFE_VALUES_on; FAILSAFE_VALUES_on;
#ifdef FAILSAFE_SERIAL_ONLY #ifdef FAILSAFE_SERIAL_ONLY
if(mode_select == MODE_SERIAL) if(mode_select == MODE_SERIAL)

2
Multiprotocol/Telemetry.ino
View File

@ -995,6 +995,8 @@ void TelemetryUpdate()
#endif #endif
#endif #endif
} }
#else
(void)speed;
#endif #endif
#ifndef ORANGE_TX #ifndef ORANGE_TX
#ifndef STM32_BOARD #ifndef STM32_BOARD

26
Multiprotocol/_Config.h
View File

@ -63,7 +63,7 @@
//Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares) //Allow flashing multimodule directly with TX(erky9x or opentx modified firmwares)
//Instructions: https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders#compiling--uploading-firmware-with-the-flash-from-tx-bootloader //Instructions: https://github.com/pascallanger/DIY-Multiprotocol-TX-Module/tree/master/BootLoaders#compiling--uploading-firmware-with-the-flash-from-tx-bootloader
//To enable this feature remove the "//" on the next line. Requires a compatible bootloader or upload method to be selected when you use the Multi 4-in-1 Boards Manager definitions. //To enable this feature remove the "//" on the next line. Requires a compatible bootloader or upload method to be selected when you use the Multi 4-in-1 Boards Manager definitions.
#define CHECK_FOR_BOOTLOADER //#define CHECK_FOR_BOOTLOADER
/****************/ /****************/
/*** RF CHIPS ***/ /*** RF CHIPS ***/
@ -165,8 +165,8 @@
#define FAILSAFE_ENABLE #define FAILSAFE_ENABLE
//Failsafe throttle low value. //Failsafe throttle low value.
//1=-125%, 204=-100%, 1024=0%, 1843=100%, 2046=+125% //Value between -125% and +125%
#define FAILSAFE_THROTTLE_LOW 204 #define FAILSAFE_THROTTLE_LOW -100
//The radio using serial protocol can set failsafe data (ersky9x only for now). //The radio using serial protocol can set failsafe data (ersky9x only for now).
// Two options are available: // Two options are available:
@ -190,7 +190,7 @@
//On a 9XR_PRO running ersky9x both commented and uncommented will work depending on the radio setting Invert COM1 under the Telemetry menu. //On a 9XR_PRO running ersky9x both commented and uncommented will work depending on the radio setting Invert COM1 under the Telemetry menu.
//On other addon/replacement boards like the 9xtreme board or the Ar9x board running ersky9x, you need to uncomment the line below. //On other addon/replacement boards like the 9xtreme board or the Ar9x board running ersky9x, you need to uncomment the line below.
//For er9x it depends if you have an inveter mod or not on the telemetry pin. If you don't have an inverter comment this line. //For er9x it depends if you have an inveter mod or not on the telemetry pin. If you don't have an inverter comment this line.
//#define INVERT_TELEMETRY #define INVERT_TELEMETRY
//Comment if you don't want to send Multi status telemetry frames (Protocol available, Bind in progress, version...) //Comment if you don't want to send Multi status telemetry frames (Protocol available, Bind in progress, version...)
//Use with er9x/erksy9x, for OpenTX MULTI_TELEMETRY below is preferred instead //Use with er9x/erksy9x, for OpenTX MULTI_TELEMETRY below is preferred instead
@ -201,20 +201,20 @@
//#define MULTI_TELEMETRY //#define MULTI_TELEMETRY
//Comment a line to disable a specific protocol telemetry //Comment a line to disable a specific protocol telemetry
//#define DSM_TELEMETRY // Forward received telemetry packet directly to TX to be decoded #define DSM_TELEMETRY // Forward received telemetry packet directly to TX to be decoded
#define SPORT_TELEMETRY // Use FrSkyX SPORT format to send telemetry to TX #define SPORT_TELEMETRY // Use FrSkyX SPORT format to send telemetry to TX
//#define AFHDS2A_FW_TELEMETRY // Forward received telemetry packet directly to TX to be decoded #define AFHDS2A_FW_TELEMETRY // Forward received telemetry packet directly to TX to be decoded
#define HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define AFHDS2A_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define AFHDS2A_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define BAYANG_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define BAYANG_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define HUBSAN_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define HUBSAN_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//#define CABELL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX #define CABELL_HUB_TELEMETRY // Use FrSkyD Hub format to send telemetry to TX
//SPORT_POLLING is an implementation of the same polling routine as XJT module for sport telemetry bidirectional communication. //SPORT_POLLING is an implementation of the same polling routine as XJT module for sport telemetry bidirectional communication.
//This is useful for passing sport control frames from Tx to rx(ex: changing Betaflight PID or VTX channels on the fly using LUA scripts with OpentX). //This is useful for passing sport control frames from TX to RX(ex: changing Betaflight PID or VTX channels on the fly using LUA scripts with OpentX).
//Using this feature on turnigy 9XR_PRO requires uncomment INVERT_TELEMETRY as this TX output on telemetry pin only inverted signal. //Using this feature on turnigy 9XR_PRO requires uncomment INVERT_TELEMETRY as this TX output on telemetry pin only inverted signal.
//!This is a work in progress! //!This is a work in progress!
//#define SPORT_POLLING #define SPORT_POLLING
/****************************/ /****************************/
/*** SERIAL MODE SETTINGS ***/ /*** SERIAL MODE SETTINGS ***/
@ -231,7 +231,7 @@
/*************************/ /*************************/
//In this section you can configure all details about PPM. //In this section you can configure all details about PPM.
//If you do not plan to use the PPM mode comment this line using "//" to save Flash space, you don't need to configure anything below in this case //If you do not plan to use the PPM mode comment this line using "//" to save Flash space, you don't need to configure anything below in this case
//#define ENABLE_PPM #define ENABLE_PPM
/*** TX END POINTS ***/ /*** TX END POINTS ***/
//It is important for the module to know the endpoints of your radio. //It is important for the module to know the endpoints of your radio.