Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1139 → Rev 1140

/branches/thjac/V1_11/led.c
5,23 → 5,11
unsigned char J16Blinkcount = 0, J16Mask = 1, J16Brightness = 0, J16 = 0;
unsigned char J17Blinkcount = 0, J17Mask = 1, J17Brightness = 0, J17 = 0;
 
unsigned char pwmJ16 = 0, pwmJ17 = 0;
static unsigned char pwmtable[32] ={0, 1, 2, 2, 2, 3, 3, 4, 5, 6, 7, 8, 10, 11,
13, 16, 19, 23, 27, 32, 38, 45, 54, 64, 76,
91, 108, 128, 152, 181, 215, 250};
 
unsigned char lightsEnabled = 0, lightsOn = 0;
 
extern char MotorenEin;
 
void setJ16(char enabled) {
/* if( PARAM_LED_NEGATE )
enabled = !enabled;
if( enabled && forceEnabled )
J16_ON;
else
J16_OFF;*/
 
if ((enabled && lightsOn) ^ LED_NEGATE_J16)
J16_ON;
else
29,13 → 17,6
}
 
void setJ17(char enabled) {
/* if( PARAM_LED_NEGATE )
enabled = !enabled;
if( enabled && forceEnabled )
J17_ON;
else
J17_OFF;*/
 
if ((enabled && lightsOn) ^ LED_NEGATE_J17)
J17_ON;
else
64,8 → 45,8
// Mit dem Gier-Stick rechts lassen sich bei stehenden Motoren die LED's ein- und mit links ausschalten
if (!MotorenEin) {
if (PARAM_LED_STICK_ENABLED) {
if (PPM_in[ EE_Parameter.Kanalbelegung[ K_GAS ] ] > 35 - 125
&& PPM_in[ EE_Parameter.Kanalbelegung[ K_GAS ] ] < 125 - 35) {
if (PPM_in[ EE_Parameter.Kanalbelegung[ K_GAS ] ] > 35 - 120
&& PPM_in[ EE_Parameter.Kanalbelegung[ K_GAS ] ] < 120 - 35) {
if (PPM_in[ EE_Parameter.Kanalbelegung[ K_GIER ] ] < -75)
lightsEnabled = 1;
if (PPM_in[ EE_Parameter.Kanalbelegung[ K_GIER ] ] > 75)
113,11 → 94,10
 
J16 = EE_Parameter.J16Bitmask & J16Mask;
 
if (EE_Parameter.J16Bitmask & J16Mask) {
pwmJ16 = pwmtable[(Parameter_J16Brightness + 6) / 4];
if (EE_Parameter.J16Bitmask & J16Mask)
J16Brightness = Parameter_J16Brightness / 23;
} else
pwmJ16 = J16Brightness = 0;
else
J16Brightness = 0;
}
 
// J17
131,11 → 111,10
 
J17 = EE_Parameter.J17Bitmask & J17Mask;
 
if (EE_Parameter.J17Bitmask & J17Mask) {
pwmJ17 = pwmtable[(Parameter_J17Brightness + 6) / 4];
if (EE_Parameter.J17Bitmask & J17Mask)
J17Brightness = Parameter_J17Brightness / 23;
} else
pwmJ17 = J17Brightness = 0;
else
J17Brightness = 0;
}
}