Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename COMPASS_TYPEMASK to COMPASS_DISBLMSK #26044

Merged
merged 4 commits into from Jan 23, 2024
Merged

Rename COMPASS_TYPEMASK to COMPASS_DISBLMSK #26044

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
f6e5d5d
AP_Compass: rename COMPASS_TYPEMASK to COMPASS_DISBLMSK
peterbarker Jan 22, 2024
c2aee63
AP_HAL_ChibiOS: rename COMPASS_TYPEMASK to COMPASS_DISBLMSK
peterbarker Jan 22, 2024
2b82812
SITL: rename COMPASS_TYPEMASK to COMPASS_DISBLMSK
peterbarker Jan 22, 2024
03bc888
Tools: rename COMPASS_TYPEMASK to COMPASS_DISBLMSK
peterbarker Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Tools/Frame_params/Solo_Copter-3.5_GreenCube.param
View file
Open in desktop
Expand Up @@ -38,7 +38,7 @@ COMPASS_ORIENT,38
COMPASS_ORIENT2,0
COMPASS_ORIENT3,0
COMPASS_PRIMARY,0
COMPASS_TYPEMASK,15392
COMPASS_DISBLMSK,15392
COMPASS_USE,1
COMPASS_USE2,1
COMPASS_USE3,0
Expand Down
2 changes: 1 addition & 1 deletion Tools/Frame_params/Solo_Copter-3.6_GreenCube.param
View file
Open in desktop
Expand Up @@ -42,7 +42,7 @@ BRD_SAFETYENABLE,0
BRD_SAFETY_MASK,16368
CIRCLE_RADIUS,3000
COMPASS_ORIENT,38
COMPASS_TYPEMASK,15392
COMPASS_DISBLMSK,15392
COMPASS_USE3,0
DISARM_DELAY,10
EK2_ENABLE,0
Expand Down
2 changes: 1 addition & 1 deletion Tools/Frame_params/Sub/bluerov2-4_0_0.params
View file
Open in desktop
Expand Up @@ -169,7 +169,7 @@ COMPASS_ORIENT2,0
COMPASS_ORIENT3,0
COMPASS_PMOT_EN,0
COMPASS_PRIMARY,0
COMPASS_TYPEMASK,0
COMPASS_DISBLMSK,0
COMPASS_USE,1
COMPASS_USE2,1
COMPASS_USE3,1
Expand Down
2 changes: 1 addition & 1 deletion Tools/Frame_params/Sub/bluerov2-heavy-4_0_0.params
View file
Open in desktop
Expand Up @@ -169,7 +169,7 @@ COMPASS_ORIENT2,0
COMPASS_ORIENT3,0
COMPASS_PMOT_EN,0
COMPASS_PRIMARY,0
COMPASS_TYPEMASK,0
COMPASS_DISBLMSK,0
COMPASS_USE,1
COMPASS_USE2,1
COMPASS_USE3,1
Expand Down
4 changes: 2 additions & 2 deletions libraries/AP_Compass/AP_Compass.cpp
View file
Open in desktop
Expand Up @@ -508,12 +508,12 @@ const AP_Param::GroupInfo Compass::var_info[] = {
AP_SUBGROUPINFO(_per_motor, "PMOT", 32, Compass, Compass_PerMotor),
#endif

// @Param: TYPEMASK
// @Param: DISBLMSK
// @DisplayName: Compass disable driver type mask
// @Description: This is a bitmask of driver types to disable. If a driver type is set in this mask then that driver will not try to find a sensor at startup
// @Bitmask: 0:HMC5883,1:LSM303D,2:AK8963,3:BMM150,4:LSM9DS1,5:LIS3MDL,6:AK09916,7:IST8310,8:ICM20948,9:MMC3416,11:DroneCAN,12:QMC5883,14:MAG3110,15:IST8308,16:RM3100,17:MSP,18:ExternalAHRS
// @User: Advanced
AP_GROUPINFO("TYPEMASK", 33, Compass, _driver_type_mask, 0),
AP_GROUPINFO("DISBLMSK", 33, Compass, _driver_type_mask, 0),

// @Param: FLTR_RNG
// @DisplayName: Range in which sample is accepted
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_Compass/AP_Compass.h
View file
Open in desktop
Expand Up @@ -422,7 +422,7 @@ friend class AP_Compass_Backend;
bool _cal_requires_reboot;
bool _cal_has_run;

// enum of drivers for COMPASS_TYPEMASK
// enum of drivers for COMPASS_DISBLMSK
enum DriverType {
#if AP_COMPASS_HMC5843_ENABLED
DRIVER_HMC5843 =0,
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CubeGreen-solo/defaults.parm
View file
Open in desktop
Expand Up @@ -49,7 +49,7 @@ BRD_SAFETY_MASK,16368
BRD_SAFETYENABLE,0
CIRCLE_RADIUS,3000
COMPASS_ORIENT,38
COMPASS_TYPEMASK,15392
COMPASS_DISBLMSK,15392
COMPASS_USE3,0
EK2_ENABLE,0
EK3_ENABLE,1
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/CubeSolo/defaults.parm
View file
Open in desktop
Expand Up @@ -50,7 +50,7 @@ BRD_SAFETYENABLE,0
BRD_TYPE,3
CIRCLE_RADIUS,3000
COMPASS_ORIENT,38
COMPASS_TYPEMASK,15392
COMPASS_DISBLMSK,15392
COMPASS_USE3,0
EK2_ENABLE,0
EK3_ENABLE,1
Expand Down
2 changes: 1 addition & 1 deletion libraries/AP_HAL_ChibiOS/hwdef/luminousbee5/defaults.parm
View file
Open in desktop
Expand Up @@ -54,7 +54,7 @@ CAN_D2_PROTOCOL,0
COMPASS_AUTODEC,1
COMPASS_EXTERNAL,1
COMPASS_ORIENT,12
COMPASS_TYPEMASK,510846
COMPASS_DISBLMSK,510846
COMPASS_USE2,0
COMPASS_USE3,0
COMPASS_CAL_FIT,16
Expand Down
2 changes: 1 addition & 1 deletion libraries/SITL/examples/SilentWings/Params/Rolladen-Schneider-LS8b.param
View file
Open in desktop
Expand Up @@ -117,7 +117,7 @@ COMPASS_ORIENT2,0
COMPASS_ORIENT3,0
COMPASS_PMOT_EN,0
COMPASS_PRIMARY,0
COMPASS_TYPEMASK,0
COMPASS_DISBLMSK,0
COMPASS_USE,0
COMPASS_USE2,0
COMPASS_USE3,0
Expand Down
2 changes: 1 addition & 1 deletion libraries/SITL/examples/SilentWings/Params/Schleicher-ASW27B.param
View file
Open in desktop
Expand Up @@ -120,7 +120,7 @@ COMPASS_ORIENT2,0
COMPASS_ORIENT3,0
COMPASS_PMOT_EN,0
COMPASS_PRIMARY,0
COMPASS_TYPEMASK,0
COMPASS_DISBLMSK,0
COMPASS_USE,0
COMPASS_USE2,0
COMPASS_USE3,0
Expand Down