diff --git a/css/doxygen-awesome.css b/css/doxygen-awesome.css index ca356d5..a1f714a 100755 --- a/css/doxygen-awesome.css +++ b/css/doxygen-awesome.css @@ -1,3 +1,48 @@ +/** + * Make documents looks a bit more like GitHub markdown + * from https://github.com/piconomix/doxygen-github-markdown-theme/blob/master/doxygen_extra.css + */ + +.contents hr { + box-shadow: unset!important; +} + +h1, h2, h3, h4, h5, h6 { + margin-top: 24px; + margin-bottom: 16px; + font-weight: 600; + line-height: 1.25; +} + +h1 { + font-size: 2em; + padding-bottom: 0.3em; + border-bottom: 1px solid var(--separator-color); +} + +h2 { + padding-bottom: 0.3em; + font-size: 1.5em; + border-bottom: 1px solid var(--separator-color); +} + +h3 { + font-size: 1.25em; +} + +h4 { + font-size: 1em; +} + +h5 { + font-size: 0.875em; +} + +h6 { + font-size: 0.85em; + color: #57606a; +} + /** Doxygen Awesome diff --git a/html/A3G4250D_8h.html b/html/A3G4250D_8h.html deleted file mode 100644 index 3798a59..0000000 --- a/html/A3G4250D_8h.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/gyro/A3G4250D.h File Reference - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - - - - - - - -
-
- -
-
-
- -
- -
-
- - -
-
-
-
-
-
Loading...
-
Searching...
-
No Matches
-
-
-
-
- -
- -
A3G4250D.h File Reference
-
-
-
#include "stm32f439xx.h"
-#include "string.h"
-#include "devices.h"
-#include "spi.h"
-
-

Go to the source code of this file.

- - - - -

-Data Structures

struct  A3G4250D
 
- - - - - - - - - - - - - - - - -

-Functions

DeviceHandle_t A3G4250D_init (A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *)
 Initialiser for a A3G4250D gyroscope.
 
void A3G4250D_update (A3G4250D *)
 Updates internally stored gyro readings.
 
void A3G4250D_readGyro (A3G4250D *, float *)
 Read 3-axis floating point gyro rates.
 
void A3G4250D_readRawBytes (A3G4250D *, uint8_t *)
 Read raw 3-axis data.
 
void A3G4250D_processRawBytes (A3G4250D *, uint8_t *, float *)
 Process raw 3-axis data to floating point gyro rates.
 
-
-
- - - - diff --git a/html/A3G4250D_8h.js b/html/A3G4250D_8h.js deleted file mode 100644 index 5346b71..0000000 --- a/html/A3G4250D_8h.js +++ /dev/null @@ -1,8 +0,0 @@ -var A3G4250D_8h = -[ - [ "A3G4250D_init", "group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7", null ], - [ "A3G4250D_update", "group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56", null ], - [ "A3G4250D_readGyro", "group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d", null ], - [ "A3G4250D_readRawBytes", "group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef", null ], - [ "A3G4250D_processRawBytes", "group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198", null ] -]; \ No newline at end of file diff --git a/html/BMP581_8h.html b/html/BMP581_8h.html deleted file mode 100644 index d32407e..0000000 --- a/html/BMP581_8h.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/baro/BMP581.h File Reference - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - - - - - - - -
-
- -
-
-
- -
- -
-
- - -
-
-
-
-
-
Loading...
-
Searching...
-
No Matches
-
-
-
-
- -
- -
BMP581.h File Reference
-
-
-
#include "stm32f439xx.h"
-#include "string.h"
-#include "devices.h"
-#include "spi.h"
-
-

Go to the source code of this file.

- - - - -

-Data Structures

struct  BMP581
 
- - - - - - - - - - - - - - - - - - - - - -

-Functions

DeviceHandle_t BMP581_init (BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float)
 Initialiser for a BMP581 barometer.
 
void BMP581_update (BMP581 *)
 Updates the BMP581 barometer readings.
 
void BMP581_readTemp (BMP581 *, float *)
 Read the temperature from the BMP581 sensor.
 
void BMP581_readPress (BMP581 *, float *)
 
void BMP581_readRawTemp (BMP581 *, uint8_t *)
 
void BMP581_readRawPress (BMP581 *, uint8_t *)
 
void BMP581_processRawTemp (BMP581 *, uint8_t *, float *)
 Processes raw temperature data from BMP581 sensor.
 
void BMP581_processRawPress (BMP581 *, uint8_t *, float *)
 
-

Detailed Description

-
Todo
Document interface
- -

Definition in file BMP581.h.

-
-
- - - - diff --git a/html/BMP581_8h.js b/html/BMP581_8h.js deleted file mode 100644 index e2eb040..0000000 --- a/html/BMP581_8h.js +++ /dev/null @@ -1,11 +0,0 @@ -var BMP581_8h = -[ - [ "BMP581_init", "group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d", null ], - [ "BMP581_update", "group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473", null ], - [ "BMP581_readTemp", "group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34", null ], - [ "BMP581_readPress", "group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb", null ], - [ "BMP581_readRawTemp", "group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163", null ], - [ "BMP581_readRawPress", "group__BMP581.html#ga079e56e39011d47394cd00238096b832", null ], - [ "BMP581_processRawTemp", "group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f", null ], - [ "BMP581_processRawPress", "group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67", null ] -]; \ No newline at end of file diff --git a/html/KX134__1211_8h.html b/html/KX134__1211_8h.html deleted file mode 100644 index 196093a..0000000 --- a/html/KX134__1211_8h.html +++ /dev/null @@ -1,147 +0,0 @@ - - - - - - - - -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/accel/KX134_1211.h File Reference - - - - - - - - - - - - - - - - - - - - - -
-
- -
- - - - - - - - -
-
- -
-
-
- -
- -
-
- - -
-
-
-
-
-
Loading...
-
Searching...
-
No Matches
-
-
-
-
- -
- -
KX134_1211.h File Reference
-
-
-
#include "stm32f439xx.h"
-#include "string.h"
-#include "devices.h"
-#include "spi.h"
-
-

Go to the source code of this file.

- - - - -

-Data Structures

struct  KX134_1211
 
- - - - - - - - - - - - - - - - -

-Functions

DeviceHandle_t KX134_1211_init (KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *)
 Initialiser for a KX134-1211 accelerometer.
 
void KX134_1211_update (KX134_1211 *)
 Updates internally stored acceleration readings.
 
void KX134_1211_readAccel (KX134_1211 *, float *)
 Read 3-axis floating point accelerations.
 
void KX134_1211_readRawBytes (KX134_1211 *, uint8_t *)
 Read raw 3-axis data.
 
void KX134_1211_processRawBytes (KX134_1211 *, uint8_t *, float *)
 Process raw 3-axis data to floating point accelerations.
 
-
-
- - - - diff --git a/html/KX134__1211_8h.js b/html/KX134__1211_8h.js deleted file mode 100644 index 5106c55..0000000 --- a/html/KX134__1211_8h.js +++ /dev/null @@ -1,8 +0,0 @@ -var KX134__1211_8h = -[ - [ "KX134_1211_init", "group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3", null ], - [ "KX134_1211_update", "group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b", null ], - [ "KX134_1211_readAccel", "group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c", null ], - [ "KX134_1211_readRawBytes", "group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623", null ], - [ "KX134_1211_processRawBytes", "group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b", null ] -]; \ No newline at end of file diff --git a/html/A3G4250D_8c_source.html b/html/a3g4250d_8c_source.html similarity index 95% rename from html/A3G4250D_8c_source.html rename to html/a3g4250d_8c_source.html index 15f9cfe..36cc526 100644 --- a/html/A3G4250D_8c_source.html +++ b/html/a3g4250d_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/gyro/A3G4250D.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/gyro/a3g4250d.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
A3G4250D.c
+
a3g4250d.c
1/***********************************************************************************
@@ -112,7 +112,7 @@
9 * @{ *
10 ***********************************************************************************/
11
-
12#include "A3G4250D.h"
+
12#include "a3g4250d.h"
13#include "devices.h"
14
15/* =============================================================================== */
@@ -225,25 +225,24 @@
155 return response;
156}
157
- -
void A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *)
Process raw 3-axis data to floating point gyro rates.
Definition A3G4250D.c:101
-
void A3G4250D_readGyro(A3G4250D *, float *)
Read 3-axis floating point gyro rates.
Definition A3G4250D.c:72
-
void A3G4250D_readRawBytes(A3G4250D *, uint8_t *)
Read raw 3-axis data.
Definition A3G4250D.c:116
-
DeviceHandle_t A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign)
Initialiser for a A3G4250D gyroscope.
Definition A3G4250D.c:27
-
void A3G4250D_update(A3G4250D *)
Updates internally stored gyro readings.
Definition A3G4250D.c:86
+
void A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *)
Process raw 3-axis data to floating point gyro rates.
Definition a3g4250d.c:101
+
void A3G4250D_readGyro(A3G4250D *, float *)
Read 3-axis floating point gyro rates.
Definition a3g4250d.c:72
+
void A3G4250D_readRawBytes(A3G4250D *, uint8_t *)
Read raw 3-axis data.
Definition a3g4250d.c:116
+
DeviceHandle_t A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign)
Initialiser for a A3G4250D gyroscope.
Definition a3g4250d.c:27
+
void A3G4250D_update(A3G4250D *)
Updates internally stored gyro readings.
Definition a3g4250d.c:86
void SPI_init(SPI *, DeviceType, SPI_TypeDef *, DataFormat, GPIO_TypeDef *, unsigned long)
Initialiser for an SPI device interface.
Definition spi.c:32
@ SENSOR_GYRO
Gyroscope.
Definition spi.h:30
- -
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition A3G4250D.h:49
-
SPI base
Parent SPI interface.
Definition A3G4250D.h:41
-
void(* readRawBytes)(struct A3G4250D *, uint8_t *)
Raw gyro read method.
Definition A3G4250D.h:45
-
int8_t sign[A3G4250D_DATA_COUNT]
Array defining sign of axes.
Definition A3G4250D.h:48
-
uint8_t axes[A3G4250D_DATA_COUNT]
Array defining axes of mounting.
Definition A3G4250D.h:47
-
void(* readGyro)(struct A3G4250D *, float *)
Gyro read method.
Definition A3G4250D.h:44
-
float sensitivity
Gyroscope sensitivity.
Definition A3G4250D.h:42
-
void(* processRawBytes)(struct A3G4250D *, uint8_t *, float *)
Process raw gyro method.
Definition A3G4250D.h:46
-
void(* update)(struct A3G4250D *)
Gyro update method.
Definition A3G4250D.h:43
-
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition A3G4250D.h:50
+ +
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition a3g4250d.h:49
+
SPI base
Parent SPI interface.
Definition a3g4250d.h:41
+
void(* readRawBytes)(struct A3G4250D *, uint8_t *)
Raw gyro read method.
Definition a3g4250d.h:45
+
int8_t sign[A3G4250D_DATA_COUNT]
Array defining sign of axes.
Definition a3g4250d.h:48
+
uint8_t axes[A3G4250D_DATA_COUNT]
Array defining axes of mounting.
Definition a3g4250d.h:47
+
void(* readGyro)(struct A3G4250D *, float *)
Gyro read method.
Definition a3g4250d.h:44
+
float sensitivity
Gyroscope sensitivity.
Definition a3g4250d.h:42
+
void(* processRawBytes)(struct A3G4250D *, uint8_t *, float *)
Process raw gyro method.
Definition a3g4250d.h:46
+
void(* update)(struct A3G4250D *)
Gyro update method.
Definition a3g4250d.h:43
+
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition a3g4250d.h:50
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
uint16_t(* transmit)(struct SPI *, uint16_t)
SPI transmit method.
Definition spi.h:56
@@ -254,7 +253,7 @@ diff --git a/html/A3G4250D_8h_source.html b/html/a3g4250d_8h_source.html similarity index 93% rename from html/A3G4250D_8h_source.html rename to html/a3g4250d_8h_source.html index c9b886c..cc12549 100644 --- a/html/A3G4250D_8h_source.html +++ b/html/a3g4250d_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/gyro/A3G4250D.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/gyro/a3g4250d.h Source File @@ -72,7 +72,7 @@
@@ -98,10 +98,10 @@
-
A3G4250D.h
+
a3g4250d.h
-Go to the documentation of this file.
1
+
1
7
8#ifndef _A3G4250D_H
9#define _A3G4250D_H
@@ -154,22 +154,22 @@
60void A3G4250D_writeRegister(A3G4250D *, uint8_t, uint8_t);
61
63#endif
-
void A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *)
Process raw 3-axis data to floating point gyro rates.
Definition A3G4250D.c:101
-
void A3G4250D_readGyro(A3G4250D *, float *)
Read 3-axis floating point gyro rates.
Definition A3G4250D.c:72
-
void A3G4250D_readRawBytes(A3G4250D *, uint8_t *)
Read raw 3-axis data.
Definition A3G4250D.c:116
-
DeviceHandle_t A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *)
Initialiser for a A3G4250D gyroscope.
Definition A3G4250D.c:27
-
void A3G4250D_update(A3G4250D *)
Updates internally stored gyro readings.
Definition A3G4250D.c:86
- -
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition A3G4250D.h:49
-
SPI base
Parent SPI interface.
Definition A3G4250D.h:41
-
void(* readRawBytes)(struct A3G4250D *, uint8_t *)
Raw gyro read method.
Definition A3G4250D.h:45
-
int8_t sign[A3G4250D_DATA_COUNT]
Array defining sign of axes.
Definition A3G4250D.h:48
-
uint8_t axes[A3G4250D_DATA_COUNT]
Array defining axes of mounting.
Definition A3G4250D.h:47
-
void(* readGyro)(struct A3G4250D *, float *)
Gyro read method.
Definition A3G4250D.h:44
-
float sensitivity
Gyroscope sensitivity.
Definition A3G4250D.h:42
-
void(* processRawBytes)(struct A3G4250D *, uint8_t *, float *)
Process raw gyro method.
Definition A3G4250D.h:46
-
void(* update)(struct A3G4250D *)
Gyro update method.
Definition A3G4250D.h:43
-
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition A3G4250D.h:50
+
void A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *)
Process raw 3-axis data to floating point gyro rates.
Definition a3g4250d.c:101
+
void A3G4250D_readGyro(A3G4250D *, float *)
Read 3-axis floating point gyro rates.
Definition a3g4250d.c:72
+
void A3G4250D_readRawBytes(A3G4250D *, uint8_t *)
Read raw 3-axis data.
Definition a3g4250d.c:116
+
DeviceHandle_t A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *)
Initialiser for a A3G4250D gyroscope.
Definition a3g4250d.c:27
+
void A3G4250D_update(A3G4250D *)
Updates internally stored gyro readings.
Definition a3g4250d.c:86
+ +
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition a3g4250d.h:49
+
SPI base
Parent SPI interface.
Definition a3g4250d.h:41
+
void(* readRawBytes)(struct A3G4250D *, uint8_t *)
Raw gyro read method.
Definition a3g4250d.h:45
+
int8_t sign[A3G4250D_DATA_COUNT]
Array defining sign of axes.
Definition a3g4250d.h:48
+
uint8_t axes[A3G4250D_DATA_COUNT]
Array defining axes of mounting.
Definition a3g4250d.h:47
+
void(* readGyro)(struct A3G4250D *, float *)
Gyro read method.
Definition a3g4250d.h:44
+
float sensitivity
Gyroscope sensitivity.
Definition a3g4250d.h:42
+
void(* processRawBytes)(struct A3G4250D *, uint8_t *, float *)
Process raw gyro method.
Definition a3g4250d.h:46
+
void(* update)(struct A3G4250D *)
Gyro update method.
Definition a3g4250d.h:43
+
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition a3g4250d.h:50
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
@@ -177,7 +177,7 @@ diff --git a/html/baro_8c_source.html b/html/baro_8c_source.html index 0952e1c..d7b2877 100644 --- a/html/baro_8c_source.html +++ b/html/baro_8c_source.html @@ -142,7 +142,7 @@
void(* print)(struct UART *, char *)
UART print string method.
Definition uart.h:62
Definition shell.h:34
- +
DeviceType device
Enum specifier for device type.
Definition spi.h:50
diff --git a/html/baro_8h.html b/html/baro_8h.html index a16b122..5535f4f 100644 --- a/html/baro_8h.html +++ b/html/baro_8h.html @@ -102,7 +102,7 @@
#include "stdio.h"
-#include "BMP581.h"
+#include "bmp581.h"
#include "devices.h"
#include "shell.h"
#include "uart.h"
diff --git a/html/baro_8h_source.html b/html/baro_8h_source.html index e758023..688cedb 100644 --- a/html/baro_8h_source.html +++ b/html/baro_8h_source.html @@ -108,13 +108,12 @@
9
10#include "stdio.h"
11
-
12#include "BMP581.h"
+
12#include "bmp581.h"
13#include "devices.h"
14#include "shell.h"
15#include "uart.h"
16
17#endif
-
diff --git a/html/BMP581_8c_source.html b/html/bmp581_8c_source.html similarity index 71% rename from html/BMP581_8c_source.html rename to html/bmp581_8c_source.html index df16328..b94450e 100644 --- a/html/BMP581_8c_source.html +++ b/html/bmp581_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/baro/BMP581.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/baro/bmp581.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
BMP581.c
+
bmp581.c
1/***********************************************************************************
@@ -114,7 +114,7 @@
11 * @{ *
12 ***********************************************************************************/
13
-
14#include "BMP581.h"
+
14#include "bmp581.h"
15
16/* =============================================================================== */
@@ -127,173 +127,174 @@
33 float pressSensitivity
34) {
35 SPI_init(&baro->base, SENSOR_BARO, SPI1, MODE8, port, cs);
-
36 baro->tempSensitivity = tempSensitivity;
-
37 baro->pressSensitivity = pressSensitivity;
-
38 baro->update = BMP581_update;
-
39 baro->readTemp = BMP581_readTemp;
-
40 baro->readRawTemp = BMP581_readRawTemp;
-
41 baro->processRawTemp = BMP581_processRawTemp;
-
42 baro->readPress = BMP581_readPress;
-
43 baro->readRawPress = BMP581_readRawPress;
-
44 baro->processRawPress = BMP581_processRawPress;
+
36 baro->tempSensitivity = tempSensitivity;
+
37 baro->pressSensitivity = pressSensitivity;
+
38 baro->update = BMP581_update;
+
39 baro->readTemp = BMP581_readTemp;
+
40 baro->readRawTemp = BMP581_readRawTemp;
+
41 baro->processRawTemp = BMP581_processRawTemp;
+
42 baro->readPress = BMP581_readPress;
+
43 baro->readRawPress = BMP581_readRawPress;
+
44 baro->processRawPress = BMP581_processRawPress;
45
-
46 // Initial dummy read
-
47 BMP581_readRegister(baro, 0x01);
-
48
-
49 // Soft reset device
-
50 BMP581_writeRegister(baro, BMP581_CMD, 0xB6);
-
51
-
52 while(BMP581_readRegister(baro, BMP581_CHIP_ID) == 0x00); // Check chip ID
-
53 while(BMP581_readRegister(baro, BMP581_INT_STATUS) != 0x10); // Wait for POR complete
-
54 while(!(BMP581_readRegister(baro, BMP581_STATUS) & BMP581_STATUS_NVM_RDY)); // Check device status NVM ready
-
55 while((BMP581_readRegister(baro, BMP581_STATUS) & BMP581_STATUS_NVM_ERR)); // Check device status NVM err
-
56
-
57 volatile uint8_t counter = 0;
-
58
-
59
-
60
-
61 BMP581_writeRegister(baro, BMP581_ODR_CFG, BMP581_ODR_CFG_DEEP_DIS); // Disable deep sleep
-
62 for (uint32_t i = 0; i < 0x1FFFF; i++) {counter++;} // Wait for at least t_standby
-
63 BMP581_writeRegister(baro, BMP581_ODR_CFG, BMP581_ODR_CFG_DEEP_DIS | BMP581_ODR_CFG_PWR_CONTINUOUS); // Set continuous sample
-
64
+
46 // Initial dummy read
+
47 BMP581_readRegister(baro, 0x01);
+
48
+
49 // Soft reset device
+
50 BMP581_writeRegister(baro, BMP581_CMD, 0xB6);
+
51
+
52 while (BMP581_readRegister(baro, BMP581_CHIP_ID) == 0x00); // Check chip ID
+
53 while (BMP581_readRegister(baro, BMP581_INT_STATUS) != 0x10); // Wait for POR complete
+
54 while (!(BMP581_readRegister(baro, BMP581_STATUS) & BMP581_STATUS_NVM_RDY)); // Check device status NVM ready
+
55 while ((BMP581_readRegister(baro, BMP581_STATUS) & BMP581_STATUS_NVM_ERR)); // Check device status NVM err
+
56
+
57 volatile uint8_t counter = 0;
+
58
+
59 BMP581_writeRegister(baro, BMP581_ODR_CFG, BMP581_ODR_CFG_DEEP_DIS); // Disable deep sleep
+
60 for (uint32_t i = 0; i < 0x1FFFF; i++) {
+
61 counter++;
+
62 } // Wait for at least t_standby
+
63 BMP581_writeRegister(baro, BMP581_ODR_CFG, BMP581_ODR_CFG_DEEP_DIS | BMP581_ODR_CFG_PWR_CONTINUOUS); // Set continuous sample
+
64
65 uint8_t OSRCFG = BMP581_readRegister(baro, BMP581_OSR_CFG);
66 BMP581_writeRegister(baro, BMP581_OSR_CFG, (BMP581_OSR_CFG_RESERVED & OSRCFG) | BMP581_OSR_CFG_PRESS_EN | BMP581_OSR_CFG_OSR_P_16);
67
-
68 // Set ground pressure reading on init
-
69 for (uint32_t i = 0; i < 0x1FFFF; i++) {counter++;} // Wait for at least t_reconf
-
70 baro->readPress(baro, &baro->groundPress); // Read current pressure
-
71
-
72 DeviceHandle_t handle;
-
73 strcpy(handle.name, name);
-
74 handle.device = baro;
-
75 return handle;
-
76}
+
68 // Set ground pressure reading on init
+
69 for (uint32_t i = 0; i < 0x1FFFF; i++) {
+
70 counter++;
+
71 } // Wait for at least t_reconf
+
72 baro->readPress(baro, &baro->groundPress); // Read current pressure
+
73
+
74 DeviceHandle_t handle;
+
75 strcpy(handle.name, name);
+
76 handle.device = baro;
+
77 return handle;
+
78}
-
77
-
78/******************************** DEVICE METHODS ********************************/
79
-
80/* =============================================================================== */
-
-
87void BMP581_update(BMP581 *baro) {
-
88 baro->readRawTemp(baro, baro->rawTemp);
-
89 baro->processRawTemp(baro, baro->rawTemp, &baro->temp);
-
90
-
91 baro->readRawPress(baro, baro->rawPress);
-
92 baro->processRawPress(baro, baro->rawPress, &baro->press);
-
93}
+
80/******************************** DEVICE METHODS ********************************/
+
81
+
82/* =============================================================================== */
+
+
89void BMP581_update(BMP581 *baro) {
+
90 baro->readRawTemp(baro, baro->rawTemp);
+
91 baro->processRawTemp(baro, baro->rawTemp, &baro->temp);
+
92
+
93 baro->readRawPress(baro, baro->rawPress);
+
94 baro->processRawPress(baro, baro->rawPress, &baro->press);
+
95}
-
94
-
95/* =============================================================================== */
-
-
103void BMP581_readTemp(BMP581 *baro, float *out) {
-
104 uint8_t bytes[BMP581_DATA_TOTAL];
-
105 baro->readRawTemp(baro, bytes);
-
106 baro->processRawTemp(baro, bytes, out);
-
107}
+
96
+
97/* =============================================================================== */
+
+
105void BMP581_readTemp(BMP581 *baro, float *out) {
+
106 uint8_t bytes[BMP581_DATA_TOTAL];
+
107 baro->readRawTemp(baro, bytes);
+
108 baro->processRawTemp(baro, bytes, out);
+
109}
-
108
-
109/* =============================================================================== */
-
-
118void BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out) {
-
119 *out = baro->tempSensitivity * (int32_t)(((uint32_t)bytes[0] << 16) | ((uint32_t)bytes[1] << 8) | bytes[0]);
-
120}
+
110
+
111/* =============================================================================== */
+
+
120void BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out) {
+
121 *out = baro->tempSensitivity * (int32_t)(((uint32_t)bytes[0] << 16) | ((uint32_t)bytes[1] << 8) | bytes[0]);
+
122}
-
121
-
122/* =============================================================================== */
-
-
130void BMP581_readRawTemp(BMP581 *baro, uint8_t *out) {
-
131 out[0] = BMP581_readRegister(baro, BMP581_TEMPERATURE_MSB); // temp high
-
132 out[1] = BMP581_readRegister(baro, BMP581_TEMPERATURE_LSB); // temp low
-
133 out[2] = BMP581_readRegister(baro, BMP581_TEMPERATURE_XLSB); // temp mid
-
134}
+
123
+
124/* =============================================================================== */
+
+
132void BMP581_readRawTemp(BMP581 *baro, uint8_t *out) {
+
133 out[0] = BMP581_readRegister(baro, BMP581_TEMPERATURE_MSB); // temp high
+
134 out[1] = BMP581_readRegister(baro, BMP581_TEMPERATURE_LSB); // temp low
+
135 out[2] = BMP581_readRegister(baro, BMP581_TEMPERATURE_XLSB); // temp mid
+
136}
-
135
-
136/* =============================================================================== */
-
-
144void BMP581_readPress(BMP581 *baro, float *out) {
-
145 uint8_t bytes[BMP581_DATA_TOTAL];
-
146 baro->readRawPress(baro, bytes);
-
147 baro->processRawPress(baro, bytes, out);
-
148}
+
137
+
138/* =============================================================================== */
+
+
146void BMP581_readPress(BMP581 *baro, float *out) {
+
147 uint8_t bytes[BMP581_DATA_TOTAL];
+
148 baro->readRawPress(baro, bytes);
+
149 baro->processRawPress(baro, bytes, out);
+
150}
-
149
-
150/* =============================================================================== */
-
-
158void BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out) {
-
159 *out = baro->pressSensitivity * (int32_t)(((uint32_t)bytes[0] << 16) | ((uint32_t)bytes[1] << 8) | bytes[0]);
-
160}
+
151
+
152/* =============================================================================== */
+
+
160void BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out) {
+
161 *out = baro->pressSensitivity * (int32_t)(((uint32_t)bytes[0] << 16) | ((uint32_t)bytes[1] << 8) | bytes[0]);
+
162}
-
161
-
162/* =============================================================================== */
-
-
170void BMP581_readRawPress(BMP581 *baro, uint8_t *out) {
-
171 uint8_t tmp[BMP581_DATA_SIZE];
-
172 BMP581_readRegisters(baro, BMP581_PRESSURE_XLSB, BMP581_DATA_SIZE, tmp);
-
173 out[0] = tmp[2]; // temp high
-
174 out[1] = tmp[1]; // temp low
-
175 out[2] = tmp[0]; // temp mid
-
176}
+
163
+
164/* =============================================================================== */
+
+
172void BMP581_readRawPress(BMP581 *baro, uint8_t *out) {
+
173 uint8_t tmp[BMP581_DATA_SIZE];
+
174 BMP581_readRegisters(baro, BMP581_PRESSURE_XLSB, BMP581_DATA_SIZE, tmp);
+
175 out[0] = tmp[2]; // temp high
+
176 out[1] = tmp[1]; // temp low
+
177 out[2] = tmp[0]; // temp mid
+
178}
-
177
-
178/******************************** INTERFACE METHODS ********************************/
179
-
180void BMP581_writeRegister(BMP581 *baro, uint8_t address, uint8_t data) {
-
181 SPI spi = baro->base;
-
182
-
183 spi.port->ODR &= ~spi.cs;
+
180/******************************** INTERFACE METHODS ********************************/
+
181
+
182void BMP581_writeRegister(BMP581 *baro, uint8_t address, uint8_t data) {
+
183 SPI spi = baro->base;
184
-
185 // Send read command and address
-
186 uint8_t payload = address & 0x7F; // Load payload with address and read command
-
187 spi.transmit(&spi, payload); // Transmit payload
-
188 spi.transmit(&spi, data); // Transmit dummy data and read response data
-
189
-
190 spi.port->ODR |= spi.cs;
-
191}
-
192
-
193uint8_t BMP581_readRegister(BMP581 *baro, uint8_t address) {
-
194 uint8_t response = 0;
-
195 SPI spi = baro->base;
-
196
-
197 spi.port->ODR &= ~spi.cs;
+
185 spi.port->ODR &= ~spi.cs;
+
186
+
187 // Send read command and address
+
188 uint8_t payload = address & 0x7F; // Load payload with address and read command
+
189 spi.transmit(&spi, payload); // Transmit payload
+
190 spi.transmit(&spi, data); // Transmit dummy data and read response data
+
191
+
192 spi.port->ODR |= spi.cs;
+
193}
+
194
+
195uint8_t BMP581_readRegister(BMP581 *baro, uint8_t address) {
+
196 uint8_t response = 0;
+
197 SPI spi = baro->base;
198
-
199 // Send read command and address
-
200 uint8_t payload = address | 0x80; // Load payload with address and read command
-
201 response = spi.transmit(&spi, payload); // Transmit payload
-
202 response = spi.transmit(&spi, 0xFF); // Transmit dummy data and read response data
-
203
-
204 spi.port->ODR |= spi.cs;
+
199 spi.port->ODR &= ~spi.cs;
+
200
+
201 // Send read command and address
+
202 uint8_t payload = address | 0x80; // Load payload with address and read command
+
203 response = spi.transmit(&spi, payload); // Transmit payload
+
204 response = spi.transmit(&spi, 0xFF); // Transmit dummy data and read response data
205
-
206 return response;
-
207}
-
208
-
209void BMP581_readRegisters(BMP581 *baro, uint8_t address, uint8_t count, uint8_t *out) {
-
210 SPI spi = baro->base;
-
211
-
212 spi.port->ODR &= ~spi.cs;
+
206 spi.port->ODR |= spi.cs;
+
207
+
208 return response;
+
209}
+
210
+
211void BMP581_readRegisters(BMP581 *baro, uint8_t address, uint8_t count, uint8_t *out) {
+
212 SPI spi = baro->base;
213
-
214 // Send read command and address
-
215 uint8_t payload = address | 0x80; // Load payload with address and read command
-
216 spi.transmit(&spi, payload); // Transmit payload
-
217
-
218 // Auto increment read through registers
-
219 for (uint8_t i = 0; i < count; i++) {
-
220 out[i] = spi.transmit(&spi, 0xFF);
-
221 }
-
222
-
223 spi.port->ODR |= spi.cs;
-
224}
- -
void BMP581_readRawPress(BMP581 *, uint8_t *)
Definition BMP581.c:170
-
void BMP581_readTemp(BMP581 *, float *)
Read the temperature from the BMP581 sensor.
Definition BMP581.c:103
-
void BMP581_processRawTemp(BMP581 *, uint8_t *, float *)
Processes raw temperature data from BMP581 sensor.
Definition BMP581.c:118
-
void BMP581_readRawTemp(BMP581 *, uint8_t *)
Definition BMP581.c:130
-
void BMP581_processRawPress(BMP581 *, uint8_t *, float *)
Definition BMP581.c:158
-
void BMP581_update(BMP581 *)
Updates the BMP581 barometer readings.
Definition BMP581.c:87
-
void BMP581_readPress(BMP581 *, float *)
Definition BMP581.c:144
-
DeviceHandle_t BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity)
Initialiser for a BMP581 barometer.
Definition BMP581.c:27
+
214 spi.port->ODR &= ~spi.cs;
+
215
+
216 // Send read command and address
+
217 uint8_t payload = address | 0x80; // Load payload with address and read command
+
218 spi.transmit(&spi, payload); // Transmit payload
+
219
+
220 // Auto increment read through registers
+
221 for (uint8_t i = 0; i < count; i++) {
+
222 out[i] = spi.transmit(&spi, 0xFF);
+
223 }
+
224
+
225 spi.port->ODR |= spi.cs;
+
226}
+
void BMP581_readRawPress(BMP581 *, uint8_t *)
Definition bmp581.c:172
+
void BMP581_readTemp(BMP581 *, float *)
Read the temperature from the BMP581 sensor.
Definition bmp581.c:105
+
void BMP581_processRawTemp(BMP581 *, uint8_t *, float *)
Processes raw temperature data from BMP581 sensor.
Definition bmp581.c:120
+
void BMP581_readRawTemp(BMP581 *, uint8_t *)
Definition bmp581.c:132
+
void BMP581_processRawPress(BMP581 *, uint8_t *, float *)
Definition bmp581.c:160
+
void BMP581_update(BMP581 *)
Updates the BMP581 barometer readings.
Definition bmp581.c:89
+
void BMP581_readPress(BMP581 *, float *)
Definition bmp581.c:146
+
DeviceHandle_t BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity)
Initialiser for a BMP581 barometer.
Definition bmp581.c:27
void SPI_init(SPI *, DeviceType, SPI_TypeDef *, DataFormat, GPIO_TypeDef *, unsigned long)
Initialiser for an SPI device interface.
Definition spi.c:32
@ SENSOR_BARO
Barometer.
Definition spi.h:31
- +
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
uint16_t(* transmit)(struct SPI *, uint16_t)
SPI transmit method.
Definition spi.h:56
@@ -304,7 +305,7 @@ diff --git a/html/BMP581_8h_source.html b/html/bmp581_8h_source.html similarity index 94% rename from html/BMP581_8h_source.html rename to html/bmp581_8h_source.html index 165d2c9..d2cbd16 100644 --- a/html/BMP581_8h_source.html +++ b/html/bmp581_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/baro/BMP581.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/baro/bmp581.h Source File @@ -72,7 +72,7 @@
@@ -98,10 +98,10 @@
-
BMP581.h
+
bmp581.h
-Go to the documentation of this file.
1
+
1
8
9#ifndef _BMP581_H
10#define _BMP581_H
@@ -177,15 +177,15 @@
84void BMP581_writeRegister(BMP581 *, uint8_t, uint8_t);
85
87#endif
-
void BMP581_readRawPress(BMP581 *, uint8_t *)
Definition BMP581.c:170
-
void BMP581_readTemp(BMP581 *, float *)
Read the temperature from the BMP581 sensor.
Definition BMP581.c:103
-
void BMP581_processRawTemp(BMP581 *, uint8_t *, float *)
Processes raw temperature data from BMP581 sensor.
Definition BMP581.c:118
-
void BMP581_readRawTemp(BMP581 *, uint8_t *)
Definition BMP581.c:130
-
void BMP581_processRawPress(BMP581 *, uint8_t *, float *)
Definition BMP581.c:158
-
void BMP581_update(BMP581 *)
Updates the BMP581 barometer readings.
Definition BMP581.c:87
-
void BMP581_readPress(BMP581 *, float *)
Definition BMP581.c:144
-
DeviceHandle_t BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float)
Initialiser for a BMP581 barometer.
Definition BMP581.c:27
- +
void BMP581_readRawPress(BMP581 *, uint8_t *)
Definition bmp581.c:172
+
void BMP581_readTemp(BMP581 *, float *)
Read the temperature from the BMP581 sensor.
Definition bmp581.c:105
+
void BMP581_processRawTemp(BMP581 *, uint8_t *, float *)
Processes raw temperature data from BMP581 sensor.
Definition bmp581.c:120
+
void BMP581_readRawTemp(BMP581 *, uint8_t *)
Definition bmp581.c:132
+
void BMP581_processRawPress(BMP581 *, uint8_t *, float *)
Definition bmp581.c:160
+
void BMP581_update(BMP581 *)
Updates the BMP581 barometer readings.
Definition bmp581.c:89
+
void BMP581_readPress(BMP581 *, float *)
Definition bmp581.c:146
+
DeviceHandle_t BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float)
Initialiser for a BMP581 barometer.
Definition bmp581.c:27
+
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
@@ -193,7 +193,7 @@ diff --git a/html/dir_00d0031141176e17b578304fd0bb058e.html b/html/dir_00d0031141176e17b578304fd0bb058e.html index 11a6226..e0f627c 100644 --- a/html/dir_00d0031141176e17b578304fd0bb058e.html +++ b/html/dir_00d0031141176e17b578304fd0bb058e.html @@ -104,7 +104,7 @@ - +

Files

 A3G4250D.h
 a3g4250d.h
 
diff --git a/html/dir_00d0031141176e17b578304fd0bb058e.js b/html/dir_00d0031141176e17b578304fd0bb058e.js index e944064..8c19c58 100644 --- a/html/dir_00d0031141176e17b578304fd0bb058e.js +++ b/html/dir_00d0031141176e17b578304fd0bb058e.js @@ -1,4 +1,4 @@ var dir_00d0031141176e17b578304fd0bb058e = [ - [ "A3G4250D.h", "A3G4250D_8h.html", "A3G4250D_8h" ] + [ "a3g4250d.h", "a3g4250d_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.html b/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.html index 7945f5c..f196fbd 100644 --- a/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.html +++ b/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.html @@ -104,9 +104,9 @@ - + - +

Directories

 GPS
 gps
 
 USB
 usb
 

diff --git a/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.js b/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.js index ba74a67..ad1d891 100644 --- a/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.js +++ b/html/dir_0ff0f838ef3c02bab5e7f61d156e552e.js @@ -1,6 +1,6 @@ var dir_0ff0f838ef3c02bab5e7f61d156e552e = [ - [ "GPS", "dir_c5d957e1d6edf6e0862fe2c47be63581.html", "dir_c5d957e1d6edf6e0862fe2c47be63581" ], - [ "USB", "dir_4a6d534895bf450f20cc8c4e6cf876fa.html", "dir_4a6d534895bf450f20cc8c4e6cf876fa" ], + [ "gps", "dir_f7335c77276d33bd48fd54b1c7322725.html", "dir_f7335c77276d33bd48fd54b1c7322725" ], + [ "usb", "dir_7ddbe5deeb9defe78a41607f57037c65.html", "dir_7ddbe5deeb9defe78a41607f57037c65" ], [ "uart.h", "uart_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_1b1bd15b55b2c6525256c81993421759.html b/html/dir_1b1bd15b55b2c6525256c81993421759.html index c5b602b..4675d68 100644 --- a/html/dir_1b1bd15b55b2c6525256c81993421759.html +++ b/html/dir_1b1bd15b55b2c6525256c81993421759.html @@ -104,9 +104,9 @@ - + - +

Directories

 GPS
 gps
 
 USB
 usb
 

diff --git a/html/dir_1b1bd15b55b2c6525256c81993421759.js b/html/dir_1b1bd15b55b2c6525256c81993421759.js index dc1c743..a76d6d6 100644 --- a/html/dir_1b1bd15b55b2c6525256c81993421759.js +++ b/html/dir_1b1bd15b55b2c6525256c81993421759.js @@ -1,6 +1,6 @@ var dir_1b1bd15b55b2c6525256c81993421759 = [ - [ "GPS", "dir_79458f2e361a339059eb67427ca72e71.html", "dir_79458f2e361a339059eb67427ca72e71" ], - [ "USB", "dir_a099a532a912b28b348a0b4072f526c3.html", "dir_a099a532a912b28b348a0b4072f526c3" ], + [ "gps", "dir_b267afe36e41846e092a15d779abd09b.html", "dir_b267afe36e41846e092a15d779abd09b" ], + [ "usb", "dir_d5781cb985fe9143d99b85977a90ea8c.html", "dir_d5781cb985fe9143d99b85977a90ea8c" ], [ "uart.c", "uart_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.html b/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.html index b4b8321..f166290 100644 --- a/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.html +++ b/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.html @@ -104,7 +104,7 @@ - +

Files

 A3G4250D.c
 a3g4250d.c
 
diff --git a/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.js b/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.js index 94d037a..a746c7d 100644 --- a/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.js +++ b/html/dir_1b7cbde6291f7cb797cb887fb6f5cb2f.js @@ -1,4 +1,4 @@ var dir_1b7cbde6291f7cb797cb887fb6f5cb2f = [ - [ "A3G4250D.c", "A3G4250D_8c_source.html", null ] + [ "a3g4250d.c", "a3g4250d_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_1cece0f75040df593a078a565a2aed55.html b/html/dir_1cece0f75040df593a078a565a2aed55.html index 96becd5..712e407 100644 --- a/html/dir_1cece0f75040df593a078a565a2aed55.html +++ b/html/dir_1cece0f75040df593a078a565a2aed55.html @@ -104,11 +104,11 @@ - + - + - +

Files

 loraComm.c
 loracomm.c
 
 payloadComm.c
 payloadcomm.c
 
 usbComm.c
 usbcomm.c
 
diff --git a/html/dir_1cece0f75040df593a078a565a2aed55.js b/html/dir_1cece0f75040df593a078a565a2aed55.js index 4a9d6d6..7a715a2 100644 --- a/html/dir_1cece0f75040df593a078a565a2aed55.js +++ b/html/dir_1cece0f75040df593a078a565a2aed55.js @@ -1,6 +1,6 @@ var dir_1cece0f75040df593a078a565a2aed55 = [ - [ "loraComm.c", "loraComm_8c_source.html", null ], - [ "payloadComm.c", "payloadComm_8c_source.html", null ], - [ "usbComm.c", "usbComm_8c_source.html", null ] + [ "loracomm.c", "loracomm_8c_source.html", null ], + [ "payloadcomm.c", "payloadcomm_8c_source.html", null ], + [ "usbcomm.c", "usbcomm_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_22dc605086b4989ac626954ebb63543e.html b/html/dir_22dc605086b4989ac626954ebb63543e.html index cd61e4b..8fcd46b 100644 --- a/html/dir_22dc605086b4989ac626954ebb63543e.html +++ b/html/dir_22dc605086b4989ac626954ebb63543e.html @@ -104,7 +104,7 @@ - +

Files

 KX134_1211.c
 kx134_1211.c
 
diff --git a/html/dir_22dc605086b4989ac626954ebb63543e.js b/html/dir_22dc605086b4989ac626954ebb63543e.js index 054459e..2275644 100644 --- a/html/dir_22dc605086b4989ac626954ebb63543e.js +++ b/html/dir_22dc605086b4989ac626954ebb63543e.js @@ -1,4 +1,4 @@ var dir_22dc605086b4989ac626954ebb63543e = [ - [ "KX134_1211.c", "KX134__1211_8c_source.html", null ] + [ "kx134_1211.c", "kx134__1211_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_454bad1810d45ef205f36285493a4259.html b/html/dir_454bad1810d45ef205f36285493a4259.html index ca4da70..63b3a70 100644 --- a/html/dir_454bad1810d45ef205f36285493a4259.html +++ b/html/dir_454bad1810d45ef205f36285493a4259.html @@ -104,11 +104,11 @@ - + - + - +

Files

 loraComm.h
 loracomm.h
 
 payloadComm.h
 payloadcomm.h
 
 usbComm.h
 usbcomm.h
 
diff --git a/html/dir_454bad1810d45ef205f36285493a4259.js b/html/dir_454bad1810d45ef205f36285493a4259.js index 219ecfe..ef9c2f2 100644 --- a/html/dir_454bad1810d45ef205f36285493a4259.js +++ b/html/dir_454bad1810d45ef205f36285493a4259.js @@ -1,6 +1,6 @@ var dir_454bad1810d45ef205f36285493a4259 = [ - [ "loraComm.h", "loraComm_8h_source.html", null ], - [ "payloadComm.h", "payloadComm_8h_source.html", null ], - [ "usbComm.h", "usbComm_8h_source.html", null ] + [ "loracomm.h", "loracomm_8h_source.html", null ], + [ "payloadcomm.h", "payloadcomm_8h_source.html", null ], + [ "usbcomm.h", "usbcomm_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_5002134934530f64bf14c3c357e99f44.html b/html/dir_5002134934530f64bf14c3c357e99f44.html index c6a145c..c8cb45d 100644 --- a/html/dir_5002134934530f64bf14c3c357e99f44.html +++ b/html/dir_5002134934530f64bf14c3c357e99f44.html @@ -111,7 +111,7 @@

- +

Files

 stateUpdate.c
 stateupdate.c
 
diff --git a/html/dir_5002134934530f64bf14c3c357e99f44.js b/html/dir_5002134934530f64bf14c3c357e99f44.js index 57f2caa..fcb83d4 100644 --- a/html/dir_5002134934530f64bf14c3c357e99f44.js +++ b/html/dir_5002134934530f64bf14c3c357e99f44.js @@ -2,5 +2,5 @@ var dir_5002134934530f64bf14c3c357e99f44 = [ [ "comms", "dir_1cece0f75040df593a078a565a2aed55.html", "dir_1cece0f75040df593a078a565a2aed55" ], [ "data", "dir_6ba04829bafb2b4d2b73148d4157485a.html", "dir_6ba04829bafb2b4d2b73148d4157485a" ], - [ "stateUpdate.c", "stateUpdate_8c_source.html", null ] + [ "stateupdate.c", "stateupdate_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_666fbf14515ba845dc19cad73d3b2e03.html b/html/dir_666fbf14515ba845dc19cad73d3b2e03.html index 734ead2..bf3b1ef 100644 --- a/html/dir_666fbf14515ba845dc19cad73d3b2e03.html +++ b/html/dir_666fbf14515ba845dc19cad73d3b2e03.html @@ -111,7 +111,7 @@

- +

Files

 stateUpdate.h
 stateupdate.h
 
diff --git a/html/dir_666fbf14515ba845dc19cad73d3b2e03.js b/html/dir_666fbf14515ba845dc19cad73d3b2e03.js index 61d20b6..cb4756b 100644 --- a/html/dir_666fbf14515ba845dc19cad73d3b2e03.js +++ b/html/dir_666fbf14515ba845dc19cad73d3b2e03.js @@ -2,5 +2,5 @@ var dir_666fbf14515ba845dc19cad73d3b2e03 = [ [ "comms", "dir_454bad1810d45ef205f36285493a4259.html", "dir_454bad1810d45ef205f36285493a4259" ], [ "data", "dir_b0699fd9b60c004d08b193c4b8527aef.html", "dir_b0699fd9b60c004d08b193c4b8527aef" ], - [ "stateUpdate.h", "stateUpdate_8h_source.html", null ] + [ "stateupdate.h", "stateupdate_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_6ba04829bafb2b4d2b73148d4157485a.html b/html/dir_6ba04829bafb2b4d2b73148d4157485a.html index a73e775..7b2bfbf 100644 --- a/html/dir_6ba04829bafb2b4d2b73148d4157485a.html +++ b/html/dir_6ba04829bafb2b4d2b73148d4157485a.html @@ -104,13 +104,13 @@ - + - + - + - +

Files

 flashWrite.c
 flashwrite.c
 
 gpsAcquisition.c
 gpsacquisition.c
 
 hDataAcquisition.c
 hdataacquisition.c
 
 lDataAcquisition.c
 ldataacquisition.c
 
diff --git a/html/dir_6ba04829bafb2b4d2b73148d4157485a.js b/html/dir_6ba04829bafb2b4d2b73148d4157485a.js index 26c8d7b..ee7f1b6 100644 --- a/html/dir_6ba04829bafb2b4d2b73148d4157485a.js +++ b/html/dir_6ba04829bafb2b4d2b73148d4157485a.js @@ -1,7 +1,7 @@ var dir_6ba04829bafb2b4d2b73148d4157485a = [ - [ "flashWrite.c", "flashWrite_8c_source.html", null ], - [ "gpsAcquisition.c", "gpsAcquisition_8c_source.html", null ], - [ "hDataAcquisition.c", "hDataAcquisition_8c_source.html", null ], - [ "lDataAcquisition.c", "lDataAcquisition_8c_source.html", null ] + [ "flashwrite.c", "flashwrite_8c_source.html", null ], + [ "gpsacquisition.c", "gpsacquisition_8c_source.html", null ], + [ "hdataacquisition.c", "hdataacquisition_8c_source.html", null ], + [ "ldataacquisition.c", "ldataacquisition_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_4a6d534895bf450f20cc8c4e6cf876fa.html b/html/dir_7ddbe5deeb9defe78a41607f57037c65.html similarity index 95% rename from html/dir_4a6d534895bf450f20cc8c4e6cf876fa.html rename to html/dir_7ddbe5deeb9defe78a41607f57037c65.html index e10eb87..6147328 100644 --- a/html/dir_4a6d534895bf450f20cc8c4e6cf876fa.html +++ b/html/dir_7ddbe5deeb9defe78a41607f57037c65.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/USB Directory Reference +Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/usb Directory Reference @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
USB Directory Reference
+
usb Directory Reference
@@ -112,7 +112,7 @@ diff --git a/html/dir_4a6d534895bf450f20cc8c4e6cf876fa.js b/html/dir_7ddbe5deeb9defe78a41607f57037c65.js similarity index 54% rename from html/dir_4a6d534895bf450f20cc8c4e6cf876fa.js rename to html/dir_7ddbe5deeb9defe78a41607f57037c65.js index f36ec9b..980c93d 100644 --- a/html/dir_4a6d534895bf450f20cc8c4e6cf876fa.js +++ b/html/dir_7ddbe5deeb9defe78a41607f57037c65.js @@ -1,4 +1,4 @@ -var dir_4a6d534895bf450f20cc8c4e6cf876fa = +var dir_7ddbe5deeb9defe78a41607f57037c65 = [ [ "shell.h", "shell_8h.html", "shell_8h" ] ]; \ No newline at end of file diff --git a/html/dir_88fd42b624d4283fb3adf5b684d104f6.html b/html/dir_88fd42b624d4283fb3adf5b684d104f6.html index c3f80f7..8d31c76 100644 --- a/html/dir_88fd42b624d4283fb3adf5b684d104f6.html +++ b/html/dir_88fd42b624d4283fb3adf5b684d104f6.html @@ -104,7 +104,7 @@
- +

Files

 BMP581.c
 bmp581.c
 
diff --git a/html/dir_88fd42b624d4283fb3adf5b684d104f6.js b/html/dir_88fd42b624d4283fb3adf5b684d104f6.js index 23a16f4..5b5331a 100644 --- a/html/dir_88fd42b624d4283fb3adf5b684d104f6.js +++ b/html/dir_88fd42b624d4283fb3adf5b684d104f6.js @@ -1,4 +1,4 @@ var dir_88fd42b624d4283fb3adf5b684d104f6 = [ - [ "BMP581.c", "BMP581_8c_source.html", null ] + [ "bmp581.c", "bmp581_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_b0699fd9b60c004d08b193c4b8527aef.html b/html/dir_b0699fd9b60c004d08b193c4b8527aef.html index 3793b55..eac04e5 100644 --- a/html/dir_b0699fd9b60c004d08b193c4b8527aef.html +++ b/html/dir_b0699fd9b60c004d08b193c4b8527aef.html @@ -104,13 +104,13 @@ - + - + - + - +

Files

 flashWrite.h
 flashwrite.h
 
 gpsAcquisition.h
 gpsacquisition.h
 
 hDataAcquisition.h
 hdataacquisition.h
 
 lDataAcquisition.h
 ldataacquisition.h
 
diff --git a/html/dir_b0699fd9b60c004d08b193c4b8527aef.js b/html/dir_b0699fd9b60c004d08b193c4b8527aef.js index 84aa2fe..d880324 100644 --- a/html/dir_b0699fd9b60c004d08b193c4b8527aef.js +++ b/html/dir_b0699fd9b60c004d08b193c4b8527aef.js @@ -1,7 +1,7 @@ var dir_b0699fd9b60c004d08b193c4b8527aef = [ - [ "flashWrite.h", "flashWrite_8h_source.html", null ], - [ "gpsAcquisition.h", "gpsAcquisition_8h_source.html", null ], - [ "hDataAcquisition.h", "hDataAcquisition_8h_source.html", null ], - [ "lDataAcquisition.h", "lDataAcquisition_8h_source.html", null ] + [ "flashwrite.h", "flashwrite_8h_source.html", null ], + [ "gpsacquisition.h", "gpsacquisition_8h_source.html", null ], + [ "hdataacquisition.h", "hdataacquisition_8h_source.html", null ], + [ "ldataacquisition.h", "ldataacquisition_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_b107e5b317c7b4231f049dc293a4ea7a.html b/html/dir_b107e5b317c7b4231f049dc293a4ea7a.html index 1085189..a2c4082 100644 --- a/html/dir_b107e5b317c7b4231f049dc293a4ea7a.html +++ b/html/dir_b107e5b317c7b4231f049dc293a4ea7a.html @@ -104,7 +104,7 @@ - +

Files

 BMP581.h
 bmp581.h
 
diff --git a/html/dir_b107e5b317c7b4231f049dc293a4ea7a.js b/html/dir_b107e5b317c7b4231f049dc293a4ea7a.js index a7ea3c6..c73124c 100644 --- a/html/dir_b107e5b317c7b4231f049dc293a4ea7a.js +++ b/html/dir_b107e5b317c7b4231f049dc293a4ea7a.js @@ -1,4 +1,4 @@ var dir_b107e5b317c7b4231f049dc293a4ea7a = [ - [ "BMP581.h", "BMP581_8h.html", "BMP581_8h" ] + [ "bmp581.h", "bmp581_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_79458f2e361a339059eb67427ca72e71.html b/html/dir_b267afe36e41846e092a15d779abd09b.html similarity index 94% rename from html/dir_79458f2e361a339059eb67427ca72e71.html rename to html/dir_b267afe36e41846e092a15d779abd09b.html index 4e087e9..1ea4281 100644 --- a/html/dir_79458f2e361a339059eb67427ca72e71.html +++ b/html/dir_b267afe36e41846e092a15d779abd09b.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/uart/GPS Directory Reference +Australis Firmware Reference: Australis-Avionics/Core/Src/uart/gps Directory Reference @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
GPS Directory Reference
+
gps Directory Reference
@@ -112,7 +112,7 @@ diff --git a/html/dir_79458f2e361a339059eb67427ca72e71.js b/html/dir_b267afe36e41846e092a15d779abd09b.js similarity index 52% rename from html/dir_79458f2e361a339059eb67427ca72e71.js rename to html/dir_b267afe36e41846e092a15d779abd09b.js index b53b372..7e9d4a0 100644 --- a/html/dir_79458f2e361a339059eb67427ca72e71.js +++ b/html/dir_b267afe36e41846e092a15d779abd09b.js @@ -1,4 +1,4 @@ -var dir_79458f2e361a339059eb67427ca72e71 = +var dir_b267afe36e41846e092a15d779abd09b = [ [ "gps.c", "gps_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_a099a532a912b28b348a0b4072f526c3.html b/html/dir_d5781cb985fe9143d99b85977a90ea8c.html similarity index 94% rename from html/dir_a099a532a912b28b348a0b4072f526c3.html rename to html/dir_d5781cb985fe9143d99b85977a90ea8c.html index d396eaf..dad2234 100644 --- a/html/dir_a099a532a912b28b348a0b4072f526c3.html +++ b/html/dir_d5781cb985fe9143d99b85977a90ea8c.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/uart/USB Directory Reference +Australis Firmware Reference: Australis-Avionics/Core/Src/uart/usb Directory Reference @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
USB Directory Reference
+
usb Directory Reference
@@ -112,7 +112,7 @@ diff --git a/html/dir_a099a532a912b28b348a0b4072f526c3.js b/html/dir_d5781cb985fe9143d99b85977a90ea8c.js similarity index 54% rename from html/dir_a099a532a912b28b348a0b4072f526c3.js rename to html/dir_d5781cb985fe9143d99b85977a90ea8c.js index d2347b0..3593060 100644 --- a/html/dir_a099a532a912b28b348a0b4072f526c3.js +++ b/html/dir_d5781cb985fe9143d99b85977a90ea8c.js @@ -1,4 +1,4 @@ -var dir_a099a532a912b28b348a0b4072f526c3 = +var dir_d5781cb985fe9143d99b85977a90ea8c = [ [ "shell.c", "shell_8c_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_de758f7680769a5af14e6b04c836d25d.html b/html/dir_de758f7680769a5af14e6b04c836d25d.html index 79b8a10..7a8170c 100644 --- a/html/dir_de758f7680769a5af14e6b04c836d25d.html +++ b/html/dir_de758f7680769a5af14e6b04c836d25d.html @@ -104,7 +104,7 @@
- +

Files

 KX134_1211.h
 kx134_1211.h
 
diff --git a/html/dir_de758f7680769a5af14e6b04c836d25d.js b/html/dir_de758f7680769a5af14e6b04c836d25d.js index 706aef9..1966ed5 100644 --- a/html/dir_de758f7680769a5af14e6b04c836d25d.js +++ b/html/dir_de758f7680769a5af14e6b04c836d25d.js @@ -1,4 +1,4 @@ var dir_de758f7680769a5af14e6b04c836d25d = [ - [ "KX134_1211.h", "KX134__1211_8h.html", "KX134__1211_8h" ] + [ "kx134_1211.h", "kx134__1211_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/dir_c5d957e1d6edf6e0862fe2c47be63581.html b/html/dir_f7335c77276d33bd48fd54b1c7322725.html similarity index 94% rename from html/dir_c5d957e1d6edf6e0862fe2c47be63581.html rename to html/dir_f7335c77276d33bd48fd54b1c7322725.html index c6801f9..2b0cca0 100644 --- a/html/dir_c5d957e1d6edf6e0862fe2c47be63581.html +++ b/html/dir_f7335c77276d33bd48fd54b1c7322725.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/GPS Directory Reference +Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/gps Directory Reference @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
GPS Directory Reference
+
gps Directory Reference
@@ -112,7 +112,7 @@ diff --git a/html/dir_c5d957e1d6edf6e0862fe2c47be63581.js b/html/dir_f7335c77276d33bd48fd54b1c7322725.js similarity index 52% rename from html/dir_c5d957e1d6edf6e0862fe2c47be63581.js rename to html/dir_f7335c77276d33bd48fd54b1c7322725.js index 1e660ea..4cfba4c 100644 --- a/html/dir_c5d957e1d6edf6e0862fe2c47be63581.js +++ b/html/dir_f7335c77276d33bd48fd54b1c7322725.js @@ -1,4 +1,4 @@ -var dir_c5d957e1d6edf6e0862fe2c47be63581 = +var dir_f7335c77276d33bd48fd54b1c7322725 = [ [ "gps.h", "gps_8h_source.html", null ] ]; \ No newline at end of file diff --git a/html/doxygen-awesome.css b/html/doxygen-awesome.css index ca356d5..a1f714a 100755 --- a/html/doxygen-awesome.css +++ b/html/doxygen-awesome.css @@ -1,3 +1,48 @@ +/** + * Make documents looks a bit more like GitHub markdown + * from https://github.com/piconomix/doxygen-github-markdown-theme/blob/master/doxygen_extra.css + */ + +.contents hr { + box-shadow: unset!important; +} + +h1, h2, h3, h4, h5, h6 { + margin-top: 24px; + margin-bottom: 16px; + font-weight: 600; + line-height: 1.25; +} + +h1 { + font-size: 2em; + padding-bottom: 0.3em; + border-bottom: 1px solid var(--separator-color); +} + +h2 { + padding-bottom: 0.3em; + font-size: 1.5em; + border-bottom: 1px solid var(--separator-color); +} + +h3 { + font-size: 1.25em; +} + +h4 { + font-size: 1em; +} + +h5 { + font-size: 0.875em; +} + +h6 { + font-size: 0.85em; + color: #57606a; +} + /** Doxygen Awesome diff --git a/html/doxygen_crawl.html b/html/doxygen_crawl.html index 0250ee5..a1ccfa0 100644 --- a/html/doxygen_crawl.html +++ b/html/doxygen_crawl.html @@ -8,22 +8,17 @@ - - - - - - - - - + + + + @@ -47,7 +42,6 @@ - @@ -56,38 +50,39 @@ - + - + - + + - - + + - - + + @@ -167,9 +162,9 @@ - - + + @@ -189,14 +184,16 @@ - - + + - - + + + + @@ -206,8 +203,8 @@ - - + + @@ -223,8 +220,8 @@ - - + + @@ -281,7 +278,7 @@ - - + + diff --git a/html/files.html b/html/files.html index 223371a..9e84298 100644 --- a/html/files.html +++ b/html/files.html @@ -111,15 +111,15 @@ - - - + + + - - - - - + + + + + @@ -135,17 +135,17 @@ - + - + - + - + - + @@ -160,15 +160,15 @@ - - - + + + - - - - - + + + + + @@ -182,17 +182,17 @@ - + - + - + - + - + diff --git a/html/flashWrite_8c_source.html b/html/flashwrite_8c_source.html similarity index 92% rename from html/flashWrite_8c_source.html rename to html/flashwrite_8c_source.html index eb9e510..356d81e 100644 --- a/html/flashWrite_8c_source.html +++ b/html/flashwrite_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/flashWrite.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/flashwrite.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
flashWrite.c
+
flashwrite.c
1/***********************************************************************************
@@ -109,14 +109,14 @@
6 * @{ *
7 ***********************************************************************************/
8
-
9#include "flashWrite.h"
+
9#include "flashwrite.h"
10
11extern EventGroupHandle_t xTaskEnableGroup;
12
13/* =============================================================================== */
22void vIdle(void *argument) {
23
-
24 enum State *flightState = StateHandle_getHandle("FlightState").state;
+
24 enum State *flightState = StateHandle_getHandle("FlightState").state;
25 MemBuff *mem = (MemBuff *)argument;
26
27 for (;;) {
@@ -131,22 +131,22 @@
44 const TickType_t timeout = portMAX_DELAY;
45 uint32_t pageAddr = 0;
46
-
47 Flash *flash = DeviceHandle_getHandle("Flash").device;
-
48 MemBuff *mem = (MemBuff *)argument;
+
47 Flash *flash = DeviceHandle_getHandle("Flash").device;
+
48 MemBuff *mem = (MemBuff *)argument;
49 uint8_t outBuff[flash->pageSize];
50
51 for (;;) {
52 // Wait for write flag to be ready, clear flag on exit
53 EventBits_t uxBits = xEventGroupWaitBits(xTaskEnableGroup, GROUP_TASK_ENABLE_FLASH, pdTRUE, pdFALSE, timeout);
54 if (uxBits & GROUP_TASK_ENABLE_FLASH) {
-
55 // Flush data to output buffer
-
56 bool success = mem->readPage(mem, outBuff);
+
55 // Flush data to output buffer
+
56 bool success = mem->readPage(mem, outBuff);
57 if (success) {
-
58 taskENTER_CRITICAL();
+
58 taskENTER_CRITICAL();
59 // Write data to flash memory
60 flash->writePage(flash, pageAddr, outBuff);
61 pageAddr += 0x100;
-
62 taskEXIT_CRITICAL();
+
62 taskEXIT_CRITICAL();
63 }
64 }
65 }
@@ -159,7 +159,7 @@ diff --git a/html/flashWrite_8h_source.html b/html/flashwrite_8h_source.html similarity index 95% rename from html/flashWrite_8h_source.html rename to html/flashwrite_8h_source.html index e4dc546..fab136d 100644 --- a/html/flashWrite_8h_source.html +++ b/html/flashwrite_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/flashWrite.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/flashwrite.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
flashWrite.h
+
flashwrite.h
1#ifndef _FLASHBUFFER_H
@@ -111,7 +111,7 @@
8#include "devices.h"
9#include "flash.h"
10#include "membuff.h"
-
11#include "stateUpdate.h"
+
11#include "stateupdate.h"
12
13typedef struct {
@@ -131,14 +131,14 @@
24void vFlashBuffer(void *pvParameters);
25
26#endif
- - + +
diff --git a/html/globals.html b/html/globals.html index 6e126b9..66f149d 100644 --- a/html/globals.html +++ b/html/globals.html @@ -99,25 +99,7 @@
Here is a list of all documented functions, variables, defines, enums, and typedefs with links to the documentation:
    -
  • A3G4250D_init() : A3G4250D.h
  • -
  • A3G4250D_processRawBytes() : A3G4250D.h
  • -
  • A3G4250D_readGyro() : A3G4250D.h
  • -
  • A3G4250D_readRawBytes() : A3G4250D.h
  • -
  • A3G4250D_update() : A3G4250D.h
  • -
  • BMP581_init() : BMP581.h
  • -
  • BMP581_processRawPress() : BMP581.h
  • -
  • BMP581_processRawTemp() : BMP581.h
  • -
  • BMP581_readPress() : BMP581.h
  • -
  • BMP581_readRawPress() : BMP581.h
  • -
  • BMP581_readRawTemp() : BMP581.h
  • -
  • BMP581_readTemp() : BMP581.h
  • -
  • BMP581_update() : BMP581.h
  • configure_interrupts() : main.h
  • -
  • KX134_1211_init() : KX134_1211.h
  • -
  • KX134_1211_processRawBytes() : KX134_1211.h
  • -
  • KX134_1211_readAccel() : KX134_1211.h
  • -
  • KX134_1211_readRawBytes() : KX134_1211.h
  • -
  • KX134_1211_update() : KX134_1211.h
  • Shell_clear() : shell.h
  • Shell_help() : shell.h
  • Shell_init() : shell.h
  • diff --git a/html/globals_func.html b/html/globals_func.html index 3f9ce7e..fa1343c 100644 --- a/html/globals_func.html +++ b/html/globals_func.html @@ -99,25 +99,7 @@
    Here is a list of all documented functions with links to the documentation:
      -
    • A3G4250D_init() : A3G4250D.h
    • -
    • A3G4250D_processRawBytes() : A3G4250D.h
    • -
    • A3G4250D_readGyro() : A3G4250D.h
    • -
    • A3G4250D_readRawBytes() : A3G4250D.h
    • -
    • A3G4250D_update() : A3G4250D.h
    • -
    • BMP581_init() : BMP581.h
    • -
    • BMP581_processRawPress() : BMP581.h
    • -
    • BMP581_processRawTemp() : BMP581.h
    • -
    • BMP581_readPress() : BMP581.h
    • -
    • BMP581_readRawPress() : BMP581.h
    • -
    • BMP581_readRawTemp() : BMP581.h
    • -
    • BMP581_readTemp() : BMP581.h
    • -
    • BMP581_update() : BMP581.h
    • configure_interrupts() : main.h
    • -
    • KX134_1211_init() : KX134_1211.h
    • -
    • KX134_1211_processRawBytes() : KX134_1211.h
    • -
    • KX134_1211_readAccel() : KX134_1211.h
    • -
    • KX134_1211_readRawBytes() : KX134_1211.h
    • -
    • KX134_1211_update() : KX134_1211.h
    • Shell_clear() : shell.h
    • Shell_help() : shell.h
    • Shell_init() : shell.h
    • diff --git a/html/gps_8c_source.html b/html/gps_8c_source.html index ab6f776..727d7ed 100644 --- a/html/gps_8c_source.html +++ b/html/gps_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/uart/GPS/gps.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/uart/gps/gps.c Source File @@ -233,7 +233,7 @@ diff --git a/html/gps_8h_source.html b/html/gps_8h_source.html index 07d1ee2..3b7522e 100644 --- a/html/gps_8h_source.html +++ b/html/gps_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/GPS/gps.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/gps/gps.h Source File @@ -180,7 +180,7 @@ diff --git a/html/gpsAcquisition_8c_source.html b/html/gpsacquisition_8c_source.html similarity index 84% rename from html/gpsAcquisition_8c_source.html rename to html/gpsacquisition_8c_source.html index 6bf9f32..5f572d8 100644 --- a/html/gpsAcquisition_8c_source.html +++ b/html/gpsacquisition_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/gpsAcquisition.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/gpsacquisition.c Source File @@ -72,7 +72,7 @@
    @@ -98,14 +98,14 @@
    -
    gpsAcquisition.c
    +
    gpsacquisition.c
    1/* ===================================================================== *
    2 * GPS *
    3 * ===================================================================== */
    4
    -
    5#include "gpsAcquisition.h"
    +
    5#include "gpsacquisition.h"
    6
    7extern MessageBufferHandle_t xLoRaTxBuff;
    8extern MessageBufferHandle_t xUsbTxBuff;
    @@ -119,36 +119,36 @@
    16 const TickType_t xFrequency = pdMS_TO_TICKS(500);
    17 const TickType_t blockTime = pdMS_TO_TICKS(250);
    18 char gpsString[100];
    -
    19
    -
    20 GPS *gps = DeviceHandle_getHandle("GPS").device;
    -
    21 UART *usb = DeviceHandle_getHandle("USB").device;
    +
    19
    +
    20 GPS *gps = DeviceHandle_getHandle("GPS").device;
    +
    21 UART *usb = DeviceHandle_getHandle("USB").device;
    22 enum State *flightState = StateHandle_getHandle("FlightState").state;
    23
    24 for (;;) {
    25 // Block until 500ms interval
    -
    26 TickType_t xLastWakeTime = xTaskGetTickCount();
    +
    26 TickType_t xLastWakeTime = xTaskGetTickCount();
    27 vTaskDelayUntil(&xLastWakeTime, xFrequency);
    -
    28
    -
    29 // Send GPS poll message
    -
    30 gps->base.print(&gps->base, GPS_PUBX_POLL);
    -
    31
    -
    32 // Read string from UART Rx buffer, skip loop if empty
    +
    28
    +
    29 // Send GPS poll message
    +
    30 gps->base.print(&gps->base, GPS_PUBX_POLL);
    +
    31
    +
    32 // Read string from UART Rx buffer, skip loop if empty
    33 if (!xStreamBufferReceive(xGpsRxBuff, (void *)&gpsString, gpsRxBuffIdx, blockTime))
    34 continue;
    35
    36 struct GPS_Data gpsData;
    37 gps->decode(gps, gpsString, &gpsData);
    -
    38 usb->print(usb, gpsString);
    -
    39 gpsRxBuffIdx = 0;
    +
    38 usb->print(usb, gpsString);
    +
    39 gpsRxBuffIdx = 0;
    40
    -
    41 #ifdef DEBUG
    -
    44 if ((xSemaphoreTake(xUsbMutex, pdMS_TO_TICKS(0))) == pdTRUE) {
    -
    45 char debugStr[100];
    -
    46 snprintf(debugStr, 100, "[GPS] %d:%d:%d\n\r", gpsData.hour, gpsData.minute, gpsData.second);
    -
    47 xMessageBufferSend(xUsbTxBuff, (void *)debugStr, 100, 0);
    -
    48 xSemaphoreGive(xUsbMutex);
    -
    49 }
    -
    50 #endif
    +
    41#ifdef DEBUG
    +
    44 if ((xSemaphoreTake(xUsbMutex, pdMS_TO_TICKS(0))) == pdTRUE) {
    +
    45 char debugStr[100];
    +
    46 snprintf(debugStr, 100, "[GPS] %d:%d:%d\n\r", gpsData.hour, gpsData.minute, gpsData.second);
    +
    47 xMessageBufferSend(xUsbTxBuff, (void *)debugStr, 100, 0);
    +
    48 xSemaphoreGive(xUsbMutex);
    +
    49 }
    +
    50#endif
    51
    52 LoRa_Packet gpsPacket = LoRa_GPSData(
    53 LORA_HEADER_GPS_DATA,
    @@ -172,13 +172,12 @@
    79 gpsRxBuff[gpsRxBuffIdx++] = rxData;
    80 gpsRxBuffIdx %= GPS_RX_SIZE;
    81
    -
    82 // Send message to buffer on carriage return
    -
    83 if(rxData == LINE_FEED) {
    -
    84 xStreamBufferSendFromISR(xGpsRxBuff, (void *)gpsRxBuff, gpsRxBuffIdx, &xHigherPriorityTaskWoken);
    -
    85 portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
    -
    86 }
    +
    82 // Send message to buffer on carriage return
    +
    83 if (rxData == LINE_FEED) {
    +
    84 xStreamBufferSendFromISR(xGpsRxBuff, (void *)gpsRxBuff, gpsRxBuffIdx, &xHigherPriorityTaskWoken);
    +
    85 portYIELD_FROM_ISR(xHigherPriorityTaskWoken);
    +
    86 }
    87}
    -
    88
    Definition gps.h:62
    Definition gps.h:33
    LoRa_Packet LoRa_GPSData(uint8_t, char *, char *, uint8_t)
    Definition lora.c:162
    @@ -190,7 +189,7 @@ diff --git a/html/gpsAcquisition_8h_source.html b/html/gpsacquisition_8h_source.html similarity index 92% rename from html/gpsAcquisition_8h_source.html rename to html/gpsacquisition_8h_source.html index afa481d..cf69476 100644 --- a/html/gpsAcquisition_8h_source.html +++ b/html/gpsacquisition_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/gpsAcquisition.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/gpsacquisition.h Source File @@ -72,7 +72,7 @@
    @@ -98,7 +98,7 @@
    -
    gpsAcquisition.h
    +
    gpsacquisition.h
    1#ifndef _GPSTRANSMIT_H
    @@ -109,13 +109,13 @@
    6#include "message_buffer.h"
    7#include "stdio.h"
    8
    -
    9#include "stateUpdate.h"
    -
    10#include "dataframe.h"
    -
    11#include "devices.h"
    -
    12#include "gps.h"
    -
    13#include "lora.h"
    +
    9#include "dataframe.h"
    +
    10#include "devices.h"
    +
    11#include "gps.h"
    +
    12#include "lora.h"
    +
    13#include "stateupdate.h"
    14
    -
    15#define GPS_RX_SIZE 128
    +
    15#define GPS_RX_SIZE 128
    16
    17void vGpsTransmit(void *);
    18
    @@ -125,7 +125,7 @@ diff --git a/html/group__A3G4250D.html b/html/group__A3G4250D.html index b6ca0c6..065732d 100644 --- a/html/group__A3G4250D.html +++ b/html/group__A3G4250D.html @@ -188,7 +188,7 @@

    Returns
    NULL.

    -

    Definition at line 27 of file A3G4250D.c.

    +

    Definition at line 27 of file a3g4250d.c.

    @@ -217,7 +217,7 @@

    Returns
    NULL.

    -

    Definition at line 86 of file A3G4250D.c.

    +

    Definition at line 86 of file a3g4250d.c.

@@ -251,7 +251,7 @@

Returns
NULL.

-

Definition at line 72 of file A3G4250D.c.

+

Definition at line 72 of file a3g4250d.c.

@@ -285,7 +285,7 @@

Returns
NULL.

-

Definition at line 116 of file A3G4250D.c.

+

Definition at line 116 of file a3g4250d.c.

@@ -325,7 +325,7 @@

Returns
NULL.

-

Definition at line 101 of file A3G4250D.c.

+

Definition at line 101 of file a3g4250d.c.

diff --git a/html/group__BMP581.html b/html/group__BMP581.html index 2154058..30fec4a 100644 --- a/html/group__BMP581.html +++ b/html/group__BMP581.html @@ -188,7 +188,7 @@

Returns
NULL.

-

Definition at line 27 of file BMP581.c.

+

Definition at line 27 of file bmp581.c.

@@ -217,7 +217,7 @@

Returns
NULL.

-

Definition at line 87 of file BMP581.c.

+

Definition at line 89 of file bmp581.c.

@@ -251,7 +251,7 @@

Returns
NULL.

-

Definition at line 103 of file BMP581.c.

+

Definition at line 105 of file bmp581.c.

@@ -282,7 +282,7 @@

Returns
NULL.

-

Definition at line 144 of file BMP581.c.

+

Definition at line 146 of file bmp581.c.

@@ -313,7 +313,7 @@

Returns
NULL.

-

Definition at line 130 of file BMP581.c.

+

Definition at line 132 of file bmp581.c.

@@ -344,7 +344,7 @@

Returns
NULL.

-

Definition at line 170 of file BMP581.c.

+

Definition at line 172 of file bmp581.c.

@@ -384,7 +384,7 @@

Returns
NULL.

-

Definition at line 118 of file BMP581.c.

+

Definition at line 120 of file bmp581.c.

@@ -420,7 +420,7 @@

Returns
NULL.

-

Definition at line 158 of file BMP581.c.

+

Definition at line 160 of file bmp581.c.

diff --git a/html/group__KX134-1211.html b/html/group__KX134-1211.html index 517930e..cae0ca0 100644 --- a/html/group__KX134-1211.html +++ b/html/group__KX134-1211.html @@ -188,7 +188,7 @@

Returns
NULL.

-

Definition at line 25 of file KX134_1211.c.

+

Definition at line 25 of file kx134_1211.c.

@@ -217,7 +217,7 @@

Returns
NULL.

-

Definition at line 104 of file KX134_1211.c.

+

Definition at line 104 of file kx134_1211.c.

@@ -251,7 +251,7 @@

Returns
NULL.

-

Definition at line 91 of file KX134_1211.c.

+

Definition at line 91 of file kx134_1211.c.

@@ -285,7 +285,7 @@

Returns
NULL.

-

Definition at line 134 of file KX134_1211.c.

+

Definition at line 134 of file kx134_1211.c.

@@ -325,7 +325,7 @@

Returns
NULL.

-

Definition at line 119 of file KX134_1211.c.

+

Definition at line 119 of file kx134_1211.c.

diff --git a/html/hDataAcquisition_8c_source.html b/html/hdataacquisition_8c_source.html similarity index 96% rename from html/hDataAcquisition_8c_source.html rename to html/hdataacquisition_8c_source.html index 28c4e64..a0d57ea 100644 --- a/html/hDataAcquisition_8c_source.html +++ b/html/hdataacquisition_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/hDataAcquisition.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/hdataacquisition.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
hDataAcquisition.c
+
hdataacquisition.c
1/***********************************************************************************
@@ -109,7 +109,7 @@
6 * @{ *
7 ***********************************************************************************/
8
-
9#include "hDataAcquisition.h"
+
9#include "hdataacquisition.h"
10
11extern long hDummyIdx;
12char HdebugStr[100] = {};
@@ -252,24 +252,24 @@
165 }
166}
167
- -
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition A3G4250D.h:49
-
float sensitivity
Gyroscope sensitivity.
Definition A3G4250D.h:42
-
void(* update)(struct A3G4250D *)
Gyro update method.
Definition A3G4250D.h:43
-
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition A3G4250D.h:50
+ +
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition a3g4250d.h:49
+
float sensitivity
Gyroscope sensitivity.
Definition a3g4250d.h:42
+
void(* update)(struct A3G4250D *)
Gyro update method.
Definition a3g4250d.h:43
+
float gyroData[A3G4250D_DATA_COUNT]
Processed gyro rates array.
Definition a3g4250d.h:50
- -
void(* update)(struct KX134_1211 *)
Accel update method.
Definition KX134_1211.h:56
-
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
-
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition KX134_1211.h:62
-
float sensitivity
Accelerometer sensitivity.
Definition KX134_1211.h:55
+ +
void(* update)(struct KX134_1211 *)
Accel update method.
Definition kx134_1211.h:56
+
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
+
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition kx134_1211.h:62
+
float sensitivity
Accelerometer sensitivity.
Definition kx134_1211.h:55
DeviceType device
Enum specifier for device type.
Definition spi.h:50
diff --git a/html/hDataAcquisition_8h_source.html b/html/hdataacquisition_8h_source.html similarity index 90% rename from html/hDataAcquisition_8h_source.html rename to html/hdataacquisition_8h_source.html index b17405b..3880c80 100644 --- a/html/hDataAcquisition_8h_source.html +++ b/html/hdataacquisition_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/hDataAcquisition.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/hdataacquisition.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
hDataAcquisition.h
+
hdataacquisition.h
1#ifndef __HDATAACQUISITION_H
@@ -112,13 +112,13 @@
9
10#include "stdio.h"
11
-
12#include "A3G4250D.h"
-
13#include "KX134_1211.h"
-
14#include "dataframe.h"
-
15#include "devices.h"
+
12#include "a3g4250d.h"
+
13#include "dataframe.h"
+
14#include "devices.h"
+
15#include "kx134_1211.h"
16#include "membuff.h"
17#include "sensors.h"
-
18#include "stateUpdate.h"
+
18#include "stateupdate.h"
19
20#ifdef DUMMY
21 #include "accelX.h"
@@ -139,16 +139,14 @@
35
36#endif
- - - - + +
diff --git a/html/KX134__1211_8c_source.html b/html/kx134__1211_8c_source.html similarity index 86% rename from html/KX134__1211_8c_source.html rename to html/kx134__1211_8c_source.html index 75669c7..3fdbeb2 100644 --- a/html/KX134__1211_8c_source.html +++ b/html/kx134__1211_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/accel/KX134_1211.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/spi/sensors/accel/kx134_1211.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
KX134_1211.c
+
kx134_1211.c
1/***********************************************************************************
@@ -111,7 +111,7 @@
8 * @{ *
9 ***********************************************************************************/
10
-
11#include "KX134_1211.h"
+
11#include "kx134_1211.h"
12
13/* =============================================================================== */
@@ -146,7 +146,7 @@
53 KX134_1211_writeRegister(accel, 0x7F, 0x00);
54 KX134_1211_writeRegister(accel, 0x1C, 0x00);
55 KX134_1211_writeRegister(accel, 0x1C, 0x80);
-
56
+
56
57 const uint32_t superDelay = 0xFFFF;
58 volatile uint8_t counter = 0;
59
@@ -154,9 +154,9 @@
61 for (uint32_t i = 0; i < superDelay; i++) {
62 counter++;
63 }
-
64
-
65 uint8_t chipID = KX134_1211_readRegister(accel, 0x13);
-
66 uint8_t cotr = KX134_1211_readRegister(accel, 0x12);
+
64
+
65 uint8_t chipID = KX134_1211_readRegister(accel, 0x13);
+
66 uint8_t cotr = KX134_1211_readRegister(accel, 0x12);
67
68 // Configure accelerometer registers
69 KX134_1211_writeRegister(accel, KX134_1211_CNTL1, KX134_1211_CNTL1_RES | GSEL); // Accel select, selected sensitivity
@@ -202,10 +202,10 @@
134void KX134_1211_readRawBytes(KX134_1211 *accel, uint8_t *out) {
135// Map raw indices to mounting axis
-
136#define INDEX_AXES(index, byte) 2 * accel->axes[index] + byte
-
137 uint8_t tmp[KX134_1211_DATA_TOTAL];
-
138 KX134_1211_readRegisters(accel, KX134_1211_XOUT_L, KX134_1211_DATA_TOTAL, tmp);
-
139 out[INDEX_AXES(0, 1)] = tmp[0]; // Accel X high
+
136#define INDEX_AXES(index, byte) 2 * accel->axes[index] + byte
+
137 uint8_t tmp[KX134_1211_DATA_TOTAL];
+
138 KX134_1211_readRegisters(accel, KX134_1211_XOUT_L, KX134_1211_DATA_TOTAL, tmp);
+
139 out[INDEX_AXES(0, 1)] = tmp[0]; // Accel X high
140 out[INDEX_AXES(0, 0)] = tmp[1]; // Accel X low
141 out[INDEX_AXES(1, 1)] = tmp[2]; // Accel Y high
142 out[INDEX_AXES(1, 0)] = tmp[3]; // Accel Y low
@@ -222,15 +222,15 @@
152
153 spi.port->ODR &= ~spi.cs;
154
-
155 while((spi.interface->SR & SPI_SR_TXE) == 0);
-
156 spi.interface->DR = (address & 0x7F); // Send out the device address
-
157 while((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
-
158 uint8_t response = spi.interface->DR; // Read the dummy response.
-
159 while((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
-
160 spi.interface->DR = data; // Send out the device address
-
161 while((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
-
162 response = spi.interface->DR; // Read the dummy response.
-
163 while((spi.interface->SR & SPI_SR_BSY) == SPI_SR_BSY); // Wait for the peripheral to finsh.
+
155 while ((spi.interface->SR & SPI_SR_TXE) == 0);
+
156 spi.interface->DR = (address & 0x7F); // Send out the device address
+
157 while ((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
+
158 uint8_t response = spi.interface->DR; // Read the dummy response.
+
159 while ((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
+
160 spi.interface->DR = data; // Send out the device address
+
161 while ((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
+
162 response = spi.interface->DR; // Read the dummy response.
+
163 while ((spi.interface->SR & SPI_SR_BSY) == SPI_SR_BSY); // Wait for the peripheral to finsh.
164
165 spi.port->ODR |= spi.cs;
166}
@@ -254,44 +254,43 @@
184void KX134_1211_readRegisters(KX134_1211 *accel, uint8_t address, uint8_t count, uint8_t *out) {
185 SPI spi = accel->base;
186
-
187 spi.port->ODR &= ~spi.cs; // Manually drop the chip select.
+
187 spi.port->ODR &= ~spi.cs; // Manually drop the chip select.
188
-
189 while((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
-
190 spi.interface->DR = (address | 0x80); // Send out the device address
-
191 while((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
-
192 uint8_t response = spi.interface->DR; // Read the dummy response.
+
189 while ((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
+
190 spi.interface->DR = (address | 0x80); // Send out the device address
+
191 while ((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
+
192 uint8_t response = spi.interface->DR; // Read the dummy response.
193
194 for (int i = 0; i < count; i++) {
-
195 while((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
-
196 spi.interface->DR = 0xFF; // Send out the dummy data
-
197 while((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
-
198 out[i] = spi.interface->DR; // Read the dummy response.
-
199 }
-
200
-
201 while((spi.interface->SR & SPI_SR_BSY) == SPI_SR_BSY); // Wait for the peripheral to finsh.
-
202 spi.port->ODR |= spi.cs; // Raise chip select
+
195 while ((spi.interface->SR & SPI_SR_TXE) == 0); // Wait for the SPI bus to become ready.
+
196 spi.interface->DR = 0xFF; // Send out the dummy data
+
197 while ((spi.interface->SR & SPI_SR_RXNE) == 0); // Wait for the recieve to become available.
+
198 out[i] = spi.interface->DR; // Read the dummy response.
+
199 }
+
200
+
201 while ((spi.interface->SR & SPI_SR_BSY) == SPI_SR_BSY); // Wait for the peripheral to finsh.
+
202 spi.port->ODR |= spi.cs; // Raise chip select
203}
204
- -
void KX134_1211_readAccel(KX134_1211 *, float *)
Read 3-axis floating point accelerations.
Definition KX134_1211.c:91
-
void KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *)
Process raw 3-axis data to floating point accelerations.
Definition KX134_1211.c:119
-
void KX134_1211_readRawBytes(KX134_1211 *, uint8_t *)
Read raw 3-axis data.
Definition KX134_1211.c:134
-
void KX134_1211_update(KX134_1211 *)
Updates internally stored acceleration readings.
Definition KX134_1211.c:104
-
DeviceHandle_t KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign)
Initialiser for a KX134-1211 accelerometer.
Definition KX134_1211.c:25
+
void KX134_1211_readAccel(KX134_1211 *, float *)
Read 3-axis floating point accelerations.
Definition kx134_1211.c:91
+
void KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *)
Process raw 3-axis data to floating point accelerations.
Definition kx134_1211.c:119
+
void KX134_1211_readRawBytes(KX134_1211 *, uint8_t *)
Read raw 3-axis data.
Definition kx134_1211.c:134
+
void KX134_1211_update(KX134_1211 *)
Updates internally stored acceleration readings.
Definition kx134_1211.c:104
+
DeviceHandle_t KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign)
Initialiser for a KX134-1211 accelerometer.
Definition kx134_1211.c:25
void SPI_init(SPI *, DeviceType, SPI_TypeDef *, DataFormat, GPIO_TypeDef *, unsigned long)
Initialiser for an SPI device interface.
Definition spi.c:32
@ SENSOR_ACCEL
Accelerometer.
Definition spi.h:29
- -
uint8_t axes[KX134_1211_DATA_COUNT]
Array defining axes of mounting.
Definition KX134_1211.h:60
-
void(* update)(struct KX134_1211 *)
Accel update method.
Definition KX134_1211.h:56
-
SPI base
Parent SPI interface.
Definition KX134_1211.h:54
-
void(* processRawBytes)(struct KX134_1211 *, uint8_t *, float *)
Process raw accel method.
Definition KX134_1211.h:59
-
void(* readRawBytes)(struct KX134_1211 *, uint8_t *)
Raw accel read method.
Definition KX134_1211.h:58
-
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
-
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition KX134_1211.h:62
-
int8_t sign[KX134_1211_DATA_COUNT]
Array defining sign of axes.
Definition KX134_1211.h:61
-
float sensitivity
Accelerometer sensitivity.
Definition KX134_1211.h:55
-
void(* readAccel)(struct KX134_1211 *, float *)
Accel read method.
Definition KX134_1211.h:57
+ +
uint8_t axes[KX134_1211_DATA_COUNT]
Array defining axes of mounting.
Definition kx134_1211.h:60
+
void(* update)(struct KX134_1211 *)
Accel update method.
Definition kx134_1211.h:56
+
SPI base
Parent SPI interface.
Definition kx134_1211.h:54
+
void(* processRawBytes)(struct KX134_1211 *, uint8_t *, float *)
Process raw accel method.
Definition kx134_1211.h:59
+
void(* readRawBytes)(struct KX134_1211 *, uint8_t *)
Raw accel read method.
Definition kx134_1211.h:58
+
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
+
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition kx134_1211.h:62
+
int8_t sign[KX134_1211_DATA_COUNT]
Array defining sign of axes.
Definition kx134_1211.h:61
+
float sensitivity
Accelerometer sensitivity.
Definition kx134_1211.h:55
+
void(* readAccel)(struct KX134_1211 *, float *)
Accel read method.
Definition kx134_1211.h:57
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
uint16_t(* transmit)(struct SPI *, uint16_t)
SPI transmit method.
Definition spi.h:56
GPIO_TypeDef * port
Pointer to GPIO port struct.
Definition spi.h:52
@@ -302,7 +301,7 @@ diff --git a/html/KX134__1211_8h_source.html b/html/kx134__1211_8h_source.html similarity index 93% rename from html/KX134__1211_8h_source.html rename to html/kx134__1211_8h_source.html index cdfe873..486ffa7 100644 --- a/html/KX134__1211_8h_source.html +++ b/html/kx134__1211_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/accel/KX134_1211.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/spi/sensors/accel/kx134_1211.h Source File @@ -72,7 +72,7 @@
@@ -98,10 +98,10 @@
-
KX134_1211.h
+
kx134_1211.h
-Go to the documentation of this file.
1
+
1
7
8#ifndef _KX134_1211_H
9#define _KX134_1211_H
@@ -167,30 +167,30 @@
74void KX134_1211_writeRegister(KX134_1211 *, uint8_t, uint8_t);
75
77#endif
-
void KX134_1211_readAccel(KX134_1211 *, float *)
Read 3-axis floating point accelerations.
Definition KX134_1211.c:91
-
void KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *)
Process raw 3-axis data to floating point accelerations.
Definition KX134_1211.c:119
-
void KX134_1211_readRawBytes(KX134_1211 *, uint8_t *)
Read raw 3-axis data.
Definition KX134_1211.c:134
-
void KX134_1211_update(KX134_1211 *)
Updates internally stored acceleration readings.
Definition KX134_1211.c:104
-
DeviceHandle_t KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *)
Initialiser for a KX134-1211 accelerometer.
Definition KX134_1211.c:25
+
void KX134_1211_readAccel(KX134_1211 *, float *)
Read 3-axis floating point accelerations.
Definition kx134_1211.c:91
+
void KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *)
Process raw 3-axis data to floating point accelerations.
Definition kx134_1211.c:119
+
void KX134_1211_readRawBytes(KX134_1211 *, uint8_t *)
Read raw 3-axis data.
Definition kx134_1211.c:134
+
void KX134_1211_update(KX134_1211 *)
Updates internally stored acceleration readings.
Definition kx134_1211.c:104
+
DeviceHandle_t KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *)
Initialiser for a KX134-1211 accelerometer.
Definition kx134_1211.c:25
- -
uint8_t axes[KX134_1211_DATA_COUNT]
Array defining axes of mounting.
Definition KX134_1211.h:60
-
void(* update)(struct KX134_1211 *)
Accel update method.
Definition KX134_1211.h:56
-
SPI base
Parent SPI interface.
Definition KX134_1211.h:54
-
void(* processRawBytes)(struct KX134_1211 *, uint8_t *, float *)
Process raw accel method.
Definition KX134_1211.h:59
-
void(* readRawBytes)(struct KX134_1211 *, uint8_t *)
Raw accel read method.
Definition KX134_1211.h:58
-
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
-
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition KX134_1211.h:62
-
int8_t sign[KX134_1211_DATA_COUNT]
Array defining sign of axes.
Definition KX134_1211.h:61
-
float sensitivity
Accelerometer sensitivity.
Definition KX134_1211.h:55
-
void(* readAccel)(struct KX134_1211 *, float *)
Accel read method.
Definition KX134_1211.h:57
+ +
uint8_t axes[KX134_1211_DATA_COUNT]
Array defining axes of mounting.
Definition kx134_1211.h:60
+
void(* update)(struct KX134_1211 *)
Accel update method.
Definition kx134_1211.h:56
+
SPI base
Parent SPI interface.
Definition kx134_1211.h:54
+
void(* processRawBytes)(struct KX134_1211 *, uint8_t *, float *)
Process raw accel method.
Definition kx134_1211.h:59
+
void(* readRawBytes)(struct KX134_1211 *, uint8_t *)
Raw accel read method.
Definition kx134_1211.h:58
+
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
+
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition kx134_1211.h:62
+
int8_t sign[KX134_1211_DATA_COUNT]
Array defining sign of axes.
Definition kx134_1211.h:61
+
float sensitivity
Accelerometer sensitivity.
Definition kx134_1211.h:55
+
void(* readAccel)(struct KX134_1211 *, float *)
Accel read method.
Definition kx134_1211.h:57
Struct definition for SPI interface. Provides the interface for API consumers to interact with the SP...
Definition spi.h:49
diff --git a/html/launch_8c_source.html b/html/launch_8c_source.html index 4f7cd6d..84ec82c 100644 --- a/html/launch_8c_source.html +++ b/html/launch_8c_source.html @@ -135,8 +135,8 @@
Definition shell.h:34
- -
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
+ +
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
diff --git a/html/launch_8h_source.html b/html/launch_8h_source.html index 28105ad..5cbc18d 100644 --- a/html/launch_8h_source.html +++ b/html/launch_8h_source.html @@ -107,9 +107,9 @@
8#define _LAUNCH_H
9
10#include "devices.h"
-
11#include "shell.h"
-
12#include "stateUpdate.h"
-
13#include "params.h"
+
11#include "params.h"
+
12#include "shell.h"
+
13#include "stateupdate.h"
14
15#endif
diff --git a/html/lDataAcquisition_8c_source.html b/html/ldataacquisition_8c_source.html similarity index 82% rename from html/lDataAcquisition_8c_source.html rename to html/ldataacquisition_8c_source.html index e73f8c7..a887678 100644 --- a/html/lDataAcquisition_8c_source.html +++ b/html/ldataacquisition_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/lDataAcquisition.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/data/ldataacquisition.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
lDataAcquisition.c
+
ldataacquisition.c
1/***********************************************************************************
@@ -109,9 +109,9 @@
6 * @{ *
7 ***********************************************************************************/
8
-
9#include "lDataAcquisition.h"
-
10#include "uart.h"
-
11#include "math.h"
+
9#include "ldataacquisition.h"
+
10#include "math.h"
+
11#include "uart.h"
12
13extern EventGroupHandle_t xTaskEnableGroup;
14extern SemaphoreHandle_t xUsbMutex;
@@ -161,39 +161,39 @@
74
75 MemBuff *mem = (MemBuff *)argument;
76 BMP581 *baro = DeviceHandle_getHandle("Baro").device;
-
77
-
78 UART *usb = DeviceHandle_getHandle("USB").device;
-
79 DeviceHandle_t accelHandle = DeviceHandle_getHandle("Accel");
-
80 KX134_1211 *accel = accelHandle.device;
-
81
-
82 float *altitude = StateHandle_getHandle("Altitude").state;
-
83 float *cosine = StateHandle_getHandle("Cosine").state;
-
84 float *velocity = StateHandle_getHandle("Velocity").state;
-
85 SlidingWindow *avgVel = StateHandle_getHandle("AvgVelBuffer").state;
-
86 SlidingWindow *avgPress = StateHandle_getHandle("AvgPressBuffer").state;
-
87
+
77
+
78 UART *usb = DeviceHandle_getHandle("USB").device;
+
79 DeviceHandle_t accelHandle = DeviceHandle_getHandle("Accel");
+
80 KX134_1211 *accel = accelHandle.device;
+
81
+
82 float *altitude = StateHandle_getHandle("Altitude").state;
+
83 float *cosine = StateHandle_getHandle("Cosine").state;
+
84 float *velocity = StateHandle_getHandle("Velocity").state;
+
85 SlidingWindow *avgVel = StateHandle_getHandle("AvgVelBuffer").state;
+
86 SlidingWindow *avgPress = StateHandle_getHandle("AvgPressBuffer").state;
+
87
88 for (;;) {
89 // Block until 20ms interval
-
90 TickType_t xLastWakeTime = xTaskGetTickCount();
+
90 TickType_t xLastWakeTime = xTaskGetTickCount();
91 vTaskDelayUntil(&xLastWakeTime, xFrequency);
-
92
+
92
93 // Update baro data
-
94 #ifdef DUMMY
-
95 const unsigned long press_length = 0x00003A5C;
-
96 if (lDummyIdx < PRESS_LENGTH - 1) {
-
97 uint32_t tempPress = (uint32_t)press[lDummyIdx + 1] << 16 | press[lDummyIdx];
-
98 memcpy(&baro->press, &tempPress, sizeof(float));
-
99 lDummyIdx += 2;
-
100 }
-
101 #else
-
102 taskENTER_CRITICAL();
-
103 baro->update(baro);
-
104 taskEXIT_CRITICAL();
-
105 #endif
+
94#ifdef DUMMY
+
95 const unsigned long press_length = 0x00003A5C;
+
96 if (lDummyIdx < PRESS_LENGTH - 1) {
+
97 uint32_t tempPress = (uint32_t)press[lDummyIdx + 1] << 16 | press[lDummyIdx];
+
98 memcpy(&baro->press, &tempPress, sizeof(float));
+
99 lDummyIdx += 2;
+
100 }
+
101#else
+
102 taskENTER_CRITICAL();
+
103 baro->update(baro);
+
104 taskEXIT_CRITICAL();
+
105#endif
106
107 // Calculate altitude
108 *altitude = 44330 * (1.0 - pow(baro->press / baro->groundPress, 0.1903));
-
109
+
109
110 // Add sensor data and barometer data to dataframe
111 mem->append(mem, HEADER_LOWRES);
112 mem->appendBytes(mem, baro->rawTemp, BMP581_DATA_SIZE);
@@ -212,29 +212,29 @@
125 avgVel->append(avgVel, *velocity);
126 }
127
-
128 #ifdef DEBUG
-
131 if ((xSemaphoreTake(xUsbMutex, pdMS_TO_TICKS(0))) == pdTRUE) {
-
132 char debugStr[100];
-
133 snprintf(debugStr, 100, "[LDataAcq] %d\tBaro\tPressure: %.0f\tTemperature: %.1f\n\r", lDummyIdx / 2, baro->press, baro->temp);
-
134 xMessageBufferSend(xUsbTxBuff, (void *)debugStr, 100, pdMS_TO_TICKS(10));
-
135 xSemaphoreGive(xUsbMutex);
-
136 }
-
137 #endif
+
128#ifdef DEBUG
+
131 if ((xSemaphoreTake(xUsbMutex, pdMS_TO_TICKS(0))) == pdTRUE) {
+
132 char debugStr[100];
+
133 snprintf(debugStr, 100, "[LDataAcq] %d\tBaro\tPressure: %.0f\tTemperature: %.1f\n\r", lDummyIdx / 2, baro->press, baro->temp);
+
134 xMessageBufferSend(xUsbTxBuff, (void *)debugStr, 100, pdMS_TO_TICKS(10));
+
135 xSemaphoreGive(xUsbMutex);
+
136 }
+
137#endif
138 }
139}
140
Struct definition for UART interface.
Definition uart.h:53
- + - -
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
+ +
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
DeviceType device
Enum specifier for device type.
Definition spi.h:50
diff --git a/html/lDataAcquisition_8h_source.html b/html/ldataacquisition_8h_source.html similarity index 89% rename from html/lDataAcquisition_8h_source.html rename to html/ldataacquisition_8h_source.html index 9ee59f7..8d4da1c 100644 --- a/html/lDataAcquisition_8h_source.html +++ b/html/ldataacquisition_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/lDataAcquisition.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/data/ldataacquisition.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
lDataAcquisition.h
+
ldataacquisition.h
1#ifndef _LDATAACQUISITION_H
@@ -111,13 +111,13 @@
8
9#include "stdio.h"
10
-
11#include "BMP581.h"
-
12#include "KX134_1211.h"
-
13#include "dataframe.h"
-
14#include "kalmanfilter.h"
+
11#include "bmp581.h"
+
12#include "dataframe.h"
+
13#include "kalmanfilter.h"
+
14#include "kx134_1211.h"
15#include "membuff.h"
16#include "sensors.h"
-
17#include "stateUpdate.h"
+
17#include "stateupdate.h"
18
19#ifdef DUMMY
20 #include "press.h"
@@ -133,16 +133,14 @@
29
30#endif
- - - - + +
diff --git a/html/loraComm_8c_source.html b/html/loracomm_8c_source.html similarity index 87% rename from html/loraComm_8c_source.html rename to html/loracomm_8c_source.html index aa78bab..fdf46d8 100644 --- a/html/loraComm_8c_source.html +++ b/html/loracomm_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/loraComm.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/loracomm.c Source File @@ -72,7 +72,7 @@
@@ -98,14 +98,14 @@
-
loraComm.c
+
loracomm.c
1/* ===================================================================== *
2 * LORA HANDLING *
3 * ===================================================================== */
4
-
5#include "loraComm.h"
+
5#include "loracomm.h"
6
7extern EventGroupHandle_t xMsgReadyGroup;
8extern MessageBufferHandle_t xLoRaTxBuff;
@@ -115,7 +115,7 @@
19 const TickType_t blockTime = portMAX_DELAY;
20 uint8_t rxData[LORA_MSG_LENGTH];
21
-
22 LoRa *lora = DeviceHandle_getHandle("LoRa").device;
+
22 LoRa *lora = DeviceHandle_getHandle("LoRa").device;
23
24 for (;;) {
25 // Wait for SX1272 to be ready for transmission
@@ -139,22 +139,22 @@
43
52void vLoRaSample(void *argument) {
53 const TickType_t xFrequency = pdMS_TO_TICKS(250);
-
54 const TickType_t blockTime = pdMS_TO_TICKS(125);
-
55
-
56 A3G4250D *gyro = DeviceHandle_getHandle("Gyro").device;
-
57 KX134_1211 *lAccel = DeviceHandle_getHandle("LAccel").device;
-
58 KX134_1211 *hAccel = DeviceHandle_getHandle("HAccel").device;
-
59
-
60 enum State *flightState = StateHandle_getHandle("FlightState").state;
-
61 float *altitude = StateHandle_getHandle("Altitude").state;
-
62 float *velocity = StateHandle_getHandle("Velocity").state;
+
54 const TickType_t blockTime = pdMS_TO_TICKS(125);
+
55
+
56 A3G4250D *gyro = DeviceHandle_getHandle("Gyro").device;
+
57 KX134_1211 *lAccel = DeviceHandle_getHandle("LAccel").device;
+
58 KX134_1211 *hAccel = DeviceHandle_getHandle("HAccel").device;
+
59
+
60 enum State *flightState = StateHandle_getHandle("FlightState").state;
+
61 float *altitude = StateHandle_getHandle("Altitude").state;
+
62 float *velocity = StateHandle_getHandle("Velocity").state;
63
64 for (;;) {
65 // Block until 250ms interval
-
66 TickType_t xLastWakeTime = xTaskGetTickCount();
+
66 TickType_t xLastWakeTime = xTaskGetTickCount();
67 vTaskDelayUntil(&xLastWakeTime, xFrequency);
-
68
-
69 uint8_t systemStatus = xEventGroupGetBits(xSystemStatusGroup);
+
68
+
69 uint8_t systemStatus = xEventGroupGetBits(xSystemStatusGroup);
70
71 // Create AVData packet with current data
72 LoRa_Packet avData = LoRa_AVData(
@@ -190,10 +190,10 @@
109}
LoRa_Packet LoRa_AVData(uint8_t, uint8_t, uint8_t *, uint8_t *, uint8_t, uint8_t *, uint8_t, float, float)
Constructs a LoRa packet with accelerometer and gyroscope data, altitude, and velocity for transmissi...
Definition lora.c:122
- -
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition A3G4250D.h:49
- -
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition KX134_1211.h:62
+ +
uint8_t rawGyroData[A3G4250D_DATA_TOTAL]
Raw gyro rates array.
Definition a3g4250d.h:49
+ +
uint8_t rawAccelData[KX134_1211_DATA_TOTAL]
Raw accelerations array.
Definition kx134_1211.h:62
Definition lora.h:95
void(* transmit)(struct LoRa *, uint8_t *)
LoRa transmit method.
Definition lora.h:97
DeviceType device
Enum specifier for device type.
Definition spi.h:50
@@ -202,7 +202,7 @@ diff --git a/html/loraComm_8h_source.html b/html/loracomm_8h_source.html similarity index 87% rename from html/loraComm_8h_source.html rename to html/loracomm_8h_source.html index 78b5d7d..d955b1f 100644 --- a/html/loraComm_8h_source.html +++ b/html/loracomm_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/loraComm.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/loracomm.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
loraComm.h
+
loracomm.h
1#ifndef _LORATRANSMIT_H
@@ -110,12 +110,12 @@
7#include "message_buffer.h"
8#include "stm32f439xx.h"
9
-
10#include "devices.h"
-
11#include "BMP581.h"
-
12#include "A3G4250D.h"
-
13#include "KX134_1211.h"
+
10#include "a3g4250d.h"
+
11#include "bmp581.h"
+
12#include "devices.h"
+
13#include "kx134_1211.h"
14#include "lora.h"
-
15#include "stateUpdate.h"
+
15#include "stateupdate.h"
16
17void vLoRaTransmit(void *pvParameters);
18void vLoRaSample(void *pvParameters);
@@ -136,21 +136,18 @@
30
31#endif
- - - - - + +
Definition lora.h:95
- - - + + +
diff --git a/html/main_8c_source.html b/html/main_8c_source.html index 25fc20b..35d2b7b 100644 --- a/html/main_8c_source.html +++ b/html/main_8c_source.html @@ -421,11 +421,11 @@
346// Unsure of actual fix for linker error
347// temporary (lol) solution
348void _init() {}
-
DeviceHandle_t A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *)
Initialiser for a A3G4250D gyroscope.
Definition A3G4250D.c:27
-
DeviceHandle_t BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float)
Initialiser for a BMP581 barometer.
Definition BMP581.c:27
+
DeviceHandle_t A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *)
Initialiser for a A3G4250D gyroscope.
Definition a3g4250d.c:27
+
DeviceHandle_t BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float)
Initialiser for a BMP581 barometer.
Definition bmp581.c:27
DeviceHandle_t Flash_init(Flash *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, int, long)
Initialise flash struct.
Definition flash.c:33
Definition gps.h:62
-
DeviceHandle_t KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *)
Initialiser for a KX134-1211 accelerometer.
Definition KX134_1211.c:25
+
DeviceHandle_t KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *)
Initialiser for a KX134-1211 accelerometer.
Definition kx134_1211.c:25
DeviceHandle_t LoRa_init(LoRa *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, Bandwidth, SpreadingFactor, CodingRate)
Initializes the LoRa module with specified configuration parameters.
Definition lora.c:37
DeviceHandle_t UART_init(UART *, char[DEVICE_NAME_LENGTH], USART_TypeDef *, GPIO_TypeDef *, UART_Pins, uint32_t, OversampleMode)
Initialiser for a UART device interface.
Definition uart.c:26
Struct definition for UART interface.
Definition uart.h:53
@@ -434,12 +434,12 @@
void configure_interrupts()
Definition main.c:331
int Shell_init(Shell *)
Initializes the shell, registering programs from shell vector.
Definition shell.c:45
Definition shell.h:34
- - + +
Definition flash.h:30
- +
Definition lora.h:95
diff --git a/html/main_8h.html b/html/main_8h.html index 4ae833e..93a8970 100644 --- a/html/main_8h.html +++ b/html/main_8h.html @@ -112,23 +112,23 @@ #include "handles.h"
#include "message_buffer.h"
#include "semphr.h"
-#include "flashWrite.h"
-#include "gpsAcquisition.h"
-#include "hDataAcquisition.h"
-#include "lDataAcquisition.h"
-#include "loraComm.h"
-#include "payloadComm.h"
-#include "usbComm.h"
-#include "stateUpdate.h"
-#include "A3G4250D.h"
-#include "BMP581.h"
-#include "KX134_1211.h"
+#include "flashwrite.h"
+#include "gpsacquisition.h"
+#include "hdataacquisition.h"
+#include "ldataacquisition.h"
+#include "loracomm.h"
+#include "payloadcomm.h"
+#include "usbcomm.h"
+#include "stateupdate.h"
+#include "a3g4250d.h"
+#include "bmp581.h"
#include "can.h"
#include "dataframe.h"
#include "devices.h"
#include "drivers.h"
#include "flash.h"
#include "gps.h"
+#include "kx134_1211.h"
#include "lora.h"
#include "sensors.h"
#include "shell.h"
diff --git a/html/main_8h_source.html b/html/main_8h_source.html index 5e03a38..8112f86 100644 --- a/html/main_8h_source.html +++ b/html/main_8h_source.html @@ -117,26 +117,26 @@
17#include "message_buffer.h"
18#include "semphr.h"
19
-
20#include "flashWrite.h"
-
21#include "gpsAcquisition.h"
-
22#include "hDataAcquisition.h"
-
23#include "lDataAcquisition.h"
+
20#include "flashwrite.h"
+
21#include "gpsacquisition.h"
+
22#include "hdataacquisition.h"
+
23#include "ldataacquisition.h"
24
-
25#include "loraComm.h"
-
26#include "payloadComm.h"
-
27#include "usbComm.h"
+
25#include "loracomm.h"
+
26#include "payloadcomm.h"
+
27#include "usbcomm.h"
28
-
29#include "stateUpdate.h"
+
29#include "stateupdate.h"
30
-
31#include "A3G4250D.h"
-
32#include "BMP581.h"
-
33#include "KX134_1211.h"
-
34#include "can.h"
-
35#include "dataframe.h"
-
36#include "devices.h"
-
37#include "drivers.h"
-
38#include "flash.h"
-
39#include "gps.h"
+
31#include "a3g4250d.h"
+
32#include "bmp581.h"
+
33#include "can.h"
+
34#include "dataframe.h"
+
35#include "devices.h"
+
36#include "drivers.h"
+
37#include "flash.h"
+
38#include "gps.h"
+
39#include "kx134_1211.h"
40#include "lora.h"
41#include "sensors.h"
42#include "shell.h"
@@ -197,19 +197,18 @@
97// USB UART
98#define USB_INTERFACE USART6
99#define USB_PORT GPIOC
-
100#define USB_PINS (UART_Pins){.TX = 6, .RX = 7}
-
101#define USB_BAUD 921600
-
102
-
103// GPS UART
-
104#define GPS_INTERFACE USART3
-
105#define GPS_PORT GPIOD
-
106#define GPS_PINS (UART_Pins){.TX = 8, .RX = 9}
-
107#define GPS_BAUD 9600
-
108
-
109#endif
- - - +
100#define USB_PINS \
+
101 (UART_Pins) { .TX = 6, .RX = 7 }
+
102#define USB_BAUD 921600
+
103
+
104// GPS UART
+
105#define GPS_INTERFACE USART3
+
106#define GPS_PORT GPIOD
+
107#define GPS_PINS \
+
108 (UART_Pins) { .TX = 8, .RX = 9 }
+
109#define GPS_BAUD 9600
+
110
+
111#endif
void vSystemInit(void *pvParameters)
Initialisation of RTOS tasks.
Definition main.c:185
void configure_interrupts()
Definition main.c:331
diff --git a/html/navtreedata.js b/html/navtreedata.js index cb8f2e1..4a0ab72 100644 --- a/html/navtreedata.js +++ b/html/navtreedata.js @@ -68,8 +68,8 @@ var NAVTREE = var NAVTREEINDEX = [ -"A3G4250D_8c_source.html", -"uart_8c_source.html" +"FreeRTOSConfig_8h_source.html", +"usbcomm_8h_source.html" ]; var SYNCONMSG = 'click to disable panel synchronization'; diff --git a/html/navtreeindex0.js b/html/navtreeindex0.js index af9c1c2..da3e5f3 100644 --- a/html/navtreeindex0.js +++ b/html/navtreeindex0.js @@ -1,21 +1,16 @@ var NAVTREEINDEX0 = { -"A3G4250D_8c_source.html":[5,0,0,0,1,3,2,2,0], -"A3G4250D_8h.html":[5,0,0,0,0,3,2,2,0], -"A3G4250D_8h_source.html":[5,0,0,0,0,3,2,2,0], -"BMP581_8c_source.html":[5,0,0,0,1,3,2,1,0], -"BMP581_8h.html":[5,0,0,0,0,3,2,1,0], -"BMP581_8h_source.html":[5,0,0,0,0,3,2,1,0], "FreeRTOSConfig_8h_source.html":[5,0,0,0,0,1,1], -"KX134__1211_8c_source.html":[5,0,0,0,1,3,2,0,0], -"KX134__1211_8h.html":[5,0,0,0,0,3,2,0,0], -"KX134__1211_8h_source.html":[5,0,0,0,0,3,2,0,0], "RTOS.html":[1], "RTOS.html#task-architecture":[1,0], +"a3g4250d_8c_source.html":[5,0,0,0,1,3,2,2,0], +"a3g4250d_8h_source.html":[5,0,0,0,0,3,2,2,0], "annotated.html":[4,0], "baro_8c_source.html":[5,0,0,0,1,2,0], "baro_8h.html":[5,0,0,0,0,2,0], "baro_8h_source.html":[5,0,0,0,0,2,0], +"bmp581_8c_source.html":[5,0,0,0,1,3,2,1,0], +"bmp581_8h_source.html":[5,0,0,0,0,3,2,1,0], "can_8c_source.html":[5,0,0,0,1,0,0], "can_8h_source.html":[5,0,0,0,0,0,0], "classes.html":[4,1], @@ -36,7 +31,6 @@ var NAVTREEINDEX0 = "dir_429bd49d7923c3fdcac718d2583ee14f.html":[5,0,0,0,0,3,1], "dir_454bad1810d45ef205f36285493a4259.html":[5,0,0,0,0,1,0,0], "dir_49f9add2fa033aa75cd2c74898fc4543.html":[5,0,0,0,1,2], -"dir_4a6d534895bf450f20cc8c4e6cf876fa.html":[5,0,0,0,0,4,1], "dir_4e10f410f654b0605b5f2a5d4be99138.html":[5,0,0,0,0,3], "dir_4e9f9e2f3df90fb40a00860b0ce395ae.html":[5,0,0,0,1,3,1], "dir_5002134934530f64bf14c3c357e99f44.html":[5,0,0,0,1,1,0], @@ -45,36 +39,37 @@ var NAVTREEINDEX0 = "dir_666fbf14515ba845dc19cad73d3b2e03.html":[5,0,0,0,0,1,0], "dir_6ba04829bafb2b4d2b73148d4157485a.html":[5,0,0,0,1,1,0,1], "dir_6e3d3c9975f881f9a99d7cf8c41d7d58.html":[5,0,0,0,0,3,2], -"dir_79458f2e361a339059eb67427ca72e71.html":[5,0,0,0,1,4,0], +"dir_7ddbe5deeb9defe78a41607f57037c65.html":[5,0,0,0,0,4,1], "dir_8006f95f29930d79a2ac9fbcbadce3f4.html":[5,0,0,0,1,3,2], "dir_88fd42b624d4283fb3adf5b684d104f6.html":[5,0,0,0,1,3,2,1], "dir_9077728e86265b8d60b7e4eba38b0196.html":[5,0,0,0,0], -"dir_a099a532a912b28b348a0b4072f526c3.html":[5,0,0,0,1,4,1], "dir_ac9b8ec28640c72514f3dee81eae04c1.html":[5,0,0,0,1,1], "dir_b0699fd9b60c004d08b193c4b8527aef.html":[5,0,0,0,0,1,0,1], "dir_b107e5b317c7b4231f049dc293a4ea7a.html":[5,0,0,0,0,3,2,1], +"dir_b267afe36e41846e092a15d779abd09b.html":[5,0,0,0,1,4,0], "dir_bdfc59bdfd215e39551ce63c339607c5.html":[5,0,0], -"dir_c5d957e1d6edf6e0862fe2c47be63581.html":[5,0,0,0,0,4,0], +"dir_d5781cb985fe9143d99b85977a90ea8c.html":[5,0,0,0,1,4,1], "dir_de758f7680769a5af14e6b04c836d25d.html":[5,0,0,0,0,3,2,0], "dir_f3dc2586054b6436c8963d95dde2b2f3.html":[5,0,0,0,1,3], +"dir_f7335c77276d33bd48fd54b1c7322725.html":[5,0,0,0,0,4,0], "dir_f98cf8829f334b8faf84e5437d3b424c.html":[5,0,0,0,0,3,0], "drivers_8c_source.html":[5,0,0,0,1,6], "drivers_8h_source.html":[5,0,0,0,0,7], "files.html":[5,0], -"flashWrite_8c_source.html":[5,0,0,0,1,1,0,1,0], -"flashWrite_8h_source.html":[5,0,0,0,0,1,0,1,0], "flash_8c_source.html":[5,0,0,0,1,3,0,0], "flash_8h_source.html":[5,0,0,0,0,3,0,0], +"flashwrite_8c_source.html":[5,0,0,0,1,1,0,1,0], +"flashwrite_8h_source.html":[5,0,0,0,0,1,0,1,0], "freertos_8c_source.html":[5,0,0,0,1,1,1], "functions.html":[4,3,0], "functions_vars.html":[4,3,1], "globals.html":[5,1,0], "globals_func.html":[5,1,1], "gpio_8h_source.html":[5,0,0,0,0,8], -"gpsAcquisition_8c_source.html":[5,0,0,0,1,1,0,1,1], -"gpsAcquisition_8h_source.html":[5,0,0,0,0,1,0,1,1], "gps_8c_source.html":[5,0,0,0,1,4,0,0], "gps_8h_source.html":[5,0,0,0,0,4,0,0], +"gpsacquisition_8c_source.html":[5,0,0,0,1,1,0,1,1], +"gpsacquisition_8h_source.html":[5,0,0,0,0,1,0,1,1], "group__A3G4250D.html":[3,0,1,2,2,0], "group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198":[3,0,1,2,2,0,5], "group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d":[3,0,1,2,2,0,3], @@ -152,9 +147,9 @@ var NAVTREEINDEX0 = "group__UART__Interface.html#structUART":[3,0,2,1,1], "group__UART__Interface.html#structUART__Pins":[3,0,2,1,0], "groups_8h_source.html":[5,0,0,0,0,1,2], -"hDataAcquisition_8c_source.html":[5,0,0,0,1,1,0,1,2], -"hDataAcquisition_8h_source.html":[5,0,0,0,0,1,0,1,2], "handles_8h_source.html":[5,0,0,0,0,1,3], +"hdataacquisition_8c_source.html":[5,0,0,0,1,1,0,1,2], +"hdataacquisition_8h_source.html":[5,0,0,0,0,1,0,1,2], "help_8c_source.html":[5,0,0,0,1,2,1], "help_8h.html":[5,0,0,0,0,2,1], "help_8h_source.html":[5,0,0,0,0,2,1], @@ -173,14 +168,16 @@ var NAVTREEINDEX0 = "index.html#special-thanks":[0,4,1], "index.html#table-of-contents":[0,1], "index.html#windows":[0,3,0,0], -"lDataAcquisition_8c_source.html":[5,0,0,0,1,1,0,1,3], -"lDataAcquisition_8h_source.html":[5,0,0,0,0,1,0,1,3], +"kx134__1211_8c_source.html":[5,0,0,0,1,3,2,0,0], +"kx134__1211_8h_source.html":[5,0,0,0,0,3,2,0,0], "launch_8c_source.html":[5,0,0,0,1,2,2], "launch_8h_source.html":[5,0,0,0,0,2,2], -"loraComm_8c_source.html":[5,0,0,0,1,1,0,0,0], -"loraComm_8h_source.html":[5,0,0,0,0,1,0,0,0], +"ldataacquisition_8c_source.html":[5,0,0,0,1,1,0,1,3], +"ldataacquisition_8h_source.html":[5,0,0,0,0,1,0,1,3], "lora_8c_source.html":[5,0,0,0,1,3,1,0], "lora_8h_source.html":[5,0,0,0,0,3,1,0], +"loracomm_8c_source.html":[5,0,0,0,1,1,0,0,0], +"loracomm_8h_source.html":[5,0,0,0,0,1,0,0,0], "main_8c_source.html":[5,0,0,0,1,7], "main_8h.html":[5,0,0,0,0,9], "main_8h.html#a1b5b6b8a0deefc75b4e1c7ecbb1696ff":[5,0,0,0,0,9,0], @@ -190,8 +187,8 @@ var NAVTREEINDEX0 = "mem_8h_source.html":[5,0,0,0,0,2,3], "pages.html":[], "params_8h_source.html":[5,0,0,0,0,10], -"payloadComm_8c_source.html":[5,0,0,0,1,1,0,0,1], -"payloadComm_8h_source.html":[5,0,0,0,0,1,0,0,1], +"payloadcomm_8c_source.html":[5,0,0,0,1,1,0,0,1], +"payloadcomm_8h_source.html":[5,0,0,0,0,1,0,0,1], "sensors_8c_source.html":[5,0,0,0,1,3,2,3], "sensors_8h_source.html":[5,0,0,0,0,3,2,3], "shell_8c_source.html":[5,0,0,0,1,4,1,0], @@ -207,8 +204,8 @@ var NAVTREEINDEX0 = "shell_8h_source.html":[5,0,0,0,0,4,1,0], "spi_8c_source.html":[5,0,0,0,1,3,3], "spi_8h_source.html":[5,0,0,0,0,3,3], -"stateUpdate_8c_source.html":[5,0,0,0,1,1,0,2], -"stateUpdate_8h_source.html":[5,0,0,0,0,1,0,2], +"stateupdate_8c_source.html":[5,0,0,0,1,1,0,2], +"stateupdate_8h_source.html":[5,0,0,0,0,1,0,2], "structA3G4250D.html":[3,0,1,2,2,0,0], "structA3G4250D.html#a120dc343e4414035eb30db07029f26b0":[3,0,1,2,2,0,0,8], "structA3G4250D.html#a6e3a9ebc712a4a2f4d0d9e4ee0edf2f7":[3,0,1,2,2,0,0,0], @@ -249,5 +246,8 @@ var NAVTREEINDEX0 = "structSPI.html#ac67e3827d337ab14c922753d83ecee5e":[3,0,1,3,0,5], "structSPI.html#acbda99bed92b76328c472ad0e523424e":[3,0,1,3,0,1], "todo.html":[2], -"topics.html":[3] +"topics.html":[3], +"uart_8c_source.html":[5,0,0,0,1,4,2], +"uart_8h_source.html":[5,0,0,0,0,4,2], +"usbcomm_8c_source.html":[5,0,0,0,1,1,0,0,2] }; diff --git a/html/navtreeindex1.js b/html/navtreeindex1.js index 996ce3b..39db1ea 100644 --- a/html/navtreeindex1.js +++ b/html/navtreeindex1.js @@ -1,7 +1,4 @@ var NAVTREEINDEX1 = { -"uart_8c_source.html":[5,0,0,0,1,4,2], -"uart_8h_source.html":[5,0,0,0,0,4,2], -"usbComm_8c_source.html":[5,0,0,0,1,1,0,0,2], -"usbComm_8h_source.html":[5,0,0,0,0,1,0,0,2] +"usbcomm_8h_source.html":[5,0,0,0,0,1,0,0,2] }; diff --git a/html/payloadComm_8c_source.html b/html/payloadcomm_8c_source.html similarity index 74% rename from html/payloadComm_8c_source.html rename to html/payloadcomm_8c_source.html index 963673c..ea8f71e 100644 --- a/html/payloadComm_8c_source.html +++ b/html/payloadcomm_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/payloadComm.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/payloadcomm.c Source File @@ -72,7 +72,7 @@
@@ -98,14 +98,14 @@
-
payloadComm.c
+
payloadcomm.c
1/* ===================================================================== *
2 * PAYLOAD *
3 * ===================================================================== */
4
-
5#include "payloadComm.h"
+
5#include "payloadcomm.h"
6
7extern MessageBufferHandle_t xLoRaTxBuff;
8extern MessageBufferHandle_t xUsbTxBuff;
@@ -113,30 +113,30 @@
10extern EventGroupHandle_t xSystemStatusGroup;
11
12bool payloadCANRequest(unsigned int can, uint16_t id, unsigned int *out) {
-
13
-
14 TIM6->ARR &= (~(TIM_ARR_ARR_Msk));
+
13
+
14 TIM6->ARR &= (~(TIM_ARR_ARR_Msk));
15 TIM6->PSC &= (~(TIM_PSC_PSC_Msk));
-
16 TIM6->SR &= ~(TIM_SR_UIF);
+
16 TIM6->SR &= ~(TIM_SR_UIF);
17 TIM6->ARR = 49999;
18 TIM6->PSC = 167;
19 TIM6->CR1 |= TIM_CR1_CEN;
20
-
21 // Request data from payload
-
22 CAN_TX(can, 8, 0x00, 0x00, id);
-
23
-
24 // Set output data
-
25 struct CAN_RX_data payloadRx = {.CAN_number = can};
-
26
-
27 // Wait until response is received with timeout
-
28 while((CAN_RX(&payloadRx) != 0x01) && (payloadRx.address != id)) {
-
29 if (TIM6->SR & TIM_SR_UIF)
-
30 return false;
-
31 }
-
32
-
33 // Set output data and return
-
34 out[0] = payloadRx.dataL;
-
35 out[1] = payloadRx.dataH;
-
36 return true;
+
21 // Request data from payload
+
22 CAN_TX(can, 8, 0x00, 0x00, id);
+
23
+
24 // Set output data
+
25 struct CAN_RX_data payloadRx = {.CAN_number = can};
+
26
+
27 // Wait until response is received with timeout
+
28 while ((CAN_RX(&payloadRx) != 0x01) && (payloadRx.address != id)) {
+
29 if (TIM6->SR & TIM_SR_UIF)
+
30 return false;
+
31 }
+
32
+
33 // Set output data and return
+
34 out[0] = payloadRx.dataL;
+
35 out[1] = payloadRx.dataH;
+
36 return true;
37}
38
39void vPayloadTransmit(void *argument) {
@@ -145,40 +145,39 @@
42
43 for (;;) {
44 // Block until 250ms interval
-
45 TickType_t xLastWakeTime = xTaskGetTickCount();
+
45 TickType_t xLastWakeTime = xTaskGetTickCount();
46 vTaskDelayUntil(&xLastWakeTime, xFrequency);
-
47
-
48 uint8_t errCount = 0;
+
47
+
48 uint8_t errCount = 0;
49
-
50 unsigned int payloadState[2];
-
51 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_STATUS, payloadState);
-
52
-
53 unsigned int payloadAccel[2];
-
54 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_ACCEL, payloadAccel);
-
55
-
56 unsigned int payloadBaro1[2];
-
57 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_BARO1, payloadBaro1);
-
58
-
59 unsigned int payloadBaro2[2];
-
60 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_BARO2, payloadBaro2);
-
61
-
62 if(errCount > 2)
-
63 xEventGroupSetBits(xSystemStatusGroup, GROUP_SYSTEM_STATUS_PAYLOAD);
-
64 else
-
65 xEventGroupClearBits(xSystemStatusGroup, GROUP_SYSTEM_STATUS_PAYLOAD);
+
50 unsigned int payloadState[2];
+
51 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_STATUS, payloadState);
+
52
+
53 unsigned int payloadAccel[2];
+
54 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_ACCEL, payloadAccel);
+
55
+
56 unsigned int payloadBaro1[2];
+
57 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_BARO1, payloadBaro1);
+
58
+
59 unsigned int payloadBaro2[2];
+
60 errCount += !payloadCANRequest(CAN_PAYLOAD_AV, CAN_HEADER_PAYLOAD_BARO2, payloadBaro2);
+
61
+
62 if (errCount > 2)
+
63 xEventGroupSetBits(xSystemStatusGroup, GROUP_SYSTEM_STATUS_PAYLOAD);
+
64 else
+
65 xEventGroupClearBits(xSystemStatusGroup, GROUP_SYSTEM_STATUS_PAYLOAD);
66
-
67
-
68 LoRa_Packet payloadData = LoRa_PayloadData(
-
69 LORA_HEADER_PAYLOAD_DATA,
-
70 (uint8_t) payloadState[0],
-
71 (uint8_t *) payloadAccel,
-
72 PAYLOAD_ACCEL_TOTAL
-
73 );
-
74
-
75 // Add packet to queue
-
76 xMessageBufferSend(xLoRaTxBuff, &payloadData, LORA_MSG_LENGTH, blockTime);
-
77 }
-
78}
+
67 LoRa_Packet payloadData = LoRa_PayloadData(
+
68 LORA_HEADER_PAYLOAD_DATA,
+
69 (uint8_t)payloadState[0],
+
70 (uint8_t *)payloadAccel,
+
71 PAYLOAD_ACCEL_TOTAL
+
72 );
+
73
+
74 // Add packet to queue
+
75 xMessageBufferSend(xLoRaTxBuff, &payloadData, LORA_MSG_LENGTH, blockTime);
+
76 }
+
77}
@@ -186,7 +185,7 @@ diff --git a/html/payloadComm_8h_source.html b/html/payloadcomm_8h_source.html similarity index 92% rename from html/payloadComm_8h_source.html rename to html/payloadcomm_8h_source.html index 2389d53..c15bb34 100644 --- a/html/payloadComm_8h_source.html +++ b/html/payloadcomm_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/payloadComm.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/payloadcomm.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
payloadComm.h
+
payloadcomm.h
1#ifndef _PAYLOADCOMM_H
@@ -109,11 +109,11 @@
6#include "message_buffer.h"
7#include "stdio.h"
8
-
9#include "params.h"
-
10#include "stateUpdate.h"
-
11#include "dataframe.h"
-
12#include "can.h"
-
13#include "lora.h"
+
9#include "can.h"
+
10#include "dataframe.h"
+
11#include "lora.h"
+
12#include "params.h"
+
13#include "stateupdate.h"
14
15#define PAYLOAD_ACCEL_TOTAL 6
16
@@ -125,7 +125,7 @@ diff --git a/html/search/all_2.js b/html/search/all_2.js index bb56c12..7c5c519 100644 --- a/html/search/all_2.js +++ b/html/search/all_2.js @@ -1,20 +1,19 @@ var searchData= [ ['a3g4250d_0',['A3G4250D',['../structA3G4250D.html',1,'A3G4250D'],['../group__A3G4250D.html',1,'A3G4250D']]], - ['a3g4250d_2eh_1',['A3G4250D.h',['../A3G4250D_8h.html',1,'']]], - ['a3g4250d_5finit_2',['A3G4250D_init',['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *): A3G4250D.c'],['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign): A3G4250D.c']]], - ['a3g4250d_5fprocessrawbytes_3',['A3G4250D_processRawBytes',['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *): A3G4250D.c'],['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *gyro, uint8_t *bytes, float *out): A3G4250D.c']]], - ['a3g4250d_5freadgyro_4',['A3G4250D_readGyro',['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *, float *): A3G4250D.c'],['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *gyro, float *out): A3G4250D.c']]], - ['a3g4250d_5freadrawbytes_5',['A3G4250D_readRawBytes',['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *, uint8_t *): A3G4250D.c'],['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *gyro, uint8_t *out): A3G4250D.c']]], - ['a3g4250d_5fupdate_6',['A3G4250D_update',['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *): A3G4250D.c'],['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *gyro): A3G4250D.c']]], - ['acceldata_7',['accelData',['../structKX134__1211.html#a94a8f289851f3977d5fcb13ed2978e9f',1,'KX134_1211']]], - ['accelerometer_8',['Accelerometer',['../group__Accelerometer.html',1,'']]], - ['acknowledgements_9',['Acknowledgements',['../index.html#acknowledgements',1,'']]], - ['api_20reference_10',['API Reference',['../group__API.html',1,'']]], - ['architecture_11',['Task Architecture',['../RTOS.html#task-architecture',1,'']]], - ['australis_20avionics_20firmware_12',['Australis Avionics Firmware',['../index.html#australis-avionics-firmware',1,'']]], - ['australis_20firmware_20reference_13',['Australis Firmware Reference',['../index.html',1,'']]], - ['australis_20series_20flight_20computers_14',['FreeRTOS Based Firmware For Australis Series Flight Computers',['../index.html#freertos-based-firmware-for-australis-series-flight-computers',1,'']]], - ['avionics_20firmware_15',['Australis Avionics Firmware',['../index.html#australis-avionics-firmware',1,'']]], - ['axes_16',['axes',['../structKX134__1211.html#a16ca4e4dac4a37edf3a3a5e841b12229',1,'KX134_1211::axes'],['../structA3G4250D.html#a99daca74f4873d6aff1b8f5b44e82c2b',1,'A3G4250D::axes']]] + ['a3g4250d_5finit_1',['A3G4250D_init',['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *): a3g4250d.c'],['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign): a3g4250d.c']]], + ['a3g4250d_5fprocessrawbytes_2',['A3G4250D_processRawBytes',['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *): a3g4250d.c'],['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *gyro, uint8_t *bytes, float *out): a3g4250d.c']]], + ['a3g4250d_5freadgyro_3',['A3G4250D_readGyro',['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *, float *): a3g4250d.c'],['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *gyro, float *out): a3g4250d.c']]], + ['a3g4250d_5freadrawbytes_4',['A3G4250D_readRawBytes',['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *, uint8_t *): a3g4250d.c'],['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *gyro, uint8_t *out): a3g4250d.c']]], + ['a3g4250d_5fupdate_5',['A3G4250D_update',['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *): a3g4250d.c'],['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *gyro): a3g4250d.c']]], + ['acceldata_6',['accelData',['../structKX134__1211.html#a94a8f289851f3977d5fcb13ed2978e9f',1,'KX134_1211']]], + ['accelerometer_7',['Accelerometer',['../group__Accelerometer.html',1,'']]], + ['acknowledgements_8',['Acknowledgements',['../index.html#acknowledgements',1,'']]], + ['api_20reference_9',['API Reference',['../group__API.html',1,'']]], + ['architecture_10',['Task Architecture',['../RTOS.html#task-architecture',1,'']]], + ['australis_20avionics_20firmware_11',['Australis Avionics Firmware',['../index.html#australis-avionics-firmware',1,'']]], + ['australis_20firmware_20reference_12',['Australis Firmware Reference',['../index.html',1,'']]], + ['australis_20series_20flight_20computers_13',['FreeRTOS Based Firmware For Australis Series Flight Computers',['../index.html#freertos-based-firmware-for-australis-series-flight-computers',1,'']]], + ['avionics_20firmware_14',['Australis Avionics Firmware',['../index.html#australis-avionics-firmware',1,'']]], + ['axes_15',['axes',['../structKX134__1211.html#a16ca4e4dac4a37edf3a3a5e841b12229',1,'KX134_1211::axes'],['../structA3G4250D.html#a99daca74f4873d6aff1b8f5b44e82c2b',1,'A3G4250D::axes']]] ]; diff --git a/html/search/all_3.js b/html/search/all_3.js index 294ebe0..b7c661b 100644 --- a/html/search/all_3.js +++ b/html/search/all_3.js @@ -5,14 +5,13 @@ var searchData= ['base_2',['base',['../structFlash.html#a6e3a9ebc712a4a2f4d0d9e4ee0edf2f7',1,'Flash::base'],['../structLoRa.html#a6e3a9ebc712a4a2f4d0d9e4ee0edf2f7',1,'LoRa::base'],['../structKX134__1211.html#a6e3a9ebc712a4a2f4d0d9e4ee0edf2f7',1,'KX134_1211::base'],['../structA3G4250D.html#a6e3a9ebc712a4a2f4d0d9e4ee0edf2f7',1,'A3G4250D::base']]], ['based_20firmware_20for_20australis_20series_20flight_20computers_3',['FreeRTOS Based Firmware For Australis Series Flight Computers',['../index.html#freertos-based-firmware-for-australis-series-flight-computers',1,'']]], ['bmp581_4',['BMP581',['../structBMP581.html',1,'BMP581'],['../group__BMP581.html',1,'BMP581']]], - ['bmp581_2eh_5',['BMP581.h',['../BMP581_8h.html',1,'']]], - ['bmp581_5finit_6',['BMP581_init',['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float): BMP581.c'],['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity): BMP581.c']]], - ['bmp581_5fprocessrawpress_7',['BMP581_processRawPress',['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *, uint8_t *, float *): BMP581.c'],['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out): BMP581.c']]], - ['bmp581_5fprocessrawtemp_8',['BMP581_processRawTemp',['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *, uint8_t *, float *): BMP581.c'],['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out): BMP581.c']]], - ['bmp581_5freadpress_9',['BMP581_readPress',['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *, float *): BMP581.c'],['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *baro, float *out): BMP581.c']]], - ['bmp581_5freadrawpress_10',['BMP581_readRawPress',['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *, uint8_t *): BMP581.c'],['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *baro, uint8_t *out): BMP581.c']]], - ['bmp581_5freadrawtemp_11',['BMP581_readRawTemp',['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *, uint8_t *): BMP581.c'],['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *baro, uint8_t *out): BMP581.c']]], - ['bmp581_5freadtemp_12',['BMP581_readTemp',['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *, float *): BMP581.c'],['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *baro, float *out): BMP581.c']]], - ['bmp581_5fupdate_13',['BMP581_update',['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *): BMP581.c'],['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *baro): BMP581.c']]], - ['building_20the_20project_14',['Building the Project',['../index.html#building-the-project',1,'']]] + ['bmp581_5finit_5',['BMP581_init',['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float): bmp581.c'],['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity): bmp581.c']]], + ['bmp581_5fprocessrawpress_6',['BMP581_processRawPress',['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *, uint8_t *, float *): bmp581.c'],['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out): bmp581.c']]], + ['bmp581_5fprocessrawtemp_7',['BMP581_processRawTemp',['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *, uint8_t *, float *): bmp581.c'],['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out): bmp581.c']]], + ['bmp581_5freadpress_8',['BMP581_readPress',['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *, float *): bmp581.c'],['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *baro, float *out): bmp581.c']]], + ['bmp581_5freadrawpress_9',['BMP581_readRawPress',['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *, uint8_t *): bmp581.c'],['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *baro, uint8_t *out): bmp581.c']]], + ['bmp581_5freadrawtemp_10',['BMP581_readRawTemp',['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *, uint8_t *): bmp581.c'],['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *baro, uint8_t *out): bmp581.c']]], + ['bmp581_5freadtemp_11',['BMP581_readTemp',['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *, float *): bmp581.c'],['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *baro, float *out): bmp581.c']]], + ['bmp581_5fupdate_12',['BMP581_update',['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *): bmp581.c'],['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *baro): bmp581.c']]], + ['building_20the_20project_13',['Building the Project',['../index.html#building-the-project',1,'']]] ]; diff --git a/html/search/all_b.js b/html/search/all_b.js index e9dbec2..cc658c2 100644 --- a/html/search/all_b.js +++ b/html/search/all_b.js @@ -3,10 +3,9 @@ var searchData= ['key_20contributors_0',['Key Contributors',['../index.html#key-contributors',1,'']]], ['kx134_201211_1',['KX134-1211',['../group__KX134-1211.html',1,'']]], ['kx134_5f1211_2',['KX134_1211',['../structKX134__1211.html',1,'']]], - ['kx134_5f1211_2eh_3',['KX134_1211.h',['../KX134__1211_8h.html',1,'']]], - ['kx134_5f1211_5finit_4',['KX134_1211_init',['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *): KX134_1211.c'],['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign): KX134_1211.c']]], - ['kx134_5f1211_5fprocessrawbytes_5',['KX134_1211_processRawBytes',['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *): KX134_1211.c'],['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *accel, uint8_t *bytes, float *out): KX134_1211.c']]], - ['kx134_5f1211_5freadaccel_6',['KX134_1211_readAccel',['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *, float *): KX134_1211.c'],['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *accel, float *out): KX134_1211.c']]], - ['kx134_5f1211_5freadrawbytes_7',['KX134_1211_readRawBytes',['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *, uint8_t *): KX134_1211.c'],['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *accel, uint8_t *out): KX134_1211.c']]], - ['kx134_5f1211_5fupdate_8',['KX134_1211_update',['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *): KX134_1211.c'],['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *accel): KX134_1211.c']]] + ['kx134_5f1211_5finit_3',['KX134_1211_init',['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *): kx134_1211.c'],['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign): kx134_1211.c']]], + ['kx134_5f1211_5fprocessrawbytes_4',['KX134_1211_processRawBytes',['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *): kx134_1211.c'],['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *accel, uint8_t *bytes, float *out): kx134_1211.c']]], + ['kx134_5f1211_5freadaccel_5',['KX134_1211_readAccel',['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *, float *): kx134_1211.c'],['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *accel, float *out): kx134_1211.c']]], + ['kx134_5f1211_5freadrawbytes_6',['KX134_1211_readRawBytes',['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *, uint8_t *): kx134_1211.c'],['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *accel, uint8_t *out): kx134_1211.c']]], + ['kx134_5f1211_5fupdate_7',['KX134_1211_update',['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *): kx134_1211.c'],['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *accel): kx134_1211.c']]] ]; diff --git a/html/search/files_0.js b/html/search/files_0.js index f33ca6d..405330f 100644 --- a/html/search/files_0.js +++ b/html/search/files_0.js @@ -1,4 +1,4 @@ var searchData= [ - ['a3g4250d_2eh_0',['A3G4250D.h',['../A3G4250D_8h.html',1,'']]] + ['baro_2eh_0',['baro.h',['../baro_8h.html',1,'']]] ]; diff --git a/html/search/files_1.js b/html/search/files_1.js index 4e5ae89..f47a6b1 100644 --- a/html/search/files_1.js +++ b/html/search/files_1.js @@ -1,5 +1,4 @@ var searchData= [ - ['baro_2eh_0',['baro.h',['../baro_8h.html',1,'']]], - ['bmp581_2eh_1',['BMP581.h',['../BMP581_8h.html',1,'']]] + ['help_2eh_0',['help.h',['../help_8h.html',1,'']]] ]; diff --git a/html/search/files_2.js b/html/search/files_2.js index f47a6b1..58e4e08 100644 --- a/html/search/files_2.js +++ b/html/search/files_2.js @@ -1,4 +1,4 @@ var searchData= [ - ['help_2eh_0',['help.h',['../help_8h.html',1,'']]] + ['main_2eh_0',['main.h',['../main_8h.html',1,'']]] ]; diff --git a/html/search/files_3.js b/html/search/files_3.js index c292c00..e4f584c 100644 --- a/html/search/files_3.js +++ b/html/search/files_3.js @@ -1,4 +1,4 @@ var searchData= [ - ['kx134_5f1211_2eh_0',['KX134_1211.h',['../KX134__1211_8h.html',1,'']]] + ['shell_2eh_0',['shell.h',['../shell_8h.html',1,'']]] ]; diff --git a/html/search/files_4.js b/html/search/files_4.js deleted file mode 100644 index 58e4e08..0000000 --- a/html/search/files_4.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['main_2eh_0',['main.h',['../main_8h.html',1,'']]] -]; diff --git a/html/search/files_5.js b/html/search/files_5.js deleted file mode 100644 index e4f584c..0000000 --- a/html/search/files_5.js +++ /dev/null @@ -1,4 +0,0 @@ -var searchData= -[ - ['shell_2eh_0',['shell.h',['../shell_8h.html',1,'']]] -]; diff --git a/html/search/functions_1.js b/html/search/functions_1.js index 94f4b6a..6c16924 100644 --- a/html/search/functions_1.js +++ b/html/search/functions_1.js @@ -1,8 +1,8 @@ var searchData= [ - ['a3g4250d_5finit_0',['A3G4250D_init',['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *): A3G4250D.c'],['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign): A3G4250D.c']]], - ['a3g4250d_5fprocessrawbytes_1',['A3G4250D_processRawBytes',['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *): A3G4250D.c'],['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *gyro, uint8_t *bytes, float *out): A3G4250D.c']]], - ['a3g4250d_5freadgyro_2',['A3G4250D_readGyro',['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *, float *): A3G4250D.c'],['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *gyro, float *out): A3G4250D.c']]], - ['a3g4250d_5freadrawbytes_3',['A3G4250D_readRawBytes',['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *, uint8_t *): A3G4250D.c'],['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *gyro, uint8_t *out): A3G4250D.c']]], - ['a3g4250d_5fupdate_4',['A3G4250D_update',['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *): A3G4250D.c'],['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *gyro): A3G4250D.c']]] + ['a3g4250d_5finit_0',['A3G4250D_init',['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const uint8_t *, const int8_t *): a3g4250d.c'],['../group__A3G4250D.html#gaef872573d74e6f3d72be8611d6a81cf7',1,'A3G4250D_init(A3G4250D *gyro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float sensitivity, const uint8_t *axes, const int8_t *sign): a3g4250d.c']]], + ['a3g4250d_5fprocessrawbytes_1',['A3G4250D_processRawBytes',['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *, uint8_t *, float *): a3g4250d.c'],['../group__A3G4250D.html#ga0b884ae90373ad5fa4565610707ea198',1,'A3G4250D_processRawBytes(A3G4250D *gyro, uint8_t *bytes, float *out): a3g4250d.c']]], + ['a3g4250d_5freadgyro_2',['A3G4250D_readGyro',['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *, float *): a3g4250d.c'],['../group__A3G4250D.html#ga312e2655fabf3e10b2f71c90d8e1634d',1,'A3G4250D_readGyro(A3G4250D *gyro, float *out): a3g4250d.c']]], + ['a3g4250d_5freadrawbytes_3',['A3G4250D_readRawBytes',['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *, uint8_t *): a3g4250d.c'],['../group__A3G4250D.html#gadd64ac77b1a4f0414abc10dd0e8ab8ef',1,'A3G4250D_readRawBytes(A3G4250D *gyro, uint8_t *out): a3g4250d.c']]], + ['a3g4250d_5fupdate_4',['A3G4250D_update',['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *): a3g4250d.c'],['../group__A3G4250D.html#gaf17ae448137172dc27cc44ff1bbedf56',1,'A3G4250D_update(A3G4250D *gyro): a3g4250d.c']]] ]; diff --git a/html/search/functions_2.js b/html/search/functions_2.js index bc75412..6ee91b1 100644 --- a/html/search/functions_2.js +++ b/html/search/functions_2.js @@ -1,11 +1,11 @@ var searchData= [ - ['bmp581_5finit_0',['BMP581_init',['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float): BMP581.c'],['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity): BMP581.c']]], - ['bmp581_5fprocessrawpress_1',['BMP581_processRawPress',['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *, uint8_t *, float *): BMP581.c'],['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out): BMP581.c']]], - ['bmp581_5fprocessrawtemp_2',['BMP581_processRawTemp',['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *, uint8_t *, float *): BMP581.c'],['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out): BMP581.c']]], - ['bmp581_5freadpress_3',['BMP581_readPress',['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *, float *): BMP581.c'],['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *baro, float *out): BMP581.c']]], - ['bmp581_5freadrawpress_4',['BMP581_readRawPress',['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *, uint8_t *): BMP581.c'],['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *baro, uint8_t *out): BMP581.c']]], - ['bmp581_5freadrawtemp_5',['BMP581_readRawTemp',['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *, uint8_t *): BMP581.c'],['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *baro, uint8_t *out): BMP581.c']]], - ['bmp581_5freadtemp_6',['BMP581_readTemp',['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *, float *): BMP581.c'],['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *baro, float *out): BMP581.c']]], - ['bmp581_5fupdate_7',['BMP581_update',['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *): BMP581.c'],['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *baro): BMP581.c']]] + ['bmp581_5finit_0',['BMP581_init',['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const float, const float): bmp581.c'],['../group__BMP581.html#gae89b2e1315dbce45956e464d419e6f8d',1,'BMP581_init(BMP581 *baro, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, float tempSensitivity, float pressSensitivity): bmp581.c']]], + ['bmp581_5fprocessrawpress_1',['BMP581_processRawPress',['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *, uint8_t *, float *): bmp581.c'],['../group__BMP581.html#ga79cd0b07111850e9da010a032a9f0c67',1,'BMP581_processRawPress(BMP581 *baro, uint8_t *bytes, float *out): bmp581.c']]], + ['bmp581_5fprocessrawtemp_2',['BMP581_processRawTemp',['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *, uint8_t *, float *): bmp581.c'],['../group__BMP581.html#ga30620996a5c54f9347152c6c1a9ffe3f',1,'BMP581_processRawTemp(BMP581 *baro, uint8_t *bytes, float *out): bmp581.c']]], + ['bmp581_5freadpress_3',['BMP581_readPress',['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *, float *): bmp581.c'],['../group__BMP581.html#gad4cdc3fdf15ff84bf27f0fbd44a864cb',1,'BMP581_readPress(BMP581 *baro, float *out): bmp581.c']]], + ['bmp581_5freadrawpress_4',['BMP581_readRawPress',['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *, uint8_t *): bmp581.c'],['../group__BMP581.html#ga079e56e39011d47394cd00238096b832',1,'BMP581_readRawPress(BMP581 *baro, uint8_t *out): bmp581.c']]], + ['bmp581_5freadrawtemp_5',['BMP581_readRawTemp',['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *, uint8_t *): bmp581.c'],['../group__BMP581.html#ga5c2001e8ffdfedb9ba2114e3200a0163',1,'BMP581_readRawTemp(BMP581 *baro, uint8_t *out): bmp581.c']]], + ['bmp581_5freadtemp_6',['BMP581_readTemp',['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *, float *): bmp581.c'],['../group__BMP581.html#ga13a6eced2f99e5f6b059c16eb3fdaf34',1,'BMP581_readTemp(BMP581 *baro, float *out): bmp581.c']]], + ['bmp581_5fupdate_7',['BMP581_update',['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *): bmp581.c'],['../group__BMP581.html#ga938d6c33bc75406aa2b8a18d7e722473',1,'BMP581_update(BMP581 *baro): bmp581.c']]] ]; diff --git a/html/search/functions_5.js b/html/search/functions_5.js index 892b7ff..9cd181d 100644 --- a/html/search/functions_5.js +++ b/html/search/functions_5.js @@ -1,8 +1,8 @@ var searchData= [ - ['kx134_5f1211_5finit_0',['KX134_1211_init',['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *): KX134_1211.c'],['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign): KX134_1211.c']]], - ['kx134_5f1211_5fprocessrawbytes_1',['KX134_1211_processRawBytes',['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *): KX134_1211.c'],['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *accel, uint8_t *bytes, float *out): KX134_1211.c']]], - ['kx134_5f1211_5freadaccel_2',['KX134_1211_readAccel',['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *, float *): KX134_1211.c'],['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *accel, float *out): KX134_1211.c']]], - ['kx134_5f1211_5freadrawbytes_3',['KX134_1211_readRawBytes',['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *, uint8_t *): KX134_1211.c'],['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *accel, uint8_t *out): KX134_1211.c']]], - ['kx134_5f1211_5fupdate_4',['KX134_1211_update',['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *): KX134_1211.c'],['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *accel): KX134_1211.c']]] + ['kx134_5f1211_5finit_0',['KX134_1211_init',['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *, char[DEVICE_NAME_LENGTH], GPIO_TypeDef *, unsigned long, const uint8_t, const uint8_t *, const int8_t *): kx134_1211.c'],['../group__KX134-1211.html#gae72312345e3cb90fc97571a30272b8c3',1,'KX134_1211_init(KX134_1211 *accel, char name[DEVICE_NAME_LENGTH], GPIO_TypeDef *port, unsigned long cs, uint8_t scale, const uint8_t *axes, const int8_t *sign): kx134_1211.c']]], + ['kx134_5f1211_5fprocessrawbytes_1',['KX134_1211_processRawBytes',['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *, uint8_t *, float *): kx134_1211.c'],['../group__KX134-1211.html#ga9e1214c9a71e524c3c857c4275be344b',1,'KX134_1211_processRawBytes(KX134_1211 *accel, uint8_t *bytes, float *out): kx134_1211.c']]], + ['kx134_5f1211_5freadaccel_2',['KX134_1211_readAccel',['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *, float *): kx134_1211.c'],['../group__KX134-1211.html#ga0871f31a356a20dde2bd73ba9385658c',1,'KX134_1211_readAccel(KX134_1211 *accel, float *out): kx134_1211.c']]], + ['kx134_5f1211_5freadrawbytes_3',['KX134_1211_readRawBytes',['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *, uint8_t *): kx134_1211.c'],['../group__KX134-1211.html#gaa3064f02e75aabcbcae62c16733bc623',1,'KX134_1211_readRawBytes(KX134_1211 *accel, uint8_t *out): kx134_1211.c']]], + ['kx134_5f1211_5fupdate_4',['KX134_1211_update',['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *): kx134_1211.c'],['../group__KX134-1211.html#gabc14bce3ead2179bab72ea3e5450257b',1,'KX134_1211_update(KX134_1211 *accel): kx134_1211.c']]] ]; diff --git a/html/search/searchdata.js b/html/search/searchdata.js index 83a8c26..5625536 100644 --- a/html/search/searchdata.js +++ b/html/search/searchdata.js @@ -2,7 +2,7 @@ var indexSectionsWithContent = { 0: "1_abcdefghiklmoprstuvw", 1: "abcdfghklsu", - 2: "abhkms", + 2: "bhms", 3: "_abcfklsuv", 4: "abcdegiprstuw", 5: "d", diff --git a/html/shell_8c_source.html b/html/shell_8c_source.html index 3957808..fcca762 100644 --- a/html/shell_8c_source.html +++ b/html/shell_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/uart/USB/shell.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/uart/usb/shell.c Source File @@ -235,7 +235,7 @@ diff --git a/html/shell_8h.html b/html/shell_8h.html index defecdf..ec56099 100644 --- a/html/shell_8h.html +++ b/html/shell_8h.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/USB/shell.h File Reference +Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/usb/shell.h File Reference @@ -354,7 +354,7 @@

diff --git a/html/shell_8h_source.html b/html/shell_8h_source.html index 126d9d7..739f2d5 100644 --- a/html/shell_8h_source.html +++ b/html/shell_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/USB/shell.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/uart/usb/shell.h Source File @@ -175,7 +175,7 @@ diff --git a/html/stateUpdate_8c_source.html b/html/stateupdate_8c_source.html similarity index 83% rename from html/stateUpdate_8c_source.html rename to html/stateupdate_8c_source.html index 0ee8a9a..945c01f 100644 --- a/html/stateUpdate_8c_source.html +++ b/html/stateupdate_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/stateUpdate.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/stateupdate.c Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
stateUpdate.c
+
stateupdate.c
1/***********************************************************************************
@@ -109,10 +109,10 @@
6 * @{ *
7 ***********************************************************************************/
8
-
9#include "stateUpdate.h"
-
10#include "stdio.h"
-
11#include "drivers.h"
-
12#include "membuff.h"
+
9#include "stateupdate.h"
+
10#include "drivers.h"
+
11#include "membuff.h"
+
12#include "stdio.h"
13
14extern EventGroupHandle_t xTaskEnableGroup;
15extern MessageBufferHandle_t xUsbTxBuff;
@@ -131,22 +131,22 @@
39 float avgVelCurrent = 0;
40 float avgVelPrevious = 0;
41
-
42 Handles *handles = (Handles *)argument;
-
43
-
44 DeviceHandle_t accelHandle = DeviceHandle_getHandle("Accel");
-
45 KX134_1211 *accel = accelHandle.device;
+
42 Handles *handles = (Handles *)argument;
+
43
+
44 DeviceHandle_t accelHandle = DeviceHandle_getHandle("Accel");
+
45 KX134_1211 *accel = accelHandle.device;
46
-
47 MemBuff *mem = StateHandle_getHandle("Memory").state;
-
48 enum State *flightState = StateHandle_getHandle("FlightState").state;
-
49 float *tilt = StateHandle_getHandle("Tilt").state;
-
50 float *altitude = StateHandle_getHandle("Altitude").state;
-
51 float *velocity = StateHandle_getHandle("Velocity").state;
-
52 SlidingWindow *avgVel = StateHandle_getHandle("AvgVelBuffer").state;
-
53 SlidingWindow *avgPress = StateHandle_getHandle("AvgPressBuffer").state;
+
47 MemBuff *mem = StateHandle_getHandle("Memory").state;
+
48 enum State *flightState = StateHandle_getHandle("FlightState").state;
+
49 float *tilt = StateHandle_getHandle("Tilt").state;
+
50 float *altitude = StateHandle_getHandle("Altitude").state;
+
51 float *velocity = StateHandle_getHandle("Velocity").state;
+
52 SlidingWindow *avgVel = StateHandle_getHandle("AvgVelBuffer").state;
+
53 SlidingWindow *avgPress = StateHandle_getHandle("AvgPressBuffer").state;
54
55 for (;;) {
56 // Block until 20ms interval
-
57 TickType_t xLastWakeTime = xTaskGetTickCount();
+
57 TickType_t xLastWakeTime = xTaskGetTickCount();
58 vTaskDelayUntil(&xLastWakeTime, xFrequency);
59
60 // Emergency aerobrakes for excessive tilt
@@ -161,15 +161,15 @@
69 switch (*flightState) {
70 case PRELAUNCH:
71 if (accel->accelData[ZINDEX] >= ACCEL_LAUNCH) {
-
72 #ifdef FLIGHT_TEST
-
73 GPIOB->ODR ^= 0x8000;
-
74 GPIOD->ODR ^= 0x8000;
-
75 #endif
-
76 #ifndef DEBUG
-
77// vTaskSuspend(handles->xUsbReceiveHandle);
-
78// vTaskDelete(handles->xUsbTransmitHandle);
-
79// vTaskDelete(handles->xUsbReceiveHandle);
-
80 #endif
+
72#ifdef FLIGHT_TEST
+
73 GPIOB->ODR ^= 0x8000;
+
74 GPIOD->ODR ^= 0x8000;
+
75#endif
+
76#ifndef DEBUG
+
77 // vTaskSuspend(handles->xUsbReceiveHandle);
+
78 // vTaskDelete(handles->xUsbTransmitHandle);
+
79 // vTaskDelete(handles->xUsbReceiveHandle);
+
80#endif
81 xEventGroupSetBits(xTaskEnableGroup, GROUP_TASK_ENABLE_FLASH); // Enable flash
82 xEventGroupSetBits(xTaskEnableGroup, GROUP_TASK_ENABLE_HIGHRES); // Enable high resolution data acquisition
83 xEventGroupSetBits(xTaskEnableGroup, GROUP_TASK_ENABLE_LOWRES); // Enable low resolution data acquisition
@@ -186,10 +186,10 @@
94 CAN_TX(CAN_AB, 8, CANHigh, CANLow, id);
95 // Transition to motor burnout state on velocity decrease
96 if ((avgVelCurrent - avgVelPrevious) < 0) {
-
97 #ifdef FLIGHT_TEST
-
98 GPIOB->ODR ^= 0x8000;
-
99 GPIOD->ODR ^= 0x8000;
-
100 #endif
+
97#ifdef FLIGHT_TEST
+
98 GPIOB->ODR ^= 0x8000;
+
99 GPIOD->ODR ^= 0x8000;
+
100#endif
101 *flightState = COAST;
102 }
103 avgVelPrevious = avgVelCurrent;
@@ -205,26 +205,26 @@
113 // Transition to apogee state on three way vote of altitude, velocity, and tilt
114 // apogee is determined as two of three conditions evaluating true
115 if ((((avgPressCurrent - avgPressPrevious) > 0) + (*tilt >= 90) + (*velocity < 0.0f)) >= 2) {
-
116 #ifdef FLIGHT_TEST
-
117 GPIOB->ODR ^= 0x8000;
-
118 GPIOD->ODR ^= 0x8000;
-
119 #endif
+
116#ifdef FLIGHT_TEST
+
117 GPIOB->ODR ^= 0x8000;
+
118 GPIOD->ODR ^= 0x8000;
+
119#endif
120 *flightState = APOGEE;
-
121
-
122 taskENTER_CRITICAL();
-
123 buzzer(3215 * 5);
-
124 taskEXIT_CRITICAL();
-
125
-
126 union U {
-
127 TickType_t ticks;
-
128 uint8_t* bytes;
-
129 };
-
130 union U u;
-
131 u.ticks = xTaskGetTickCount();
-
132
-
133 // Log apogee event to flash
-
134 mem->append(mem, HEADER_EVENT_APOGEE);
-
135 mem->appendBytes(mem, u.bytes, sizeof(TickType_t));
+
121
+
122 taskENTER_CRITICAL();
+
123 buzzer(3215 * 5);
+
124 taskEXIT_CRITICAL();
+
125
+
126 union U {
+
127 TickType_t ticks;
+
128 uint8_t *bytes;
+
129 };
+
130 union U u;
+
131 u.ticks = xTaskGetTickCount();
+
132
+
133 // Log apogee event to flash
+
134 mem->append(mem, HEADER_EVENT_APOGEE);
+
135 mem->appendBytes(mem, u.bytes, sizeof(TickType_t));
136 // Send transmission to trigger apogee E-matches
137 }
138 avgPressPrevious = avgPressCurrent;
@@ -240,10 +240,10 @@
148 GPIOD->ODR |= 0x8000;
149 // Transition to descent state when below main deployment altitude
150 if (*altitude <= MAIN_ALTITUDE_METERS) {
-
151 #ifdef FLIGHT_TEST
-
152 GPIOB->ODR ^= 0x8000;
-
153 GPIOD->ODR ^= 0x8000;
-
154 #endif
+
151#ifdef FLIGHT_TEST
+
152 GPIOB->ODR ^= 0x8000;
+
153 GPIOD->ODR ^= 0x8000;
+
154#endif
155 *flightState = DESCENT;
156 // Add descent event dataframe to buffer
157 }
@@ -258,14 +258,14 @@
166
- -
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition KX134_1211.h:63
+ +
float accelData[KX134_1211_DATA_COUNT]
Processed accelerations array.
Definition kx134_1211.h:63
diff --git a/html/stateUpdate_8h_source.html b/html/stateupdate_8h_source.html similarity index 89% rename from html/stateUpdate_8h_source.html rename to html/stateupdate_8h_source.html index 3ee266b..7fa4c09 100644 --- a/html/stateUpdate_8h_source.html +++ b/html/stateupdate_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/stateUpdate.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/stateupdate.h Source File @@ -72,7 +72,7 @@
@@ -98,28 +98,28 @@
-
stateUpdate.h
+
stateupdate.h
1#ifndef _STATE_H
2#define _STATE_H
3
4#include "FreeRTOS.h"
-
5#include "task.h"
-
6#include "event_groups.h"
-
7#include "groups.h"
-
8#include "handles.h"
-
9#include "message_buffer.h"
-
10#include "semphr.h"
+
5#include "event_groups.h"
+
6#include "groups.h"
+
7#include "handles.h"
+
8#include "message_buffer.h"
+
9#include "semphr.h"
+
10#include "task.h"
11
-
12#include "KX134_1211.h"
-
13#include "can.h"
-
14#include "dataframe.h"
-
15#include "params.h"
-
16#include "quaternion.h"
-
17#include "sensors.h"
-
18#include "slidingwindow.h"
-
19#include "devices.h"
+
12#include "can.h"
+
13#include "dataframe.h"
+
14#include "devices.h"
+
15#include "kx134_1211.h"
+
16#include "params.h"
+
17#include "quaternion.h"
+
18#include "sensors.h"
+
19#include "slidingwindow.h"
20
21void vStateUpdate(void *pvParameters);
22
@@ -156,16 +156,15 @@
50
51#endif
- - - + +
diff --git a/html/structA3G4250D.html b/html/structA3G4250D.html index 4853099..bad8ae5 100644 --- a/html/structA3G4250D.html +++ b/html/structA3G4250D.html @@ -173,7 +173,7 @@

  rtos
  tasks
  comms
 loraComm.h
 payloadComm.h
 usbComm.h
 loracomm.h
 payloadcomm.h
 usbcomm.h
  data
 flashWrite.h
 gpsAcquisition.h
 hDataAcquisition.h
 lDataAcquisition.h
 stateUpdate.h
 flashwrite.h
 gpsacquisition.h
 hdataacquisition.h
 ldataacquisition.h
 stateupdate.h
 FreeRTOSConfig.h
 groups.h
 handles.h
 lora.h
  sensors
  accel
 KX134_1211.h
 kx134_1211.h
  baro
 BMP581.h
 bmp581.h
  gyro
 A3G4250D.h
 a3g4250d.h
 sensors.h
 spi.h
  uart
  GPS
  gps
 gps.h
  USB
  usb
 shell.h
 uart.h
 dataframe.h
  rtos
  tasks
  comms
 loraComm.c
 payloadComm.c
 usbComm.c
 loracomm.c
 payloadcomm.c
 usbcomm.c
  data
 flashWrite.c
 gpsAcquisition.c
 hDataAcquisition.c
 lDataAcquisition.c
 stateUpdate.c
 flashwrite.c
 gpsacquisition.c
 hdataacquisition.c
 ldataacquisition.c
 stateupdate.c
 freertos.c
  shell
 baro.c
 lora.c
  sensors
  accel
 KX134_1211.c
 kx134_1211.c
  baro
 BMP581.c
 bmp581.c
  gyro
 A3G4250D.c
 a3g4250d.c
 sensors.c
 spi.c
  uart
  GPS
  gps
 gps.c
  USB
  usb
 shell.c
 uart.c
 devices.c

Detailed Description

-

Definition at line 40 of file A3G4250D.h.

+

Definition at line 40 of file a3g4250d.h.

Field Documentation

◆ update

@@ -190,7 +190,7 @@

See also
A3G4250D_update
-

Definition at line 43 of file A3G4250D.h.

+

Definition at line 43 of file a3g4250d.h.

@@ -209,7 +209,7 @@

See also
A3G4250D_readGyro
-

Definition at line 44 of file A3G4250D.h.

+

Definition at line 44 of file a3g4250d.h.

@@ -228,7 +228,7 @@

See also
A3G4250D_readRawBytes
-

Definition at line 45 of file A3G4250D.h.

+

Definition at line 45 of file a3g4250d.h.

@@ -247,12 +247,12 @@

See also
A3G4250D_processRawBytes
-

Definition at line 46 of file A3G4250D.h.

+

Definition at line 46 of file a3g4250d.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/spi/sensors/gyro/A3G4250D.h
  • +
  • Australis-Avionics/Core/Inc/spi/sensors/gyro/a3g4250d.h
diff --git a/html/structBMP581.html b/html/structBMP581.html index be51780..0ff0cd3 100644 --- a/html/structBMP581.html +++ b/html/structBMP581.html @@ -135,9 +135,9 @@

Detailed Description

-

Definition at line 55 of file BMP581.h.

+

Definition at line 55 of file bmp581.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/spi/sensors/baro/BMP581.h
  • +
  • Australis-Avionics/Core/Inc/spi/sensors/baro/bmp581.h
diff --git a/html/structKX134__1211.html b/html/structKX134__1211.html index 358be9d..f97ff30 100644 --- a/html/structKX134__1211.html +++ b/html/structKX134__1211.html @@ -173,7 +173,7 @@

Detailed Description

-

Definition at line 53 of file KX134_1211.h.

+

Definition at line 53 of file kx134_1211.h.

Field Documentation

◆ update

@@ -190,7 +190,7 @@

See also
KX134_1211_update
-

Definition at line 56 of file KX134_1211.h.

+

Definition at line 56 of file kx134_1211.h.

@@ -209,7 +209,7 @@

See also
KX134_1211_readAccel
-

Definition at line 57 of file KX134_1211.h.

+

Definition at line 57 of file kx134_1211.h.

@@ -228,7 +228,7 @@

See also
KX134_1211_readRawBytes
-

Definition at line 58 of file KX134_1211.h.

+

Definition at line 58 of file kx134_1211.h.

@@ -247,12 +247,12 @@

See also
KX134_1211_processRawBytes
-

Definition at line 59 of file KX134_1211.h.

+

Definition at line 59 of file kx134_1211.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/spi/sensors/accel/KX134_1211.h
  • +
  • Australis-Avionics/Core/Inc/spi/sensors/accel/kx134_1211.h
diff --git a/html/structctxFlashBuffer.html b/html/structctxFlashBuffer.html index 89d6edd..4312aad 100644 --- a/html/structctxFlashBuffer.html +++ b/html/structctxFlashBuffer.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 18 of file flashWrite.h.

+

Definition at line 18 of file flashwrite.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxHDataAcquisition.html b/html/structctxHDataAcquisition.html index e428311..ad16fbe 100644 --- a/html/structctxHDataAcquisition.html +++ b/html/structctxHDataAcquisition.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 31 of file hDataAcquisition.h.

+

Definition at line 31 of file hdataacquisition.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxIdle.html b/html/structctxIdle.html index 6037e0e..1327faa 100644 --- a/html/structctxIdle.html +++ b/html/structctxIdle.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 13 of file flashWrite.h.

+

Definition at line 13 of file flashwrite.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxLDataAcquisition.html b/html/structctxLDataAcquisition.html index 98d923d..7d6e8df 100644 --- a/html/structctxLDataAcquisition.html +++ b/html/structctxLDataAcquisition.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 25 of file lDataAcquisition.h.

+

Definition at line 25 of file ldataacquisition.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxLoRaSample.html b/html/structctxLoRaSample.html index d23b2c3..e136937 100644 --- a/html/structctxLoRaSample.html +++ b/html/structctxLoRaSample.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 20 of file loraComm.h.

+

Definition at line 20 of file loracomm.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/loraComm.h
  • +
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/loracomm.h
diff --git a/html/structctxLoRaTransmit.html b/html/structctxLoRaTransmit.html index f636494..5e09ec1 100644 --- a/html/structctxLoRaTransmit.html +++ b/html/structctxLoRaTransmit.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 27 of file loraComm.h.

+

Definition at line 27 of file loracomm.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/loraComm.h
  • +
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/loracomm.h
diff --git a/html/structctxState.html b/html/structctxState.html index 70882b1..cccc3bf 100644 --- a/html/structctxState.html +++ b/html/structctxState.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 31 of file stateUpdate.h.

+

Definition at line 31 of file stateupdate.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxStateUpdate.html b/html/structctxStateUpdate.html index aae64f1..05a4740 100644 --- a/html/structctxStateUpdate.html +++ b/html/structctxStateUpdate.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 46 of file stateUpdate.h.

+

Definition at line 46 of file stateupdate.h.


The documentation for this struct was generated from the following file:
diff --git a/html/structctxUsbReceive.html b/html/structctxUsbReceive.html index 7a97e6b..48c2b42 100644 --- a/html/structctxUsbReceive.html +++ b/html/structctxUsbReceive.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 23 of file usbComm.h.

+

Definition at line 23 of file usbcomm.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/usbComm.h
  • +
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/usbcomm.h
diff --git a/html/structctxUsbTransmit.html b/html/structctxUsbTransmit.html index b7163e6..5b24589 100644 --- a/html/structctxUsbTransmit.html +++ b/html/structctxUsbTransmit.html @@ -103,9 +103,9 @@

Detailed Description

-

Definition at line 19 of file usbComm.h.

+

Definition at line 19 of file usbcomm.h.


The documentation for this struct was generated from the following file:
    -
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/usbComm.h
  • +
  • Australis-Avionics/Core/Inc/rtos/tasks/comms/usbcomm.h
diff --git a/html/todo.html b/html/todo.html index 36a5c23..1c66a0c 100644 --- a/html/todo.html +++ b/html/todo.html @@ -102,8 +102,6 @@
-
File BMP581.h
-
Document interface
Global configure_interrupts ()
Refactor and document
Global LoRa_GPSData (uint8_t, char *, char *, uint8_t)
diff --git a/html/usbComm_8c_source.html b/html/usbcomm_8c_source.html similarity index 94% rename from html/usbComm_8c_source.html rename to html/usbcomm_8c_source.html index 832eb9a..e2da8d2 100644 --- a/html/usbComm_8c_source.html +++ b/html/usbcomm_8c_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/usbComm.c Source File +Australis Firmware Reference: Australis-Avionics/Core/Src/rtos/tasks/comms/usbcomm.c Source File @@ -72,7 +72,7 @@
@@ -98,14 +98,14 @@
-
usbComm.c
+
usbcomm.c
1/* ===================================================================== *
2 * UART HANDLING *
3 * ===================================================================== */
4
-
5#include "usbComm.h"
+
5#include "usbcomm.h"
6
7extern MessageBufferHandle_t xUsbTxBuff;
8extern MessageBufferHandle_t xUsbRxBuff;
@@ -134,8 +134,8 @@
50 const TickType_t timeout = portMAX_DELAY;
51 uint8_t rxData;
52
-
53 UART *usb = DeviceHandle_getHandle("USB").device;
-
54 Shell *shell = argument;
+
53 UART *usb = DeviceHandle_getHandle("USB").device;
+
54 Shell *shell = argument;
55
56 for (;;) {
57 // Read byte from UART Rx buffer, skip loop if empty
@@ -147,10 +147,10 @@
63
64 // Process command and reset buffer on <Enter> input
65 if (rxData == CARRIAGE_RETURN) {
-
66 usb->print(usb, "\n"); // Send newline back for display
-
67 usbRxBuff[usbRxBuffIdx - 1] = '\0'; // Replace carriage return with null terminator
-
68 shell->runTask(shell, usbRxBuff); // Run shell program as task
-
69 usbRxBuffIdx = 0; // Reset buffer
+
66 usb->print(usb, "\n"); // Send newline back for display
+
67 usbRxBuff[usbRxBuffIdx - 1] = '\0'; // Replace carriage return with null terminator
+
68 shell->runTask(shell, usbRxBuff); // Run shell program as task
+
69 usbRxBuffIdx = 0; // Reset buffer
70 }
71
72 // Clear terminal on <Ctrl-c> input
@@ -189,7 +189,7 @@ diff --git a/html/usbComm_8h_source.html b/html/usbcomm_8h_source.html similarity index 96% rename from html/usbComm_8h_source.html rename to html/usbcomm_8h_source.html index ca80133..16cbc94 100644 --- a/html/usbComm_8h_source.html +++ b/html/usbcomm_8h_source.html @@ -6,7 +6,7 @@ -Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/usbComm.h Source File +Australis Firmware Reference: Australis-Avionics/Core/Inc/rtos/tasks/comms/usbcomm.h Source File @@ -72,7 +72,7 @@
@@ -98,7 +98,7 @@
-
usbComm.h
+
usbcomm.h
1#ifndef _USBTRANSCEIVE_H
@@ -136,14 +136,14 @@
Struct definition for UART interface.
Definition uart.h:53
Definition shell.h:34
- - + +