Skip to content

Commit

Permalink
Merged main
Browse files Browse the repository at this point in the history
It builds now
  • Loading branch information
Armaan-Sengupta committed Jul 5, 2024
1 parent f2632eb commit 72ec777
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
1 change: 0 additions & 1 deletion STM32Cube/.cproject
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
<option id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level.1681767496" name="Optimization level" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.optimization.level" useByScannerDiscovery="false"/>
<option IS_BUILTIN_EMPTY="false" IS_VALUE_EMPTY="false" id="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols.2001593663" name="Define symbols (-D)" superClass="com.st.stm32cube.ide.mcu.gnu.managedbuild.tool.c.compiler.option.definedsymbols" useByScannerDiscovery="false" valueType="definedSymbols">
<listOptionValue builtIn="false" value="DEBUG"/>
<listOptionValue builtIn="false" value="TEST_MODE"/>
<listOptionValue builtIn="false" value="USE_HAL_DRIVER"/>
<listOptionValue builtIn="false" value="STM32_THREAD_SAFE_STRATEGY=4"/>
<listOptionValue builtIn="false" value="BOARD_UNIQUE_ID=0x08"/>
Expand Down
13 changes: 7 additions & 6 deletions STM32Cube/Core/Src/main.c
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@
#include "can_handler.h"
#include "otits.h"
#include "sdmmc.h"
#include "vn_handler.h"
/* USER CODE END Includes */

/* Private typedef -----------------------------------------------------------*/
Expand Down Expand Up @@ -227,12 +228,12 @@ int main(void)
BaseType_t xReturned = pdPASS;

//dunno if casting from CMSIS priorities is valid
//xReturned &= xTaskCreate(vnIMUHandler, "VN Task", 2000, NULL, (UBaseType_t) osPriorityNormal, &VNTaskHandle);
xReturned &= xTaskCreate(canHandlerTask, "CAN handler", 2000, NULL, (UBaseType_t) osPriorityNormal, &canhandlerhandle);
xReturned &= xTaskCreate(stateEstTask, "StateEst", 512, NULL, (UBaseType_t) osPriorityNormal, &stateEstTaskHandle);
xReturned &= xTaskCreate(trajectory_task, "traj", 512, NULL, (UBaseType_t) osPriorityNormal, &trajectoryTaskHandle);
xReturned &= xTaskCreate(logTask, "Logging", 1024, NULL, (UBaseType_t) osPriorityBelowNormal, &logTaskhandle);
xReturned &= xTaskCreate(healthCheckTask, "health checks", 512, NULL, (UBaseType_t) osPriorityNormal, &healthChecksTaskHandle);
xReturned &= xTaskCreate(vnIMUHandler, "VN Task", 2000, NULL, (UBaseType_t) osPriorityNormal, &VNTaskHandle);
//xReturned &= xTaskCreate(canHandlerTask, "CAN handler", 2000, NULL, (UBaseType_t) osPriorityNormal, &canhandlerhandle);
//xReturned &= xTaskCreate(stateEstTask, "StateEst", 512, NULL, (UBaseType_t) osPriorityNormal, &stateEstTaskHandle);
//xReturned &= xTaskCreate(trajectory_task, "traj", 512, NULL, (UBaseType_t) osPriorityNormal, &trajectoryTaskHandle);
//xReturned &= xTaskCreate(logTask, "Logging", 1024, NULL, (UBaseType_t) osPriorityBelowNormal, &logTaskhandle);
//xReturned &= xTaskCreate(healthCheckTask, "health checks", 512, NULL, (UBaseType_t) osPriorityNormal, &healthChecksTaskHandle);
//xReturned &= xTaskCreate(controlTask, "Controller", 2000, NULL, (UBaseType_t) osPriorityBelowNormal, &controllerHandle);
//xReturned &= xTaskCreate(flightPhaseTask, "Flight Phase", 2000, NULL, (UBaseType_t) osPriorityAboveNormal, &controllerHandle);
#ifdef TEST_MODE
Expand Down
4 changes: 2 additions & 2 deletions STM32Cube/Tasks/vn_handler.c
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ void vnIMUHandler(void *argument)
if(status != HAL_OK)
{
//logError(SOURCE_SENSOR, "Failed to begin UART read");
//printf_("Failed to begin UART read\n");
printf_("Failed to begin UART read\n");
}
else
{
Expand Down Expand Up @@ -240,7 +240,7 @@ void vnIMUHandler(void *argument)
}

else {
//printf_("Not a valid binary packet\n");
printf_("Not a valid binary packet\n");
//logError(SOURCE_SENSOR, "Non Binary Packet received");
}
}
Expand Down
2 changes: 1 addition & 1 deletion STM32Cube/canlib
Submodule canlib updated 1 files
+1 −0 can_common.c

0 comments on commit 72ec777

Please sign in to comment.