Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 2616 → Rev 2617

/trunk/main.c
62,6 → 62,8
unsigned char JetiBeep = 0; // to allow any Morse-Beeping of the Jeti-Box
unsigned char ActiveParamSet = 3;
unsigned char LipoCells = 4;
unsigned char IamMaster = 0;
unsigned char Delete_Stoppflag_Timer = 0;
 
void PrintLine(void)
{
241,6 → 243,13
ACC_AltitudeControl = 1;
J4Low;
}
/*
if(PlatinenVersion >= 30) -> wird noch der #define gemacht
{
if(!(PIND & 0x20)) IamMaster = SLAVE; // Slave
else IamMaster = MASTER; // Master
}
*/
#else
if(PINB & 0x01)
{
355,10 → 364,12
if(RequiredMotors > 8) Max_I2C_Packets = 8; else Max_I2C_Packets = RequiredMotors;
#else
printf("\n\r\n\r--> REDUNDANT SLAVE <---\n\r");
IamMaster = SLAVE;
#endif
 
#ifdef REDUNDANT_FC_MASTER
printf("\n\r\n\r--> REDUNDANT MASTER <---\n\r");
IamMaster = MASTER;
#endif
 
// +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
641,6 → 652,7
if(Show_Load_Time) Show_Load_Time--;
if(Show_Store_Time) Show_Store_Time--;
if(ShowCmpsCalibrateTime) ShowCmpsCalibrateTime--;
if(Delete_Stoppflag_Timer) Delete_Stoppflag_Timer--; else FC_StatusFlags3 &= ~FC_STATUS3_MOTORS_STOPPED_BY_RC;
#endif
if(NC_To_FC_Flags & NC_TO_FC_FAILSAFE_LANDING) ServoFailsafeActive = SERVO_FS_TIME;
else
/trunk/main.h
35,6 → 35,8
#define J4Low PORTD &= ~0x10
#define J5High PORTD |= 0x08
#define J5Low PORTD &= ~0x08
#define UART_MUX_TO_BL PORTD |= 0x10
#define UART_MUX_TO_UPDATE PORTD &= ~0x10
 
extern unsigned char BattLowVoltageWarning;
extern unsigned char BattAutoLandingVoltage, BattComingHomeVoltage;
48,7 → 50,14
extern unsigned char ActiveParamSet;
extern unsigned int BL3_Current(unsigned char who); // in 0,1A
extern unsigned char LipoCells;
extern unsigned char Delete_Stoppflag_Timer;
 
#define NOTHING 0
#define MASTER 1
#define SLAVE 2
extern unsigned char IamMaster;
 
 
#include <avr/pgmspace.h>
 
#if (defined(__AVR_ATmega1284__) || defined(__AVR_ATmega1284P__))