Skip to content

Commit 0c80871

Browse files
committed
fix uBlox
1 parent 1c75510 commit 0c80871

File tree

4 files changed

+12
-120
lines changed

4 files changed

+12
-120
lines changed

examples/00.HelloWorld/madflight_config.h

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
// You have 3 options to setup the pins (gpio numbers) and busses for the flight controller:
66
//
77
// 1) Default - #include <madflight_board.h> and see https://madflight.com for default pinout diagrams for the supported
8-
// processor families. Default pinouts are defined in the board header files library/src/madflight_board_default_XXX.h
8+
// processor families. Default pinouts are defined in the board header files library/src/madflight_board_XXX.h
99
//
1010
// 2) Header - #include the BetaFlight flight controller you want to use. See library/madflight/src for all available
11-
// boards. For example: #include <madflight_board_betaflight_MTKS-MATEKH743.h>
11+
// boards. For example: #include <madflight_zzz_MTKS-MATEKH743.h>
1212
//
1313
// 3) Custom - Do not include a board file here, and set your own board definition in the CUSTOM PINS section below.
1414
//
@@ -21,7 +21,7 @@
2121
// HARDWARE CONFIG //
2222
//========================================================================================================================//
2323
//
24-
// Hardware configuration is a simple key-value list. Anything after '#' or '/' is ignored as comment
24+
// Hardware configuration is a raw string with a key-value list. On a line, anything after '#' or '/' is ignored as comment
2525
//
2626
//========================================================================================================================//
2727

@@ -35,7 +35,7 @@ imu_spi_bus 0 // connect IMU to SPI bus 0
3535

3636
// IMPORTANT: the IMU sensor should be the ONLY sensor on the selected bus
3737

38-
imu_gizmo NONE // options: NONE, BMI270, MPU6000, MPU6050, MPU6500, MPU9150, MPU9250
38+
imu_gizmo MPU6500 // options: NONE, BMI270, MPU6000, MPU6050, MPU6500, MPU9150, MPU9250
3939
imu_align CW90 // options: CW0, CW90, CW180, CW270, CW0FLIP, CW90FLIP, CW180FLIP, CW270FLIP
4040
imu_i2c_adr 0 // use 0 for default i2c address
4141

@@ -63,6 +63,10 @@ gps_baud 0 // use 0 for auto baud
6363
// BBX - Black Box Data Logger
6464
bbx_gizmo NONE // options: NONE, SDSPI, SDMMC
6565

66+
// RDR - Radar
67+
rdr_gizmo NONE // options: NONE, LD2411S, LD2413, USD1
68+
rdr_baud 0
69+
6670
)"" // End of MADFLIGHT_CONFIG
6771

6872

@@ -183,7 +187,7 @@ imu_i2c_bus -1
183187
//-- AHRS sensor fusion
184188
#define AHR_USE AHR_USE_MAHONY // Select one: AHRS_USE_MAHONY, AHRS_USE_MAHONY_BF, AHRS_USE_MADGWICK, AHRS_USE_VQF
185189

186-
// Reset config eeprom to defaults (uncomment this, upload, then comment out again)
190+
// Reset config eeprom to defaults (uncomment this, upload, then comment out, and upload again)
187191
//#define MF_CONFIG_CLEAR
188192

189193
// Uncomment to print additional debug information and reduce startup delay

src/madflight/gps/GPS-uBlox/qqqlab_AutoBaud.cpp

Lines changed: 0 additions & 105 deletions
This file was deleted.

src/madflight/gps/GPS-uBlox/qqqlab_AutoBaud.h

Lines changed: 0 additions & 9 deletions
This file was deleted.

src/madflight/gps/GpsGizmoUblox.h

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,5 +44,7 @@ class GpsGizmoUblox: public GpsGizmo {
4444
inline int I_write(uint8_t* data, size_t len) override {return ser_bus->write(data, len);}
4545
inline uint32_t I_millis() override {return ::millis();}
4646
void I_print(const char *str) override {Serial.print("GPS: "); Serial.print(str);}
47-
} gps_ublox;
47+
};
48+
49+
GPS_UBLOX gps_ublox = {}; //init to 0 is NEEDED!!!
4850
};

0 commit comments

Comments
 (0)