Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2747 → Rev 2748

/trunk/eeprom.h
4,7 → 4,7
#include <inttypes.h>
#include "twimaster.h"
 
#define EEPARAM_REVISION 113 // -> InsertDefaultParameters()
#define EEPARAM_REVISION 114 // -> InsertDefaultParameters()
#define EEMIXER_REVISION 1 // is count up, if mixer stucture has changed (compatibility)
#define EE_BACKWARD_COMP 1 // count up if the eepropm parameters are not backwards compatible
 
85,10 → 85,10
#define CFG_LOOP_UNTEN 0x02
#define CFG_LOOP_LINKS 0x04
#define CFG_LOOP_RECHTS 0x08
#define CFG_MOTOR_BLINK1 0x10
#define CFG_MOTOR_OFF_LED1 0x20
#define CFG_MOTOR_OFF_LED2 0x40
#define CFG_MOTOR_BLINK2 0x80
#define CFG_LED1_MOTOR_RUN 0x10 // LED Only active if MotorRun
#define CFG_MOTOR_OFF_LED1 0x20 // Idle State if !MotorRun
#define CFG_MOTOR_OFF_LED2 0x40 // Idle State if !MotorRun
#define CFG_LED2_MOTOR_RUN 0x80 // LED Only active if MotorRun
 
// EE_Parameter.ExtraConfig
#define CFG2_HEIGHT_LIMIT 0x01
281,7 → 281,8
unsigned char GimbalYawChannel;
unsigned char GimbalOut1Channel;
unsigned char GimbalOut2Channel;
unsigned char reserved[28]; // for later use
unsigned char ExternalGpsChannel;
unsigned char reserved[27]; // for later use
//------------------------------------------------
unsigned char BitConfig; // (war Loop-Cfg) Bitcodiert: 0x01=oben, 0x02=unten, 0x04=links, 0x08=rechts / wird getrennt behandelt
unsigned char ServoCompInvert; // // 0x01 = Nick, 0x02 = Roll, 0x04 = relative moving // WICHTIG!!! am Ende lassen
/trunk/hottmenu.c
171,6 → 171,7
"Outside Flyzone \0", // 44
"No Flyzone \0", // 45
"ERR:Calibration \0", // 46
"Ext.GPS Fix lost\0", // 47
};
 
 
223,7 → 224,8
{SPEAK_MK_OFF,0}, // "Parachute", // 43
{SPEAK_MAX_RANGE,0}, // "Outside Area", // 44
{SPEAK_ERROR,0}, // "No Flyzone", // 45
{0,0} // "Err:Calibration" // 46 (achtung: hier nicht "SPEAK_ERR_CALIBARTION" einsetzen)
{0,0}, // "Err:Calibration" // 46 (achtung: hier nicht "SPEAK_ERR_CALIBARTION" einsetzen)
{SPEAK_ERR_GPS,0} // "Ext.GPS Fix lost" // 47
 
};
 
/trunk/hottmenu.h
123,7 → 123,7
//"ERR:Redundanz ?"
*/
 
#define MAX_ERR_NUMBER (46+1)
#define MAX_ERR_NUMBER (47+1)
extern const char PROGMEM NC_ERROR_TEXT[MAX_ERR_NUMBER][17];
extern unsigned int NaviData_TargetDistance;
extern unsigned char MaxBlTemperture;
/trunk/led.c
57,7 → 57,7
// Output 1
if(!J16Warn)
{
if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK1) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}
if((EE_Parameter.BitConfig & CFG_LED1_MOTOR_RUN) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED1) J16_ON; else J16_OFF;}
else
if((EE_Parameter.J16Timing > 247) && (Parameter_J16Timing > 220)) {if(J16Bitmask & 128) J16_OFF; else J16_ON; J16Mask = 1; NC_Wait_for_LED = 0;} // Manual overwrite
else
110,7 → 110,7
 
if(!J17Warn)
{
if((EE_Parameter.BitConfig & CFG_MOTOR_BLINK2) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}
if((EE_Parameter.BitConfig & CFG_LED1_MOTOR_RUN) && !MotorenEin) {if(EE_Parameter.BitConfig & CFG_MOTOR_OFF_LED2) J17_ON; else J17_OFF;}
else
if((EE_Parameter.J17Timing > 247) && (Parameter_J17Timing > 220)) {if(J17Bitmask & 128) J17_OFF; else J17_ON; J17Mask = 1;}
else
/trunk/libfc1284.a
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
/trunk/version.txt
917,7 → 917,11
2.21a (28.03.2018)
- WAYPOINT-EVENT = 255 -> Cameratrigger continously ON (or OFF -> Depends on the IDLE-Bit)
- GPS-Fix Character from NEMA in HoTT-LCD
 
2.21b (09.04.2018)
- New Error Message "47:Ext.GPS Fix lost"
 
toDo:
- CalAthmospheare nachführen