Browse Source

small progress

Juraj Ďuďák 1 year ago
parent
commit
d2529b5c01
5 changed files with 22 additions and 13 deletions
  1. 5 0
      src/IcmSpiManager.cpp
  2. 1 0
      src/IcmSpiManager.h
  3. 1 1
      src/icm20948.cpp
  4. 1 1
      src/icm20948.h
  5. 14 11
      src/icm_datatypes.h

+ 5 - 0
src/IcmSpiManager.cpp

@@ -1,3 +1,8 @@
+/*
+* @file IcmSpiManager.cpp
+*  Created: Juraj Dudak  (C++ version)
+*  Date: 30.12.2022
+*/
 
 #include "IcmSpiManager.h"
 

+ 1 - 0
src/IcmSpiManager.h

@@ -10,6 +10,7 @@
 
 #include "icm_datatypes.h"
 
+
 /* Defines */
 #define READ							0x80
 #define WRITE							0x00

+ 1 - 1
src/icm20948.cpp

@@ -1,5 +1,5 @@
 /*
-* @file icm20948.c
+* @file icm20948.cpp
 *
 *  Created on: Dec 26, 2020
 *      Author: mokhwasomssi (ANSII C version)

+ 1 - 1
src/icm20948.h

@@ -13,7 +13,7 @@
 #define	__ICM20948_H__
 
 #include "IcmSpiManager.h"
-#include "icm_datatypes.h"
+
 #include <stdbool.h>
 
 

+ 14 - 11
src/icm_datatypes.h

@@ -16,6 +16,10 @@
 #include "stm32l4xx_hal.h"
 #endif
 
+#if defined (STM32L031xx)
+#include "stm32l0xx_hal.h"
+#endif
+
 #define ICM20948_ACCEL					0x10
 #define ICM20948_GYRO					0x20
 #define ICM20948_MAG					0x30
@@ -177,35 +181,34 @@ typedef struct{
     uint16_t pin;
 }McuPin_typeDef;
 
-
 typedef struct
 {
-	accel_dlp_cfg low_pass_filter = ACCEL_lpf_OFF;
-	accel_samplerate sample_rate = ACCEL_samplerate_562_5Hz;
-	accel_full_scale full_scale = _4g;
+	accel_dlp_cfg low_pass_filter;// = ACCEL_lpf_OFF;
+	accel_samplerate sample_rate;// = ACCEL_samplerate_562_5Hz;
+	accel_full_scale full_scale;// = _4g;
 }Config_Accel_t;
 
 typedef struct
 {
-	gyro_dlp_cfg low_pass_filter = GYRO_low_pass_OFF;
-	gyro_samplerate sample_rate = GYRO_samplerate_375_0Hz;
-	gyro_full_scale full_scale = _250dps;
+	gyro_dlp_cfg low_pass_filter;// = GYRO_low_pass_OFF;
+	gyro_samplerate sample_rate;// = GYRO_samplerate_375_0Hz;
+	gyro_full_scale full_scale;// = _250dps;
 }Config_Gyro_t;
 
 typedef struct
 {
-	AK09916_operation_mode mode = mag_mode_power_down;
+	AK09916_operation_mode mode;// = mag_mode_power_down;
 }Config_Mag_t;
 
 typedef struct
 {
-	McuPin_typeDef *pinCS = NULL;
+	McuPin_typeDef *pinCS;// = NULL;
 	//McuPin_typeDef *pinINT = NULL;
-	McuPin_typeDef *pinLED = NULL;
+	McuPin_typeDef *pinLED;// = NULL;
 	Config_Accel_t accel;
 	Config_Gyro_t gyro;
 	Config_Mag_t mag;
-	interrupt_source_enum int_source = interrupt_disable;
+	interrupt_source_enum int_source;// = interrupt_disable;
 }icm20948_Config;