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

Compare commits

base: FaSTTUBe:1e4e5a91aa0e2b7b6fd81670b742b30c0e8dc671
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:bodgy-mcbodgeface
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

2 Commits
1e4e5a91aa ... bodgy-mcbo

Author SHA1 Message Date
Oskar
a5f9f3019a Reduce startup delay to 1s 
because discharge SDC blocking is done via PDU now
 2023-08-04 23:00:57 +02:00
Oskar
e6f77a5e29 Show ASB Error by default 2023-08-04 22:56:27 +02:00
1 changed files with 7 additions and 4 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 */
// Mission Maps: NONE ACCEL SKIDPAD AUTOX EBSTEST INSPECTION TRACKDRIVE MANUAL
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};
// Mission Maps: NONE ACCEL SKIDPAD TRACKDRIVE EBSTEST INSPECTION AUTOX 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 mission_t mission2next[] = {M_MANUAL , M_SKIDPAD , M_AUTOX , M_EBSTEST , M_INSPECTION , M_MANUAL , M_TRACKDRIVE , M_ACCEL };
mission_t mission = M_NONE;
@ -211,6 +211,9 @@ int main(void)
// Ensure we start with SDC disabled
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)
Error_Handler();
@ -520,7 +523,7 @@ void HAL_CAN_RxFifo0MsgPendingCallback(CAN_HandleTypeDef *hcan) {
}
pHeartbeat = rxData.signals.heartbeat;
bool close_sdc = setup_done && rxData.signals.as_close_sdc && WD_OK;
bool close_sdc = setup_done && rxData.signals.as_close_sdc;
#endif