FaSTTUBe/ams-master
56
1
Fork 0
Code Issues 2 Pull Requests Packages Projects Releases Wiki Activity

temp: remove everything but slaves for testing

Browse Source
This commit is contained in:
Kilian Bracher 2025-02-08 17:33:39 +01:00
parent 8eb8fe41cf
commit 7789a8c548
3 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
AMS_Master_Code/Core/Lib/ADBMS6830B_Driver/Core/Src/ADBMS_LL_Driver.c
View File

@ -7,6 +7,7 @@
#include "ADBMS_LL_Driver.h" #include "ADBMS_LL_Driver.h"
#include "config_ADBMS6830.h" #include "config_ADBMS6830.h"
#include "main.h"
#include "stm32h7xx_hal.h" #include "stm32h7xx_hal.h"
#include "swo_log.h" #include "swo_log.h"
#include <stdint.h> #include <stdint.h>
@ -228,9 +229,9 @@ HAL_StatusTypeDef __pollCMD(uint16_t command, uint8_t waitTime) {
void mcuAdbmsCSLow() { void mcuAdbmsCSLow() {
//TODO: set right GPIO //TODO: set right GPIO
//HAL_GPIO_WritePin(CSB_GPIO_Port, CSB_Pin, GPIO_PIN_RESET); HAL_GPIO_WritePin(BMS_CS_GPIO_Port, BMS_CS_Pin, GPIO_PIN_RESET);
} }
void mcuAdbmsCSHigh() { void mcuAdbmsCSHigh() {
//HAL_GPIO_WritePin(CSB_GPIO_Port, CSB_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(BMS_CS_GPIO_Port, BMS_CS_Pin, GPIO_PIN_SET);
} }

24
AMS_Master_Code/Core/Src/main.c
View File

@ -162,12 +162,12 @@ int main(void)
MX_ADC1_Init(); MX_ADC1_Init();
MX_ADC2_Init(); MX_ADC2_Init();
/* USER CODE BEGIN 2 */ /* USER CODE BEGIN 2 */
can_init(&hfdcan1); //can_init(&hfdcan1);
slaves_init(&hspi1); slaves_init(&hspi1);
shunt_init(); //shunt_init();
ts_sm_init(); //ts_sm_init();
soc_init(); //soc_init();
imd_init(&htim15); //imd_init(&htim15);
HAL_GPIO_WritePin(AMS_NERROR_GPIO_Port, AMS_NERROR_Pin, GPIO_PIN_SET); HAL_GPIO_WritePin(AMS_NERROR_GPIO_Port, AMS_NERROR_Pin, GPIO_PIN_SET);
/* USER CODE END 2 */ /* USER CODE END 2 */
@ -177,15 +177,15 @@ int main(void)
/* USER CODE END WHILE */ /* USER CODE END WHILE */
/* USER CODE BEGIN 3 */ /* USER CODE BEGIN 3 */
update_sdc(); //update_sdc();
update_tsal_signals(); //update_tsal_signals();
slaves_check(); slaves_check();
shunt_check(); //shunt_check();
ts_sm_update(); //ts_sm_update();
soc_update(); //soc_update();
imd_update(); //imd_update();
can_send_status(); //can_send_status();
loop_delay(); loop_delay();
} }

2
AMS_Master_Code/Core/Src/slave_monitoring.c
View File

@ -63,6 +63,8 @@ void slaves_check() {
AMS_Idle_Loop(); AMS_Idle_Loop();
return;
//TODO: rewrite to use data from BMS driver //TODO: rewrite to use data from BMS driver
uint32_t now = HAL_GetTick(); uint32_t now = HAL_GetTick();