Rev 1963 | Rev 1968 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1963 | Rev 1964 | ||
---|---|---|---|
Line 129... | Line 129... | ||
129 | } |
129 | } |
Line 130... | Line 130... | ||
130 | 130 | ||
131 | uint8_t controlMixer_getSignalQuality(void) { |
131 | uint8_t controlMixer_getSignalQuality(void) { |
132 | uint8_t rcQ = RC_getSignalQuality(); |
132 | uint8_t rcQ = RC_getSignalQuality(); |
- | 133 | uint8_t ecQ = EC_getSignalQuality(); |
|
- | 134 | ||
- | 135 | if (rcQ < SIGNAL_GOOD) debugOut.digital[0] |= DEBUG_SIGNAL; else debugOut.digital[0] &= ~DEBUG_SIGNAL; |
|
- | 136 | if (ecQ < SIGNAL_GOOD) debugOut.digital[1] |= DEBUG_SIGNAL; else debugOut.digital[1] &= ~DEBUG_SIGNAL; |
|
133 | uint8_t ecQ = EC_getSignalQuality(); |
137 | |
134 | // This needs not be the only correct solution... |
138 | // This needs not be the only correct solution... |
135 | return rcQ > ecQ ? rcQ : ecQ; |
139 | return rcQ > ecQ ? rcQ : ecQ; |
Line 136... | Line 140... | ||
136 | } |
140 | } |
Line 235... | Line 239... | ||
235 | // Both sources have no command, or one or both are out. |
239 | // Both sources have no command, or one or both are out. |
236 | // Just set to false. There is no reason to check if the none-command was repeated anyway. |
240 | // Just set to false. There is no reason to check if the none-command was repeated anyway. |
237 | isCommandRepeated = 0; |
241 | isCommandRepeated = 0; |
238 | lastCommand = COMMAND_NONE; |
242 | lastCommand = COMMAND_NONE; |
239 | } |
243 | } |
240 | - | ||
241 | /* |
- | |
242 | if (isCommandRepeated) |
- | |
243 | DebugOut.Digital[0] |= DEBUG_COMMANDREPEATED; |
- | |
244 | else |
- | |
245 | DebugOut.Digital[0] &= ~DEBUG_COMMANDREPEATED; |
- | |
246 | if (rcCommand) |
- | |
247 | DebugOut.Digital[1] |= DEBUG_COMMANDREPEATED; |
- | |
248 | else |
- | |
249 | DebugOut.Digital[1] &= ~DEBUG_COMMANDREPEATED; |
- | |
250 | */ |
- | |
251 | } |
244 | } |
Line 252... | Line 245... | ||
252 | 245 | ||
253 | // TODO: Integrate into command system. |
246 | // TODO: Integrate into command system. |
254 | uint8_t controlMixer_testCompassCalState(void) { |
247 | uint8_t controlMixer_testCompassCalState(void) { |
255 | return RC_testCompassCalState(); |
248 | return RC_testCompassCalState(); |