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

Remove the OPFLOW_PMW3901 opflow hardware option #6678

Merged
merged 1 commit into from
Mar 8, 2021
Merged

Remove the OPFLOW_PMW3901 opflow hardware option #6678

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 src/main/fc/settings.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ tables:
values: ["NONE", "AUTO", "HMC5883", "AK8975", "GPSMAG", "MAG3110", "AK8963", "IST8310", "QMC5883", "MPU9250", "IST8308", "LIS3MDL", "MSP", "FAKE"]
enum: magSensor_e
- name: opflow_hardware
values: ["NONE", "PMW3901", "CXOF", "MSP", "FAKE"]
values: ["NONE", "CXOF", "MSP", "FAKE"]
enum: opticalFlowSensor_e
- name: baro_hardware
values: ["NONE", "AUTO", "BMP085", "MS5611", "BMP280", "MS5607", "LPS25H", "SPL06", "BMP388", "DPS310", "MSP", "FAKE"]
Expand Down
2 changes: 1 addition & 1 deletion src/main/sensors/opflow.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static float opflowCalibrationFlowAcc;
#define OPFLOW_UPDATE_TIMEOUT_US 200000 // At least 5Hz updates required
#define OPFLOW_CALIBRATE_TIME_MS 30000 // 30 second calibration time

PG_REGISTER_WITH_RESET_TEMPLATE(opticalFlowConfig_t, opticalFlowConfig, PG_OPFLOW_CONFIG, 1);
PG_REGISTER_WITH_RESET_TEMPLATE(opticalFlowConfig_t, opticalFlowConfig, PG_OPFLOW_CONFIG, 2);

PG_RESET_TEMPLATE(opticalFlowConfig_t, opticalFlowConfig,
.opflow_hardware = OPFLOW_NONE,
Expand Down
7 changes: 3 additions & 4 deletions src/main/sensors/opflow.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,9 @@

typedef enum {
OPFLOW_NONE = 0,
OPFLOW_PMW3901 = 1,
OPFLOW_CXOF = 2,
OPFLOW_MSP = 3,
OPFLOW_FAKE = 4,
OPFLOW_CXOF = 1,
OPFLOW_MSP = 2,
OPFLOW_FAKE = 3,
} opticalFlowSensor_e;

typedef enum {
Expand Down