Skip to content

Commit 8d8c731

Browse files
bkleinerbkleiner
committed
add USE_MAG_LIS2MDL
1 parent 97a1c03 commit 8d8c731

11 files changed

Lines changed: 349 additions & 81 deletions

File tree

‎docs/development/msp/inav_enums.json‎

Lines changed: 77 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"build": {
33
"fc_version": {
4-
"major": 10,
5-
"minor": 0,
4+
"major": 9,
5+
"minor": 1,
66
"patch": 0
77
}
88
},
@@ -373,7 +373,8 @@
373373
"BARO_B2SMPB": "10",
374374
"BARO_MSP": "11",
375375
"BARO_FAKE": "12",
376-
"BARO_MAX": "BARO_FAKE"
376+
"BARO_CRSF": "13",
377+
"BARO_MAX": "BARO_CRSF"
377378
},
378379
"batCapacityUnit_e": {
379380
"_source": "inav/src/main/sensors/battery_config_structs.h",
@@ -744,7 +745,7 @@
744745
"CRSF_FRAMETYPE_GPS": "2",
745746
"CRSF_FRAMETYPE_VARIO_SENSOR": "7",
746747
"CRSF_FRAMETYPE_BATTERY_SENSOR": "8",
747-
"CRSF_FRAMETYPE_BAROMETER_ALTITUDE": "9",
748+
"CRSF_FRAMETYPE_BAROMETER_ALTITUDE_VARIO_SENSOR": "9",
748749
"CRSF_FRAMETYPE_AIRSPEED_SENSOR": "10",
749750
"CRSF_FRAMETYPE_RPM": "12",
750751
"CRSF_FRAMETYPE_TEMP": "13",
@@ -770,8 +771,7 @@
770771
"CRSF_FRAME_BATTERY_SENSOR_INDEX": "",
771772
"CRSF_FRAME_FLIGHT_MODE_INDEX": "",
772773
"CRSF_FRAME_GPS_INDEX": "",
773-
"CRSF_FRAME_VARIO_SENSOR_INDEX": "",
774-
"CRSF_FRAME_BAROMETER_ALTITUDE_INDEX": "",
774+
"CRSF_FRAME_VARIO_OR_ALT_VARIO_SENSOR_INDEX": "",
775775
"CRSF_FRAME_TEMP_INDEX": "",
776776
"CRSF_FRAME_RPM_INDEX": "",
777777
"CRSF_FRAME_AIRSPEED_INDEX": "",
@@ -802,7 +802,9 @@
802802
"CURRENT_SENSOR_FAKE": "3",
803803
"CURRENT_SENSOR_ESC": "4",
804804
"CURRENT_SENSOR_SMARTPORT": "5",
805-
"CURRENT_SENSOR_MAX": "CURRENT_SENSOR_SMARTPORT"
805+
"CURRENT_SENSOR_CRSF": "6",
806+
"CURRENT_SENSOR_CAN": "7",
807+
"CURRENT_SENSOR_MAX": "CURRENT_SENSOR_CAN"
806808
},
807809
"devHardwareType_e": {
808810
"_source": "inav/src/main/drivers/bus.h",
@@ -857,13 +859,15 @@
857859
"DEVHW_TOF10120_I2C": "48",
858860
"DEVHW_TERARANGER_EVO_I2C": "49",
859861
"DEVHW_MS4525": "50",
860-
"DEVHW_DLVR": "51",
861-
"DEVHW_M25P16": "52",
862-
"DEVHW_W25N": "53",
863-
"DEVHW_UG2864": "54",
864-
"DEVHW_SDCARD": "55",
865-
"DEVHW_IRLOCK": "56",
866-
"DEVHW_PCF8574": "57"
862+
"DEVHW_MS5525": "51",
863+
"DEVHW_DLVR": "52",
864+
"DEVHW_M25P16": "53",
865+
"DEVHW_W25N": "54",
866+
"DEVHW_UG2864": "55",
867+
"DEVHW_SDCARD": "56",
868+
"DEVHW_IRLOCK": "57",
869+
"DEVHW_PCF8574": "58",
870+
"DEVHW_LIS2MDL": "59"
867871
},
868872
"deviceFlags_e": {
869873
"_source": "inav/src/main/drivers/bus.h",
@@ -938,6 +942,20 @@
938942
"DJI_OSD_CN_ADJUSTEMNTS": "6",
939943
"DJI_OSD_CN_MAX_ELEMENTS": "7"
940944
},
945+
"dronecanBitrate_e": {
946+
"_source": "inav/src/main/drivers/dronecan/dronecan.h",
947+
"DRONECAN_BITRATE_125KBPS": "0",
948+
"DRONECAN_BITRATE_250KBPS": "1",
949+
"DRONECAN_BITRATE_500KBPS": "2",
950+
"DRONECAN_BITRATE_1000KBPS": "3",
951+
"DRONECAN_BITRATE_COUNT": "4"
952+
},
953+
"dronecanState_e": {
954+
"_source": "inav/src/main/drivers/dronecan/dronecan.h",
955+
"STATE_DRONECAN_INIT": "0",
956+
"STATE_DRONECAN_NORMAL": "1",
957+
"STATE_DRONECAN_BUS_OFF": "2"
958+
},
941959
"dshotCommands_e": {
942960
"_source": "inav/src/main/drivers/pwm_output.h",
943961
"DSHOT_CMD_SPIN_DIRECTION_NORMAL": "20",
@@ -1506,8 +1524,10 @@
15061524
"_source": "inav/src/main/io/gps.h",
15071525
"GPS_UBLOX": "0",
15081526
"GPS_MSP": "1",
1509-
"GPS_FAKE": "2",
1510-
"GPS_PROVIDER_COUNT": "3"
1527+
"GPS_CRSF": "2",
1528+
"GPS_FAKE": "3",
1529+
"GPS_DRONECAN": "4",
1530+
"GPS_PROVIDER_COUNT": "5"
15111531
},
15121532
"gpsState_e": {
15131533
"_source": "inav/src/main/io/gps_private.h",
@@ -1844,13 +1864,6 @@
18441864
"ITERM_RELAX_RP": "1",
18451865
"ITERM_RELAX_RPY": "2"
18461866
},
1847-
"led_pin_pwm_mode_e": {
1848-
"_source": "inav/src/main/drivers/light_ws2811strip.h",
1849-
"LED_PIN_PWM_MODE_SHARED_LOW": "0",
1850-
"LED_PIN_PWM_MODE_SHARED_HIGH": "1",
1851-
"LED_PIN_PWM_MODE_LOW": "2",
1852-
"LED_PIN_PWM_MODE_HIGH": "3"
1853-
},
18541867
"ledBaseFunctionId_e": {
18551868
"_source": "inav/src/main/io/ledstrip.h",
18561869
"LED_FUNCTION_COLOR": "0",
@@ -2067,7 +2080,7 @@
20672080
"LOGIC_CONDITION_TIMER": "49",
20682081
"LOGIC_CONDITION_DELTA": "50",
20692082
"LOGIC_CONDITION_APPROX_EQUAL": "51",
2070-
"LOGIC_CONDITION_LED_PIN_PWM": "52",
2083+
"LOGIC_CONDITION_PINIO_PWM": "52",
20712084
"LOGIC_CONDITION_DISABLE_GPS_FIX": "53",
20722085
"LOGIC_CONDITION_RESET_MAG_CALIBRATION": "54",
20732086
"LOGIC_CONDITION_SET_GIMBAL_SENSITIVITY": "55",
@@ -2108,7 +2121,8 @@
21082121
"LOG_TOPIC_POS_ESTIMATOR": "8",
21092122
"LOG_TOPIC_VTX": "9",
21102123
"LOG_TOPIC_OSD": "10",
2111-
"LOG_TOPIC_COUNT": "11"
2124+
"LOG_TOPIC_CAN": "11",
2125+
"LOG_TOPIC_COUNT": "12"
21122126
},
21132127
"lsm6dxxConfigMasks_e": {
21142128
"_source": "inav/src/main/drivers/accgyro/accgyro_lsm6dxx.h",
@@ -2256,7 +2270,8 @@
22562270
"MAG_RM3100": "13",
22572271
"MAG_VCM5883": "14",
22582272
"MAG_MLX90393": "15",
2259-
"MAG_FAKE": "16",
2273+
"MAG_LIS2MDL": "16",
2274+
"MAG_FAKE": "17",
22602275
"MAG_MAX": "MAG_FAKE"
22612276
},
22622277
"mavlinkAutopilotType_e": {
@@ -2914,7 +2929,8 @@
29142929
"OSD_NAV_FW_ALT_CONTROL_RESPONSE": "166",
29152930
"OSD_NAV_MIN_GROUND_SPEED": "167",
29162931
"OSD_THROTTLE_GAUGE": "168",
2917-
"OSD_ITEM_COUNT": "169"
2932+
"OSD_GPS_EXTRA_STATS": "169",
2933+
"OSD_ITEM_COUNT": "170"
29182934
},
29192935
"osd_sidebar_arrow_e": {
29202936
"_source": "inav/src/main/io/osd_grid.c",
@@ -3011,7 +3027,8 @@
30113027
"OUTPUT_MODE_AUTO": "0",
30123028
"OUTPUT_MODE_MOTORS": "1",
30133029
"OUTPUT_MODE_SERVOS": "2",
3014-
"OUTPUT_MODE_LED": "3"
3030+
"OUTPUT_MODE_LED": "3",
3031+
"OUTPUT_MODE_PINIO": "4"
30153032
},
30163033
"pageId_e": {
30173034
"_source": "inav/src/main/io/dashboard.h",
@@ -3065,7 +3082,8 @@
30653082
"pinLabel_e": {
30663083
"_source": "inav/src/main/drivers/pwm_mapping.h",
30673084
"PIN_LABEL_NONE": "0",
3068-
"PIN_LABEL_LED": "1"
3085+
"PIN_LABEL_LED": "1",
3086+
"PIN_LABEL_PINIO_BASE": "2"
30693087
},
30703088
"pitotSensor_e": {
30713089
"_source": "inav/src/main/sensors/pitotmeter.h",
@@ -3076,7 +3094,8 @@
30763094
"PITOT_VIRTUAL": "4",
30773095
"PITOT_FAKE": "5",
30783096
"PITOT_MSP": "6",
3079-
"PITOT_DLVR": "7"
3097+
"PITOT_DLVR": "7",
3098+
"PITOT_MS5525": "8"
30803099
},
30813100
"pollType_e": {
30823101
"_source": "inav/src/main/io/smartport_master.c",
@@ -3315,9 +3334,8 @@
33153334
"_source": "inav/src/main/io/displayport_msp_osd.c",
33163335
"SD_3016": "0",
33173336
"HD_5018": "1",
3318-
"HD_3016": "2",
3319-
"HD_6022": "3",
3320-
"HD_5320": "4"
3337+
"HD_6022": "2",
3338+
"HD_5320": "3"
33213339
},
33223340
"resourceOwner_e": {
33233341
"_source": "inav/src/main/drivers/resource.h",
@@ -3355,7 +3373,8 @@
33553373
"OWNER_OLED_DISPLAY": "31",
33563374
"OWNER_PINIO": "32",
33573375
"OWNER_IRLOCK": "33",
3358-
"OWNER_TOTAL_COUNT": "34"
3376+
"OWNER_DRONECAN": "34",
3377+
"OWNER_TOTAL_COUNT": "35"
33593378
},
33603379
"resourceType_e": {
33613380
"_source": "inav/src/main/drivers/resource.h",
@@ -3372,7 +3391,8 @@
33723391
"RESOURCE_QUADSPI_BK2IO3": "10",
33733392
"RESOURCE_ADC_CH1": "11",
33743393
"RESOURCE_RX_CE": "12",
3375-
"RESOURCE_TOTAL_COUNT": "13"
3394+
"RESOURCE_CAN_TX": "13",
3395+
"RESOURCE_TOTAL_COUNT": "14"
33763396
},
33773397
"reversibleMotorsThrottleState_e": {
33783398
"_source": "inav/src/main/flight/mixer.h",
@@ -3577,7 +3597,7 @@
35773597
"FUNCTION_DJI_HD_OSD": "(1 << 21)",
35783598
"FUNCTION_SERVO_SERIAL": "(1 << 22)",
35793599
"FUNCTION_TELEMETRY_SMARTPORT_MASTER": "(1 << 23)",
3580-
"FUNCTION_UNUSED_2": "(1 << 24)",
3600+
"FUNCTION_CRSF_SENSOR": "(1 << 24)",
35813601
"FUNCTION_MSP_OSD": "(1 << 25)",
35823602
"FUNCTION_GIMBAL": "(1 << 26)",
35833603
"FUNCTION_GIMBAL_HEADTRACKER": "(1 << 27)"
@@ -3706,7 +3726,17 @@
37063726
"HITL_AIRSPEED": "(1 << 6)",
37073727
"HITL_EXTENDED_FLAGS": "(1 << 7)",
37083728
"HITL_GPS_TIMEOUT": "(1 << 8)",
3709-
"HITL_PITOT_FAILURE": "(1 << 9)"
3729+
"HITL_PITOT_FAILURE": "(1 << 9)",
3730+
"HITL_CURRENT_SENSOR": "(1 << 10)",
3731+
"HITL_SIM_RC_INPUT": "(1 << 11)",
3732+
"HITL_RANGEFINDER": "(1 << 12)",
3733+
"HITL_FAILSAFE_TRIGGERED": "(1 << 13)",
3734+
"HITL_SITL_MODE": "(1 << 14)"
3735+
},
3736+
"sitlCANMode_e": {
3737+
"_source": "inav/src/main/drivers/dronecan/libcanard/canard_sitl_driver.c",
3738+
"SITL_CAN_MODE_STUB": "0",
3739+
"SITL_CAN_MODE_SOCKETCAN": "1"
37103740
},
37113741
"smartAudioVersion_e": {
37123742
"_source": "inav/src/main/io/vtx_smartaudio.h",
@@ -3865,7 +3895,8 @@
38653895
"_source": "inav/src/main/drivers/timer.h",
38663896
"TCH_DMA_IDLE": "0",
38673897
"TCH_DMA_READY": "1",
3868-
"TCH_DMA_ACTIVE": "2"
3898+
"TCH_DMA_ACTIVE": "2",
3899+
"TCH_DMA_CIRCULAR": "3"
38693900
},
38703901
"tempSensorType_e": {
38713902
"_source": "inav/src/main/sensors/temperature.h",
@@ -3897,7 +3928,8 @@
38973928
"TIM_USE_SERVO": "(1 << 3)",
38983929
"TIM_USE_MC_CHNFW": "(1 << 4)",
38993930
"TIM_USE_LED": "(1 << 24)",
3900-
"TIM_USE_BEEPER": "(1 << 25)"
3931+
"TIM_USE_BEEPER": "(1 << 25)",
3932+
"TIM_USE_PINIO": "(1 << 26)"
39013933
},
39023934
"timId_e": {
39033935
"_source": "inav/src/main/io/ledstrip.c",
@@ -4018,7 +4050,8 @@
40184050
"MSG_CFG_SBAS": "22",
40194051
"MSG_CFG_GNSS": "62",
40204052
"MSG_MON_GNSS": "40",
4021-
"MSG_NAV_SIG": "67"
4053+
"MSG_NAV_SIG": "67",
4054+
"MSG_MON_RF": "56"
40224055
},
40234056
"vcselPeriodType_e": {
40244057
"_source": "inav/src/main/drivers/rangefinder/rangefinder_vl53l0x.c",
@@ -4044,7 +4077,9 @@
40444077
"VOLTAGE_SENSOR_ESC": "2",
40454078
"VOLTAGE_SENSOR_FAKE": "3",
40464079
"VOLTAGE_SENSOR_SMARTPORT": "4",
4047-
"VOLTAGE_SENSOR_MAX": "VOLTAGE_SENSOR_SMARTPORT"
4080+
"VOLTAGE_SENSOR_CRSF": "5",
4081+
"VOLTAGE_SENSOR_CAN": "6",
4082+
"VOLTAGE_SENSOR_MAX": "VOLTAGE_SENSOR_CAN"
40484083
},
40494084
"vs600Band_e": {
40504085
"_source": "inav/src/main/io/smartport_master.h",
@@ -4150,4 +4185,4 @@
41504185
"ZERO_CALIBRATION_FAIL": "3"
41514186
}
41524187
}
4153-
}
4188+
}

0 commit comments

Comments
 (0)