clean project

Core/Src/psu_control.c

@@ -1,14 +1,13 @@
+#include "psu_control.h"
 
-#include <psu_control.h>
-
+#include "board.h"
 #include "can.h"
-#include "string.h"
-#include "stdio.h"
 #include "charger_config.h"
 #include "charger_control.h"
-#include "board.h"
 #include "debug.h"
 #include "isr_opt.h"
+#include <stdio.h>
+#include <string.h>
 
 PSU_02_t PSU_02;
 PSU_04_t PSU_04;
@@ -31,6 +30,8 @@ uint32_t can_lastpacket;
 
 extern CAN_HandleTypeDef hcan2;
 
+static void PSU_SendCmd(uint8_t source, uint8_t destination, uint8_t cmd, void *data);
+
 static void PSU_SwitchState(PSU_State_t state){
 	PSU0.state = state;
 	PSU0.statetick = HAL_GetTick();
@@ -227,7 +228,6 @@ void PSU_SendCmd(uint8_t source, uint8_t destination, uint8_t cmd, void *data){
 			/* если отправка удалась, выход */
 			if(CAN_result == HAL_OK) {
 				return;
-				retry_counter = 0;
 			}
 		}
 		ED_Delay(1);
@@ -237,11 +237,6 @@ void PSU_SendCmd(uint8_t source, uint8_t destination, uint8_t cmd, void *data){
 
 }
 
-uint32_t max(uint32_t a, uint32_t b){
-	if(a>b) return a;
-	else return b;
-}
-
 void PSU_ReadWrite(){
 
 	uint8_t zero_data[8] = {0,0,0,0,0,0,0,0};
@@ -264,8 +259,8 @@ void PSU_ReadWrite(){
 	CONN.RequestedPower = CONN.RequestedCurrent * CONN.RequestedVoltage / 10;
 
 	if(PSU0.ready){
-		if (CONN.RequestedVoltage == 500) { // fake
-			PSU_SetVoltageCurrent(0, 300, 10); // Normal mode
+		if (CONN.RequestedVoltage == FAKE_EVREQ_VOLTAGE_V) {
+			PSU_SetVoltageCurrent(0, (uint16_t)FAKE_PSU_VOLTAGE_V, (uint16_t)FAKE_PSU_CURRENT_0P1A);
 		}else{
 			PSU_SetVoltageCurrent(0, CONN.RequestedVoltage, CONN.RequestedCurrent); // Normal mode
 		}
@@ -288,7 +283,6 @@ void PSU_ReadWrite(){
 
 void PSU_Task(void){
 	static uint32_t psu_on_tick = 0;
-	static uint32_t dc_on_tick = 0;
 	static uint32_t cont_ok_tick = 0;
 
 	// Обновляем ONLINE/READY по таймауту
@@ -368,7 +362,6 @@ void PSU_Task(void){
 	case PSU_WAIT_ACK_ON:
 
 		if(PSU0.PSU_enabled && PSU0.ready){
-			dc_on_tick = HAL_GetTick();
 			PSU_SwitchState(PSU_CONT_WAIT_ACK_ON);
 		}else if(PSU_StateTime() > 10000){
 			PSU0.psu_fault = 1;