FaSTTUBe/SDCL
53
2
Fork 0
Code Issues Pull Requests Releases Activity

Compare commits

base: FaSTTUBe:bodgy-mcbodgeface
Branches Tags
FaSTTUBe:main FaSTTUBe:bodgy-mcbodgeface-jasper FaSTTUBe:bodgy-mcbodgeface FaSTTUBe:bodgy-mcbodgefaceV1.2
FaSTTUBe:SDCLv2-bodge1 FaSTTUBe:full-feature-complete FaSTTUBe:v1-FT22 FaSTTUBe:igrid
..
compare: FaSTTUBe:1e4e5a91aa0e2b7b6fd81670b742b30c0e8dc671
Branches Tags
FaSTTUBe:bodgy-mcbodgeface-jasper FaSTTUBe:bodgy-mcbodgeface FaSTTUBe:bodgy-mcbodgefaceV1.2 FaSTTUBe:main
FaSTTUBe:SDCLv2-bodge1 FaSTTUBe:full-feature-complete FaSTTUBe:v1-FT22 FaSTTUBe:igrid

3 Commits
bodgy-mcbo ... 1e4e5a91aa

Author SHA1 Message Date
Jasper v. Blanckenburg
1e4e5a91aa Only close SDC if watchdog is OK 2023-08-03 16:40:42 +02:00
Jasper v. Blanckenburg
34611dac20 Reduce startup delay 
The 5s discharge is managed via ABX/PDU
 2023-08-03 16:11:09 +02:00
Jasper v. Blanckenburg
d1c2cc5d80 Fix mission LEDs 2023-08-03 16:05:40 +02:00
1 changed files with 4 additions and 7 deletions
Expand all files Collapse all files

9
sdcl-firmware/Core/Src/main.c
View File

@ -135,8 +135,8 @@ IWDG_HandleTypeDef hiwdg;
/* USER CODE BEGIN PV */ /* USER CODE BEGIN PV */
// Mission Maps: NONE ACCEL SKIDPAD TRACKDRIVE EBSTEST INSPECTION AUTOX MANUAL // Mission Maps: NONE ACCEL SKIDPAD AUTOX EBSTEST INSPECTION TRACKDRIVE MANUAL
const uint16_t mission2led[] = {0 , AMI_ACCEL_Pin , AMI_SKIDPAD_Pin , AMI_TRACKDRIVE_Pin, AMI_EBSTEST_Pin , AMI_INSPECTION_Pin, AMI_AUTOX_Pin , AMI_MANUAL_Pin}; const uint16_t mission2led[] = {0 , AMI_ACCEL_Pin , AMI_SKIDPAD_Pin , AMI_AUTOX_Pin , AMI_TRACKDRIVE_Pin, AMI_EBSTEST_Pin , AMI_INSPECTION_Pin, AMI_MANUAL_Pin};
const mission_t mission2next[] = {M_MANUAL , M_SKIDPAD , M_AUTOX , M_EBSTEST , M_INSPECTION , M_MANUAL , M_TRACKDRIVE , M_ACCEL }; const mission_t mission2next[] = {M_MANUAL , M_SKIDPAD , M_AUTOX , M_EBSTEST , M_INSPECTION , M_MANUAL , M_TRACKDRIVE , M_ACCEL };
mission_t mission = M_NONE; mission_t mission = M_NONE;
@ -211,9 +211,6 @@ int main(void)
// Ensure we start with SDC disabled // Ensure we start with SDC disabled
HAL_GPIO_WritePin(AS_close_SDC_GPIO_Port, AS_close_SDC_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(AS_close_SDC_GPIO_Port, AS_close_SDC_Pin, GPIO_PIN_RESET);
// Show ASB Error by default until we receive CAN
HAL_GPIO_WritePin(ASB_Error_GPIO_Port, ASB_Error_Pin, GPIO_PIN_SET);
if (HAL_CAN_Start(&hcan) != HAL_OK) if (HAL_CAN_Start(&hcan) != HAL_OK)
Error_Handler(); Error_Handler();
@ -523,7 +520,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
} }
pHeartbeat = rxData.signals.heartbeat; pHeartbeat = rxData.signals.heartbeat;
bool close_sdc = setup_done && rxData.signals.as_close_sdc; bool close_sdc = setup_done && rxData.signals.as_close_sdc && WD_OK;
#endif #endif