diff --git a/.gitignore b/.gitignore index a9a7c21a..c7892f41 100644 --- a/.gitignore +++ b/.gitignore @@ -176,4 +176,5 @@ fabric.properties CoreCompileInputs.cache .vscode/settings.json -source/compile_commands.json +source/compile_commands.json +.idea/ diff --git a/source/Core/Src/main.cpp b/source/Core/Src/main.cpp index 7a65bc07..bda0012d 100644 --- a/source/Core/Src/main.cpp +++ b/source/Core/Src/main.cpp @@ -15,22 +15,22 @@ bool settingsWereReset = false; // FreeRTOS variables osThreadId GUITaskHandle; -static const size_t GUITaskStackSize = 1024 / 4; +static const size_t GUITaskStackSize = 1024 / 3; uint32_t GUITaskBuffer[GUITaskStackSize]; osStaticThreadDef_t GUITaskControlBlock; osThreadId PIDTaskHandle; -static const size_t PIDTaskStackSize = 1024 / 4; +static const size_t PIDTaskStackSize = 1024 / 3; uint32_t PIDTaskBuffer[PIDTaskStackSize]; osStaticThreadDef_t PIDTaskControlBlock; osThreadId MOVTaskHandle; -static const size_t MOVTaskStackSize = 1024 / 4; +static const size_t MOVTaskStackSize = 1024 / 3; uint32_t MOVTaskBuffer[MOVTaskStackSize]; osStaticThreadDef_t MOVTaskControlBlock; osThreadId POWTaskHandle; -static const size_t POWTaskStackSize = 512 / 4; +static const size_t POWTaskStackSize = 512 / 3; uint32_t POWTaskBuffer[POWTaskStackSize]; osStaticThreadDef_t POWTaskControlBlock; @@ -38,11 +38,11 @@ osStaticThreadDef_t POWTaskControlBlock; // Main sets up the hardware then hands over to the FreeRTOS kernel int main(void) { preRToSInit(); - MSG((char *)"wdg\r\n"); + resetWatchdog(); // Testing for which accelerometer is mounted settingsWereReset = loadSettings(); // load the settings from flash - MSG((char *)"tip\r\n"); + setTipX10Watts(0); // force tip off MSG((char *)"main\r\n");