Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-13 11:29:56 +03:00
Code Issues Wiki Activity

Fixed typos

Browse source
This commit is contained in:
Darren Lines 2022-05-24 08:35:30 +01:00
parent cee90edce5
commit eda26f085f
7 changed files with 30 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

4
docs/Programming Framework.md
View file

@ -78,8 +78,8 @@ IPF can be edited using INAV Configurator user interface, of via CLI
| 42 | SET_PROFILE | Sets the active config profile (PIDFF/Rates/Filters/etc) to `Operand A`. `Operand A` must be a valid profile number, currently from 1 to 3. If not, the profile will not change |
| 43 | MIN | Finds the lowest value of `Operand A` and `Operand B` |
| 44 | MAX | Finds the highest value of `Operand A` and `Operand B` |
| 45 | FLIGTH_AXIS_ANGLE_OVERRIDE | Sets the target attitude angle for axis. In other words, when active, it enforces Angle mode (Heading Hold for Yaw) on this axis (Angle mode does not have to be active). `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the angle in degrees |
| 46 | FLIGTH_AXIS_RATE_OVERRIDE | Sets the target rate (rotation speed) for axis. `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the rate in degrees per second |
| 45 | FLIGHT_AXIS_ANGLE_OVERRIDE | Sets the target attitude angle for axis. In other words, when active, it enforces Angle mode (Heading Hold for Yaw) on this axis (Angle mode does not have to be active). `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the angle in degrees |
| 46 | FLIGHT_AXIS_RATE_OVERRIDE | Sets the target rate (rotation speed) for axis. `Operand A` defines the axis: `0` - Roll, `1` - Pitch, `2` - Yaw. `Operand B` defines the rate in degrees per second |
### Operands
| Operand Type | Name | Notes |

8
docs/Settings.md
View file

@ -4652,7 +4652,7 @@ Auto swap display time interval between disarm stats pages (seconds). Reverts to
---
### osd_switch_indicator_one_channnel
### osd_switch_indicator_one_channel
RC Channel to use for OSD switch indicator 1.
@ -4672,7 +4672,7 @@ Character to use for OSD switch incicator 1.
---
### osd_switch_indicator_three_channnel
### osd_switch_indicator_three_channel
RC Channel to use for OSD switch indicator 3.
@ -4692,7 +4692,7 @@ Character to use for OSD switch incicator 3.
---
### osd_switch_indicator_two_channnel
### osd_switch_indicator_two_channel
RC Channel to use for OSD switch indicator 2.
@ -4712,7 +4712,7 @@ Character to use for OSD switch incicator 2.
---
### osd_switch_indicator_zero_channnel
### osd_switch_indicator_zero_channel
RC Channel to use for OSD switch indicator 0.

16
src/main/fc/settings.yaml
View file

@ -3538,27 +3538,27 @@ groups:
type: string
max: 5
default_value: "LIGT"
- name: osd_switch_indicator_zero_channnel
- name: osd_switch_indicator_zero_channel
description: "RC Channel to use for OSD switch indicator 0."
field: osd_switch_indicator0_channnel
field: osd_switch_indicator0_channel
min: 5
max: MAX_SUPPORTED_RC_CHANNEL_COUNT
default_value: 5
- name: osd_switch_indicator_one_channnel
- name: osd_switch_indicator_one_channel
description: "RC Channel to use for OSD switch indicator 1."
field: osd_switch_indicator1_channnel
field: osd_switch_indicator1_channel
min: 5
max: MAX_SUPPORTED_RC_CHANNEL_COUNT
default_value: 5
- name: osd_switch_indicator_two_channnel
- name: osd_switch_indicator_two_channel
description: "RC Channel to use for OSD switch indicator 2."
field: osd_switch_indicator2_channnel
field: osd_switch_indicator2_channel
min: 5
max: MAX_SUPPORTED_RC_CHANNEL_COUNT
default_value: 5
- name: osd_switch_indicator_three_channnel
- name: osd_switch_indicator_three_channel
description: "RC Channel to use for OSD switch indicator 3."
field: osd_switch_indicator3_channnel
field: osd_switch_indicator3_channel
min: 5
max: MAX_SUPPORTED_RC_CHANNEL_COUNT
default_value: 5

16
src/main/io/osd.c
View file

@ -2312,19 +2312,19 @@ static bool osdDrawSingleElement(uint8_t item)
#endif
case OSD_SWITCH_INDICATOR_0:
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator0_name, rxGetChannelValue(osdConfig()->osd_switch_indicator0_channnel - 1), buff);
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator0_name, rxGetChannelValue(osdConfig()->osd_switch_indicator0_channel - 1), buff);
break;
case OSD_SWITCH_INDICATOR_1:
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator1_name, rxGetChannelValue(osdConfig()->osd_switch_indicator1_channnel - 1), buff);
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator1_name, rxGetChannelValue(osdConfig()->osd_switch_indicator1_channel - 1), buff);
break;
case OSD_SWITCH_INDICATOR_2:
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator2_name, rxGetChannelValue(osdConfig()->osd_switch_indicator2_channnel - 1), buff);
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator2_name, rxGetChannelValue(osdConfig()->osd_switch_indicator2_channel - 1), buff);
break;
case OSD_SWITCH_INDICATOR_3:
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator3_name, rxGetChannelValue(osdConfig()->osd_switch_indicator3_channnel - 1), buff);
osdDisplaySwitchIndicator(osdConfig()->osd_switch_indicator3_name, rxGetChannelValue(osdConfig()->osd_switch_indicator3_channel - 1), buff);
break;
case OSD_ACTIVE_PROFILE:
@ -3283,13 +3283,13 @@ PG_RESET_TEMPLATE(osdConfig_t, osdConfig,
.esc_rpm_precision = SETTING_OSD_ESC_RPM_PRECISION_DEFAULT,
.mAh_used_precision = SETTING_OSD_MAH_USED_PRECISION_DEFAULT,
.osd_switch_indicator0_name = SETTING_OSD_SWITCH_INDICATOR_ZERO_NAME_DEFAULT,
.osd_switch_indicator0_channnel = SETTING_OSD_SWITCH_INDICATOR_ZERO_CHANNNEL_DEFAULT,
.osd_switch_indicator0_channel = SETTING_OSD_SWITCH_INDICATOR_ZERO_CHANNEL_DEFAULT,
.osd_switch_indicator1_name = SETTING_OSD_SWITCH_INDICATOR_ONE_NAME_DEFAULT,
.osd_switch_indicator1_channnel = SETTING_OSD_SWITCH_INDICATOR_ONE_CHANNNEL_DEFAULT,
.osd_switch_indicator1_channel = SETTING_OSD_SWITCH_INDICATOR_ONE_CHANNEL_DEFAULT,
.osd_switch_indicator2_name = SETTING_OSD_SWITCH_INDICATOR_TWO_NAME_DEFAULT,
.osd_switch_indicator2_channnel = SETTING_OSD_SWITCH_INDICATOR_TWO_CHANNNEL_DEFAULT,
.osd_switch_indicator2_channel = SETTING_OSD_SWITCH_INDICATOR_TWO_CHANNEL_DEFAULT,
.osd_switch_indicator3_name = SETTING_OSD_SWITCH_INDICATOR_THREE_NAME_DEFAULT,
.osd_switch_indicator3_channnel = SETTING_OSD_SWITCH_INDICATOR_THREE_CHANNNEL_DEFAULT,
.osd_switch_indicator3_channel = SETTING_OSD_SWITCH_INDICATOR_THREE_CHANNEL_DEFAULT,
.osd_switch_indicators_align_left = SETTING_OSD_SWITCH_INDICATORS_ALIGN_LEFT_DEFAULT,
.system_msg_display_time = SETTING_OSD_SYSTEM_MSG_DISPLAY_TIME_DEFAULT,
.units = SETTING_OSD_UNITS_DEFAULT,

8
src/main/io/osd.h
View file

@ -419,13 +419,13 @@ typedef struct osdConfig_s {
uint16_t system_msg_display_time; // system message display time for multiple messages (ms)
uint8_t mAh_used_precision; // Number of numbers used for mAh drawn. Plently of packs now are > 9999 mAh
char osd_switch_indicator0_name[OSD_SWITCH_INDICATOR_NAME_LENGTH + 1]; // Name to use for switch indicator 0.
uint8_t osd_switch_indicator0_channnel; // RC Channel to use for switch indicator 0.
uint8_t osd_switch_indicator0_channel; // RC Channel to use for switch indicator 0.
char osd_switch_indicator1_name[OSD_SWITCH_INDICATOR_NAME_LENGTH + 1]; // Name to use for switch indicator 1.
uint8_t osd_switch_indicator1_channnel; // RC Channel to use for switch indicator 1.
uint8_t osd_switch_indicator1_channel; // RC Channel to use for switch indicator 1.
char osd_switch_indicator2_name[OSD_SWITCH_INDICATOR_NAME_LENGTH + 1]; // Name to use for switch indicator 2.
uint8_t osd_switch_indicator2_channnel; // RC Channel to use for switch indicator 2.
uint8_t osd_switch_indicator2_channel; // RC Channel to use for switch indicator 2.
char osd_switch_indicator3_name[OSD_SWITCH_INDICATOR_NAME_LENGTH + 1]; // Name to use for switch indicator 3.
uint8_t osd_switch_indicator3_channnel; // RC Channel to use for switch indicator 3.
uint8_t osd_switch_indicator3_channel; // RC Channel to use for switch indicator 3.
bool osd_switch_indicators_align_left; // Align switch indicator name to left of the switch.
} osdConfig_t;

4
src/main/programming/logic_condition.c
View file

@ -366,7 +366,7 @@ static int logicConditionCompute(
return true;
break;
case LOGIC_CONDITION_FLIGTH_AXIS_ANGLE_OVERRIDE:
case LOGIC_CONDITION_FLIGHT_AXIS_ANGLE_OVERRIDE:
if (operandA >= 0 && operandA <= 2) {
flightAxisOverride[operandA].angleTargetActive = true;
@ -390,7 +390,7 @@ static int logicConditionCompute(
}
break;
case LOGIC_CONDITION_FLIGTH_AXIS_RATE_OVERRIDE:
case LOGIC_CONDITION_FLIGHT_AXIS_RATE_OVERRIDE:
if (operandA >= 0 && operandA <= 2) {
flightAxisOverride[operandA].rateTargetActive = true;
flightAxisOverride[operandA].rateTarget = constrain(operandB, -2000, 2000);

4
src/main/programming/logic_condition.h
View file

@ -74,8 +74,8 @@ typedef enum {
LOGIC_CONDITION_SET_PROFILE = 42,
LOGIC_CONDITION_MIN = 43,
LOGIC_CONDITION_MAX = 44,
LOGIC_CONDITION_FLIGTH_AXIS_ANGLE_OVERRIDE = 45,
LOGIC_CONDITION_FLIGTH_AXIS_RATE_OVERRIDE = 46,
LOGIC_CONDITION_FLIGHT_AXIS_ANGLE_OVERRIDE = 45,
LOGIC_CONDITION_FLIGHT_AXIS_RATE_OVERRIDE = 46,
LOGIC_CONDITION_LAST = 47,
} logicOperation_e;