Adamg/payloadflashtest

CM4/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-837879504026729610" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="665271299357295740" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-837879504026729610" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="665271299357295740" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

CM4/Core/Src/main.c

@@ -169,8 +169,8 @@ void MX_QUADSPI_Init(void)
   hqspi.Init.ClockPrescaler = 255;
   hqspi.Init.FifoThreshold = 1;
   hqspi.Init.SampleShifting = QSPI_SAMPLE_SHIFTING_NONE;
-  hqspi.Init.FlashSize = 1;
-  hqspi.Init.ChipSelectHighTime = QSPI_CS_HIGH_TIME_1_CYCLE;
+  hqspi.Init.FlashSize = 26;
+  hqspi.Init.ChipSelectHighTime = QSPI_CS_HIGH_TIME_2_CYCLE;
   hqspi.Init.ClockMode = QSPI_CLOCK_MODE_0;
   hqspi.Init.FlashID = QSPI_FLASH_ID_1;
   hqspi.Init.DualFlash = QSPI_DUALFLASH_DISABLE;

CM7/.cproject

@@ -146,9 +146,9 @@
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Common"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Components"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Cube++"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>
@@ -295,9 +295,9 @@
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Common"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Components"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Core"/>
-						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Cube++"/>
 						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Drivers"/>
+						<entry flags="VALUE_WORKSPACE_PATH|RESOLVED" kind="sourcePath" name="Middlewares"/>
 					</sourceEntries>
 				</configuration>
 			</storageModule>

CM7/.settings/language.settings.xml

@@ -5,7 +5,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="927873912750334244" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-422622196010924143" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>
@@ -16,7 +16,7 @@
 			<provider copy-of="extension" id="org.eclipse.cdt.ui.UserLanguageSettingsProvider"/>
 			<provider-reference id="org.eclipse.cdt.core.ReferencedProjectsLanguageSettingsProvider" ref="shared-provider"/>
 			<provider-reference id="org.eclipse.cdt.managedbuilder.core.MBSLanguageSettingsProvider" ref="shared-provider"/>
-			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="927873205120854751" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
+			<provider class="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" console="false" env-hash="-422622903640403636" id="com.st.stm32cube.ide.mcu.toolchain.armnone.setup.CrossBuiltinSpecsDetector" keep-relative-paths="false" name="MCU ARM GCC Built-in Compiler Settings" parameter="${COMMAND} ${FLAGS} -E -P -v -dD &quot;${INPUTS}&quot;" prefer-non-shared="true">
 				<language-scope id="org.eclipse.cdt.core.gcc"/>
 				<language-scope id="org.eclipse.cdt.core.g++"/>
 			</provider>

CM7/.settings/stm32cubeide.project.prefs

@@ -1,4 +1,4 @@
 635E684B79701B039C64EA45C3F84D30=EB92BDC8CA3A439D88C6F56E4DDF7E32
-8DF89ED150041C4CBC7CB9A9CAA90856=E805E3BE0E38C82E0E591B5E374240D4
-DC22A860405A8BF2F2C095E5B6529F12=31D4B83A11F9313509F3357E4EAAF47F
+8DF89ED150041C4CBC7CB9A9CAA90856=AC892FC3BC99DC619B57AAD46AD701C9
+DC22A860405A8BF2F2C095E5B6529F12=AC892FC3BC99DC619B57AAD46AD701C9
 eclipse.preferences.version=1

CM7/Components/Data.hpp

@@ -0,0 +1,55 @@
+/*
+ * Data.hpp
+ *
+ */
+
+#ifndef DATA_HPP_
+#define DATA_HPP_
+
+
+#include <stdint.h>
+#include "SystemDefines.hpp"
+
+typedef union logFloat {
+	float f;
+	uint8_t u8[4];
+	uint32_t u32;
+} logFloat;
+
+typedef struct IMUData {
+	logFloat xAccel;
+	logFloat yAccel;
+	logFloat zAccel;
+} IMUData;
+
+typedef struct AltimeterData {
+	logFloat altitude;
+	logFloat temp;
+} AltimeterData;
+
+/*
+ *  mario  = Experiment Board LPS22HH U3
+ *  luigi  = Experiment Board LPS22HH U4
+ *  bowser = Main Board MS5611 U4
+ */
+typedef struct BarometerData {
+    logFloat marioPressure;
+    logFloat marioTemperature;
+    logFloat luigiPressure;
+    logFloat luigiTemperature;
+    logFloat bowserPressure;
+    logFloat bowserTemperature;
+} BarometerData;
+
+/*
+ * Data Containers
+ * Acts as a pointer to the other data structs alongside a timestamp for logging to flash.
+ */
+typedef struct AllData {
+	 IMUData*         	 imuData;
+	 AltimeterData* 	altimeterData;
+	 BarometerData*       barometerData;
+	 logFloat 			 time;
+} AllData;
+
+#endif /* DATA_HPP_ */

CM7/Components/Debug/DebugTask.cpp

@@ -16,6 +16,7 @@
 // External Tasks (to send debug commands to)
 #include "FlightTask.hpp"
 #include "GPIO.hpp"
+#include "FlashTask//Inc//FlashTask.hpp"
 
 /* Macros --------------------------------------------------------------------*/
 
@@ -121,6 +122,22 @@ void DebugTask::HandleDebugMessage(const char* msg)
         SOAR_PRINT("Current System Free Heap: %d Bytes\n", xPortGetFreeHeapSize());
         SOAR_PRINT("Lowest Ever Free Heap: %d Bytes\n", xPortGetMinimumEverFreeHeapSize());
         SOAR_PRINT("Debug Task Runtime  \t: %d ms\n\n", TICKS_TO_MS(xTaskGetTickCount()));
+    } else if (strcmp(msg,"testflash") == 0) { //TODO delete me
+    	SOAR_PRINT("testing");
+    	Command test(TASK_SPECIFIC_COMMAND, FHT_GROUND);
+		uint8_t testData = 230;
+		test.CopyDataToCommand(&testData, 1);
+		FlashTask::Inst().GetEventQueue()->Send(test);
+
+		Command test2(TASK_SPECIFIC_COMMAND, FHT_APOGEE);
+		uint8_t test2Data = 230;
+		test2.CopyDataToCommand(&test2Data, 1);
+		FlashTask::Inst().GetEventQueue()->Send(test2);
+
+    } else if (strcmp(msg, "eraseflash") == 0){
+    	SOAR_PRINT("Erasing...");
+    	Command erase(TASK_SPECIFIC_COMMAND, FHT_ERASE);
+    	FlashTask::Inst().GetEventQueue()->Send(erase);
     }
     else {
         // Single character command, or unknown command