Merge branch 'release-candidate-accelerometer-v0.0.1'

SnapperGPS · Jul 23, 2023 · e7c4cad · e7c4cad
2 parents d3f31b0 + 133e1ee
commit e7c4cad
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 44 deletions.
diff --git a/firmware_versions/snapper-accelerometer/inc/accelerometer.h b/firmware_versions/snapper-accelerometer/inc/accelerometer.h
@@ -48,4 +48,6 @@ void Accelerometer_enableInterface();
 // Disable I2C for LIS3DH
 void Accelerometer_disableInterface();
 
+bool Accelerometer_isAvailable();
+
 #endif /* __ACCELEROMETER_H */
diff --git a/firmware_versions/snapper-accelerometer/src/accelerometer.c b/firmware_versions/snapper-accelerometer/src/accelerometer.c
@@ -30,7 +30,6 @@
 // address = 0x19.
 #define LIS3DH_I2C_ADDRESS          0b0011001
 
-
 // Registers
 #define LIS3DH_AUX          0x07
 #define LIS3DH_CTRL_REG0    0x1E
@@ -49,6 +48,12 @@
 #define LIS3DH_FIFO_CTRL    0x2E
 #define LIS3DH_WHO_AM_I     0x0F
 
+// Content of the WHO_AM_I register
+#define LIS3DH_ID                   0b00110011
+
+// Constants
+#define TIMEOUT             10000
+
 // I2C variables
 
 static volatile I2C_TransferReturn_TypeDef status;
@@ -90,9 +95,13 @@ static void read(uint8_t *message, uint8_t *data, int32_t messageLength, int32_t
 
     status = I2C_TransferInit(I2C0, &seq);
 
-    while (status == i2cTransferInProgress) {
+    uint32_t counter = 0;
 
-        EMU_EnterEM1();
+    while (status == i2cTransferInProgress && counter < TIMEOUT) {
+
+        // EMU_EnterEM1();
+
+        ++counter;
 
     }
 
@@ -348,3 +357,11 @@ void Accelerometer_disableInterface() {
     NVIC_DisableIRQ(I2C0_IRQn);
 
 }
+
+bool Accelerometer_isAvailable() {
+
+    uint8_t whoAmI = Accelerometer_whoAmI();
+
+    return whoAmI == LIS3DH_ID;
+
+}
diff --git a/firmware_versions/snapper-accelerometer/src/main.c b/firmware_versions/snapper-accelerometer/src/main.c
@@ -266,7 +266,7 @@ static volatile bool loadFirmware = false;
 
 /* Firmware version */
 
-static uint8_t firmwareVersion[FIRMWARE_VERSION_LENGTH] = {0, 0, 1};
+static uint8_t firmwareVersion[FIRMWARE_VERSION_LENGTH] = {0, 0, 2};
 
 static uint8_t firmwareDescription[FIRMWARE_DESCRIPTION_LENGTH] = "SnapperGPS-Accelerometer";
 
@@ -282,7 +282,7 @@ static int16_t y = 0;
 
 static int16_t z = 0;
 
-static uint8_t ctrlReg[7] = {42, 42, 42, 42, 42, 42, 42};
+static uint8_t ctrlReg[7] = {0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF};
 
 // Create acceleration arrays at same location as transmitBuffer
 int16_t *accelerationsX = (int16_t*) transmitBuffer;
@@ -1049,14 +1049,12 @@ int main(void) {
 
         Accelerometer_enableInterface();
 
-        // Wait until accelerometer is available
-        uint8_t id = Accelerometer_whoAmI();
-        while (id != 0b00110011) {
-            Timer_delayMicroseconds(500);
-            id = Accelerometer_whoAmI();
-        }
+        // Check if accelerometer is available
+        if (Accelerometer_isAvailable()) {
+
+            Accelerometer_enableLowPowerMode();
 
-        Accelerometer_enableLowPowerMode();
+        }
 
         Accelerometer_disableInterface();
 
@@ -1130,29 +1128,36 @@ int main(void) {
 
             Accelerometer_enableInterface();
 
-            // Wait until accelerometer is available
-            uint8_t id = Accelerometer_whoAmI();
-            while (id != 0b00110011) {
-                Timer_delayMicroseconds(500);
-                id = Accelerometer_whoAmI();
-            }
+            // Check if accelerometer is available
+            if (Accelerometer_isAvailable()) {
 
-            Accelerometer_selectDataRate(1);
+                Accelerometer_selectDataRate(1);
 
-            // Wait until accelerometer data is available
-            bool dataAvailable = Accelerometer_isNewDataAvailable();
-            while (!dataAvailable) {
-                Timer_delayMicroseconds(500);
-                dataAvailable = Accelerometer_isNewDataAvailable();
-            }
+                // Wait until accelerometer data is available
+                bool dataAvailable = Accelerometer_isNewDataAvailable();
+                while (!dataAvailable) {
+                    Timer_delayMicroseconds(500);
+                    dataAvailable = Accelerometer_isNewDataAvailable();
+                }
 
-            enableGreenLED(true);
+                enableGreenLED(true);
+
+                Accelerometer_readXYZ(&x, &y, &z);
 
-            Accelerometer_readXYZ(&x, &y, &z);
+                Accelerometer_readCtrlReg(ctrlReg);
 
-            Accelerometer_readCtrlReg(ctrlReg);
+                Accelerometer_selectDataRate(0);
 
-            Accelerometer_selectDataRate(0);
+            } else {
+
+                x = 0;
+                y = 0;
+                z = 0;
+                for (uint8_t i = 0; i < 7; ++i) {
+                    ctrlReg[i] = 0;
+                }
+
+            }
 
             Accelerometer_disableInterface();
 
@@ -1362,25 +1367,29 @@ int main(void) {
 
                         Accelerometer_enableInterface();
 
-                        // Wait until accelerometer is available
-                        uint8_t id = Accelerometer_whoAmI();
-                        while (id != 0b00110011) {
-                            Timer_delayMicroseconds(500);
-                            id = Accelerometer_whoAmI();
-                        }
+                        // Check if accelerometer is available
+                        if (Accelerometer_isAvailable()) {
 
-                        Accelerometer_selectDataRate(1);
+                            Accelerometer_selectDataRate(1);
 
-                        // Wait until accelerometer data is available
-                        bool dataAvailable = Accelerometer_isNewDataAvailable();
-                        while (!dataAvailable) {
-                            Timer_delayMicroseconds(500);
-                            dataAvailable = Accelerometer_isNewDataAvailable();
-                        }
+                            // Wait until accelerometer data is available
+                            bool dataAvailable = Accelerometer_isNewDataAvailable();
+                            while (!dataAvailable) {
+                                Timer_delayMicroseconds(500);
+                                dataAvailable = Accelerometer_isNewDataAvailable();
+                            }
 
-                        Accelerometer_readXYZ(&x, &y, &z);
+                            Accelerometer_readXYZ(&x, &y, &z);
 
-                        Accelerometer_selectDataRate(0);
+                            Accelerometer_selectDataRate(0);
+
+                        } else {
+
+                            x = 0;
+                            y = 0;
+                            z = 0;
+
+                        }
 
                         Accelerometer_disableInterface();