Subversion Repositories FlightCtrl

Rev

Rev 1955 | Rev 1961 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 1955 Rev 1960
Line 61... Line 61...
61
#include "output.h"
61
#include "output.h"
Line 62... Line 62...
62
 
62
 
63
// uint16_t maxControl[2] = { 0, 0 };
63
// uint16_t maxControl[2] = { 0, 0 };
64
uint16_t controlActivity = 0;
64
uint16_t controlActivity = 0;
65
int16_t controls[4] = { 0, 0, 0, 0 };
-
 
66
//int16_t controlYaw = 0, controlThrottle = 0;
65
int16_t controls[4] = { 0, 0, 0, 0 };
Line 67... Line 66...
67
uint8_t looping = 0;
66
//uint8_t looping = 0;
68
 
67
 
69
// Internal variables for reading commands made with an R/C stick.
68
// Internal variables for reading commands made with an R/C stick.
Line 188... Line 187...
188
        controls[CONTROL_THROTTLE] = AC_getThrottle(tempThrottle);
187
        controls[CONTROL_THROTTLE] = AC_getThrottle(tempThrottle);
Line 189... Line 188...
189
 
188
 
Line 190... Line 189...
190
        // controlYaw = RC_PRTY[CONTROL_YAW] + EC_PRTY[CONTROL_YAW];
189
        // controlYaw = RC_PRTY[CONTROL_YAW] + EC_PRTY[CONTROL_YAW];
191
 
190
 
192
        if (controlMixer_getSignalQuality() >= SIGNAL_GOOD) {
191
        if (controlMixer_getSignalQuality() >= SIGNAL_GOOD) {
193
                controlMixer_updateVariables();
192
          controlMixer_updateVariables();
194
                configuration_applyVariablesToParams();
193
          configuration_applyVariablesToParams();
195
                looping = RC_getLooping(looping);
194
          //looping = RC_getLooping(looping);
196
        } else { // Signal is not OK
195
        } else { // Signal is not OK
197
                // Could handle switch to emergency flight here.
196
                // Could handle switch to emergency flight here.
198
                // throttle is handled elsewhere.
197
                // throttle is handled elsewhere.
Line 199... Line 198...
199
                looping = 0;
198
                // looping = 0;
Line 200... Line 199...
200
        }
199
        }