Skip to content

Commit 9f4396b

Browse files
committed
Add BMM150 to cfg options, and some tiny fixes
Add BMM150 to mag_gizmo comment options across all example configs. Fix incorrect "RDR:" log prefix to "MAG:" in MagGizmoBMM150 init error message. Rename setup_brushed() freq parameter from freq_khz to freq_hz to match actual units.
1 parent e5dcee9 commit 9f4396b

File tree

6 files changed

+7
-6
lines changed

6 files changed

+7
-6
lines changed

examples/00.HelloWorld/madflight_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const char madflight_config[] = R""(
6060
//bar_i2c_bus -1
6161

6262
//--- MAG --- Magnetometer
63-
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100
63+
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100, BMM150
6464
//mag_align CW0 // options: CW0, CW90, CW180, CW270, CW0FLIP, CW90FLIP, CW180FLIP, CW270FLIP
6565
//mag_i2c_adr 0
6666
//mag_i2c_bus -1

examples/10.Quadcopter/madflight_config.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,8 @@ const char madflight_config[] = R""(
6060
//bar_i2c_bus -1
6161

6262
//--- MAG --- Magnetometer
63-
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100
63+
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100, BMM150
64+
6465
//mag_align CW0 // options: CW0, CW90, CW180, CW270, CW0FLIP, CW90FLIP, CW180FLIP, CW270FLIP
6566
//mag_i2c_adr 0
6667
//mag_i2c_bus -1

examples/11.QuadcopterAdvanced/madflight_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const char madflight_config[] = R""(
6060
//bar_i2c_bus -1
6161

6262
//--- MAG --- Magnetometer
63-
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100
63+
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100, BMM150
6464
//mag_align CW0 // options: CW0, CW90, CW180, CW270, CW0FLIP, CW90FLIP, CW180FLIP, CW270FLIP
6565
//mag_i2c_adr 0
6666
//mag_i2c_bus -1

examples/20.Plane/madflight_config.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ const char madflight_config[] = R""(
6060
//bar_i2c_bus -1
6161

6262
//--- MAG --- Magnetometer
63-
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100
63+
//mag_gizmo NONE // options: NONE, QMC6309, QMC5883L, QMC5883P, RM3100, BMM150
6464
//mag_align CW0 // options: CW0, CW90, CW180, CW270, CW0FLIP, CW90FLIP, CW180FLIP, CW270FLIP
6565
//mag_i2c_adr 0
6666
//mag_i2c_bus -1

src/mag/MagGizmoBMM150.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ class MagGizmoBMM150: public MagGizmo {
2626
//configure sensor
2727
BMM150_I2C *sensor = new BMM150_I2C(i2c, config->i2c_adr);
2828
if(sensor->begin() != 0) {
29-
Serial.printf("RDR: BMM150 init failed.\n");
29+
Serial.printf("MAG: BMM150 init failed.\n");
3030
delete sensor;
3131
return nullptr;
3232
}

src/out/out.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ class Out : public OutState {
7373
bool setup_dshot(uint8_t cnt, int* idxs, int freq_khz = 300);
7474
bool setup_dshot_bidir(uint8_t cnt, int* idxs, int freq_khz = 300);
7575
bool setup_motors(uint8_t cnt, int* idxs, int freq_hz = 400, int pwm_min_us = 950, int pwm_max_us = 2000);
76-
bool setup_brushed(uint8_t cnt, int* idxs, int freq_khz);
76+
bool setup_brushed(uint8_t cnt, int* idxs, int freq_hz);
7777
bool setup_motor(uint8_t idx, int freq_hz = 400, int pwm_min_us = 950, int pwm_max_us = 2000);
7878
bool setup_servo(uint8_t idx, int freq_hz = 400, int pwm_min_us = 950, int pwm_max_us = 2000);
7979
void set_output(uint8_t idx, float value); //set output (when ARMED, ignored in DISARMED and TESTMOTOR mode)

0 commit comments

Comments
 (0)