Browse Source

rename constants

Juraj Ďuďák 1 year ago
parent
commit
afabaea4a7
2 changed files with 22 additions and 16 deletions
  1. 8 8
      src/icm20948.cpp
  2. 14 8
      src/icm_datatypes.h

+ 8 - 8
src/icm20948.cpp

@@ -495,19 +495,19 @@ void SensorAccel::SetRange(accel_full_scale full_scale)
 	float accel_scale_factor;
 	switch(full_scale)
 	{
-		case _2g :
+		case ACCEL_FS_2g :
 			new_val |= 0x00;
 			accel_scale_factor = 16384;
 			break;
-		case _4g :
+		case ACCEL_FS_4g :
 			new_val |= 0x02;
 			accel_scale_factor = 8192;
 			break;
-		case _8g :
+		case ACCEL_FS_8g :
 			new_val |= 0x04;
 			accel_scale_factor = 4096;
 			break;
-		case _16g :
+		case ACCEL_FS_16g :
 			new_val |= 0x06;
 			accel_scale_factor = 2048;
 			break;
@@ -525,19 +525,19 @@ void SensorGyro::SetRange(gyro_full_scale full_scale)
 	float gyro_scale_factor = 1;
 	switch(full_scale)
 	{
-		case _250dps :
+		case GYRO_FS_250dps:
 			new_val |= 0x00;
 			gyro_scale_factor = 131.0;
 			break;
-		case _500dps :
+		case GYRO_FS_500dps:
 			new_val |= 0x02;
 			gyro_scale_factor = 65.5;
 			break;
-		case _1000dps :
+		case GYRO_FS_1000dps:
 			new_val |= 0x04;
 			gyro_scale_factor = 32.8;
 			break;
-		case _2000dps :
+		case GYRO_FS_2000dps:
 			new_val |= 0x06;
 			gyro_scale_factor = 16.4;
 			break;

+ 14 - 8
src/icm_datatypes.h

@@ -46,18 +46,20 @@ typedef struct
 
 typedef enum
 {
-	_250dps,
-	_500dps,
-	_1000dps,
-	_2000dps
+	GYRO_FS_250dps,
+	GYRO_FS_500dps,
+	GYRO_FS_1000dps,
+	GYRO_FS_2000dps,
+	GYRO_FS_None = 0xFF
 } gyro_full_scale;
 
 typedef enum
 {
-	_2g,
-	_4g,
-	_8g,
-	_16g
+	ACCEL_FS_2g,
+	ACCEL_FS_4g,
+	ACCEL_FS_8g,
+	ACCEL_FS_16g,
+	ACCEL_FS_NoneG = 0xFF
 } accel_full_scale;
 
 
@@ -77,6 +79,7 @@ typedef enum
 	ACCEL_lpf_011_5Hz = 0x5,
 	ACCEL_lpf_005_7Hz = 0x6,
 	ACCEL_lpf_473Hz = 0x7,
+	ACCEL_lpf_None = 0xFF,
 } accel_dlp_cfg;
 
 
@@ -97,6 +100,7 @@ typedef enum
 	ACCEL_samplerate_1_1Hz = 12,
 	ACCEL_samplerate_0_55Hz = 13,
 	ACCEL_samplerate_0_27Hz = 14,
+	ACCEL_samplerate_None = 255,
 
 } accel_samplerate;
 
@@ -119,6 +123,7 @@ typedef enum
 	GYRO_samplerate_017_6Hz = 63,
 	GYRO_samplerate_017_3Hz = 64,
 	GYRO_samplerate_004_4Hz = 255,
+	GYRO_samplerate_None = 254,  //0xFE
 } gyro_samplerate;
 
 
@@ -138,6 +143,7 @@ typedef enum
 	GYRO_lpf_011_6Hz = 0x5,
 	GYRO_lpf_005_7Hz = 0x6,
 	GYRO_lpf_361_4Hz = 0x7,
+	GYRO_lpf_None = 0xFF,
 } gyro_dlp_cfg;