/beta/Code Redesign killagreg/eeprom.h |
---|
65,8 → 65,8 |
#define CFG1_LOOP_LEFT 0x04 |
#define CFG1_LOOP_RIGHT 0x08 |
#define CFG1_MOTOR_BLINK 0x10 |
#define CFG1_RES2 0x20 |
#define CFG1_RES3 0x40 |
#define CFG1_MOTOR_OFF_LED1 0x20 |
#define CFG1_MOTOR_OFF_LED2 0x40 |
#define CFG1_RES4 0x80 |
// bit mask for ParamSet.Config2 |
/beta/Code Redesign killagreg/fc.c |
---|
951,7 → 951,7 |
} |
// mapping of gas |
StickGas = (StickGas + PPM_in[ParamSet.ChannelAssignment[CH_GAS]] + RC_GAS_OFFSET) / 2;// shift to positive numbers |
StickGas = PPM_in[ParamSet.ChannelAssignment[CH_GAS]] + RC_GAS_OFFSET;// shift to positive numbers |
// update gyro control loop factors |
GyroPFactor = FCParam.GyroP + 10; |
/beta/Code Redesign killagreg/led.c |
---|
90,8 → 90,13 |
J17Bitmask = ParamSet.J17Bitmask; |
} |
if( ((ParamSet.J16Timing > 250) && (FCParam.J16Timing > 230)) || ( (ParamSet.Config1 & CFG1_MOTOR_BLINK) && (MKFlags & MKFLAG_MOTOR_RUN)) ) |
if( (ParamSet.Config1 & CFG1_MOTOR_BLINK) && !(MKFlags & MKFLAG_MOTOR_RUN)) |
{ |
if(ParamSet.Config1 & CFG1_MOTOR_OFF_LED1) J16_ON; |
else J16_OFF; |
} |
else if((ParamSet.J16Timing > 250) && (FCParam.J16Timing > 220)) |
{ |
if(J16Bitmask & 128) J16_ON; |
else J16_OFF; |
} |
107,8 → 112,14 |
if(J16Mask & J16Bitmask) J16_ON; else J16_OFF; |
} |
if( ((ParamSet.J17Timing > 250) && (FCParam.J17Timing > 230) ) || ( (ParamSet.Config1 & CFG1_MOTOR_BLINK) && (MKFlags & MKFLAG_MOTOR_RUN)) ) |
if( (ParamSet.Config1 & CFG1_MOTOR_BLINK) && !(MKFlags & MKFLAG_MOTOR_RUN)) |
{ |
if(ParamSet.Config1 & CFG1_MOTOR_OFF_LED2) J17_ON; |
else J17_OFF; |
} |
else if((ParamSet.J17Timing > 250) && (FCParam.J17Timing > 220)) |
{ |
if(J17Bitmask & 128) J17_ON; |
else J17_OFF; |
} |
/beta/Code Redesign killagreg/main.c |
---|
328,7 → 328,7 |
LipoDetection(1); |
printf("\n\r===================================\n\r"); |
timer = SetDelay(1000); |
timer = SetDelay(2000); |
// begin of main loop |
while (1) |
/beta/Code Redesign killagreg/makefile |
---|
4,8 → 4,8 |
F_CPU = 20000000 |
#------------------------------------------------------------------- |
VERSION_MAJOR = 0 |
VERSION_MINOR = 75 |
VERSION_PATCH = 16 |
VERSION_MINOR = 76 |
VERSION_PATCH = 1 |
VERSION_SERIAL_MAJOR = 10 # Serial Protocol Major Version |
VERSION_SERIAL_MINOR = 1 # Serial Protocol Minor Version |