Subversion Repositories FlightCtrl

Compare Revisions

Ignore whitespace Rev 1985 → Rev 1986

/branches/dongfang_FC_rewrite/output.c
68,12 → 68,12
}
 
void outputSet(uint8_t num, uint8_t state) {
if (staticParams.outputOptions & (OUTPUTOPTIONS_INVERT_0 << num)) {
if (staticParams.outputFlags & (OUTPUTFLAGS_INVERT_0 << num)) {
if (state) OUTPUT_LOW(num) else OUTPUT_HIGH(num);
} else {
if (state) OUTPUT_HIGH(num) else OUTPUT_LOW(num);
}
if (staticParams.outputOptions & OUTPUTOPTIONS_USE_ONBOARD_LEDS) {
if (staticParams.outputFlags & OUTPUTFLAGS_USE_ONBOARD_LEDS) {
if (num) {
if (state) GRN_ON else GRN_OFF;
} else {
104,22 → 104,26
static int8_t delay = 0;
if (!delay--) { // 10 ms intervals
delay = 4;
if (staticParams.outputOptions & OUTPUTOPTIONS_FLASH_AT_BEEP && beepModulation != BEEP_MODULATION_NONE) {
if (staticParams.outputFlags & OUTPUTFLAGS_FLASH_0_AT_BEEP && beepModulation != BEEP_MODULATION_NONE) {
// alarm
flashingLight(0, 25, 0x55, 25);
flashingLight(1, 25, 0xAA, 25);
} else {
flashingLight(0, staticParams.outputFlash[0].timing, staticParams.outputFlash[0].bitmask, dynamicParams.output0Timing);
flashingLight(1, staticParams.outputFlash[1].timing, staticParams.outputFlash[1].bitmask, dynamicParams.output1Timing);
}
if (staticParams.outputFlags & OUTPUTFLAGS_FLASH_1_AT_BEEP && beepModulation != BEEP_MODULATION_NONE) {
// alarm
flashingLight(1, 25, 0x55, 25);
} else {
flashingLight(1, staticParams.outputFlash[0].timing, staticParams.outputFlash[0].bitmask, dynamicParams.output0Timing);
}
}
}
 
void output_update(void) {
if (staticParams.outputOptions & OUTPUTOPTIONS_TEST_ON) {
if (staticParams.outputFlags & OUTPUTFLAGS_TEST_ON) {
outputSet(0, 1);
outputSet(1, 1);
} else if (staticParams.outputOptions & OUTPUTOPTIONS_TEST_OFF) {
} else if (staticParams.outputFlags & OUTPUTFLAGS_TEST_OFF) {
outputSet(0, 0);
outputSet(1, 0);
} else if (!staticParams.outputDebugMask) {