Rev 1868 | Rev 1872 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed
Rev 1868 | Rev 1869 | ||
---|---|---|---|
Line 127... | Line 127... | ||
127 | "AngleRoll ", |
127 | "AngleRoll ", |
128 | "AngleYaw ", |
128 | "AngleYaw ", |
129 | "GyroPitch(PID) ", |
129 | "GyroPitch(PID) ", |
130 | "GyroRoll(PID) ", |
130 | "GyroRoll(PID) ", |
131 | "GyroYaw ", //5 |
131 | "GyroYaw ", //5 |
132 | "GyroPitch(AC) ", |
132 | "FilteredAccP ", |
133 | "GyroRoll(AC) ", |
133 | "FilteredAccR ", |
134 | "GyroYaw(AC) ", |
134 | "FilteredAccZ ", |
135 | "AccPitch (angle)", |
135 | "AccPitch (angle)", |
136 | "AccRoll (angle) ", //10 |
136 | "AccRoll (angle) ", //10 |
137 | "HIRES_GYRO_INTEG", |
137 | "UBat ", |
138 | "Pitch Term ", |
138 | "Pitch Term ", |
139 | "Roll Term ", |
139 | "Roll Term ", |
140 | "Yaw Term ", |
140 | "Yaw Term ", |
141 | "Throttle Term ", //15 |
141 | "Throttle Term ", //15 |
142 | "0th O Corr pitch", |
142 | "0th O Corr pitch", |
143 | "0th O Corr roll ", |
143 | "0th O Corr roll ", |
144 | "DriftCompDelta P", |
144 | "DriftCompDelta P", |
145 | "DriftCompDelta R", |
145 | "DriftCompDelta R", |
146 | "StickP ", //20 |
146 | "dHeightThrottle ", //20 |
147 | "RC T ", |
147 | "hoverThrottle ", |
148 | "M1 ", |
148 | "M1 ", |
149 | "M2 ", |
149 | "M2 ", |
150 | "M3 ", |
150 | "M3 ", |
151 | "M4 ", //25 |
151 | "M4 ", //25 |
152 | "ControlYaw ", |
152 | "ControlYaw ", |
Line 567... | Line 567... | ||
567 | if ((1 <= pRxData[0]) && (pRxData[0] <= 5) && (pRxData[1] |
567 | if ((1 <= pRxData[0]) && (pRxData[0] <= 5) && (pRxData[1] |
568 | == EEPARAM_REVISION)) // check for setting to be in range and version of settings |
568 | == EEPARAM_REVISION)) // check for setting to be in range and version of settings |
569 | { |
569 | { |
570 | memcpy(&staticParams, (uint8_t*) &pRxData[2], sizeof(staticParams)); |
570 | memcpy(&staticParams, (uint8_t*) &pRxData[2], sizeof(staticParams)); |
571 | ParamSet_WriteToEEProm(pRxData[0]); |
571 | ParamSet_WriteToEEProm(pRxData[0]); |
572 | /* |
- | |
573 | TODO: Remove this encapsulation breach |
- | |
574 | turnOver180Pitch = (int32_t) staticParams.AngleTurnOverPitch * 2500L; |
- | |
575 | turnOver180Roll = (int32_t) staticParams.AngleTurnOverRoll * 2500L; |
- | |
576 | */ |
- | |
577 | tempchar1 = getActiveParamSet(); |
572 | tempchar1 = getActiveParamSet(); |
578 | beepNumber(tempchar1); |
573 | beepNumber(tempchar1); |
579 | } else { |
574 | } else { |
580 | tempchar1 = 0; //indicate bad data |
575 | tempchar1 = 0; //indicate bad data |
581 | } |
576 | } |