big refactoring: J1939, log output, state machine bug fixes

Core/Src/main.c

@@ -30,13 +30,15 @@
 #include "can.h"
 #include "board.h"
 #include <stdio.h>
-#include "debug.h"
 #include "charger_gbt.h"
 #include "soft_rtc.h"
 #include "j1939.h"
 #include "connector.h"
 #include "rgb_controller.h"
-
+#include "serial_control.h"
+#include "cp.h"
+#include "debug.h"
+#include "load.h"
 /* USER CODE END Includes */
 
 /* Private typedef -----------------------------------------------------------*/
@@ -60,6 +62,7 @@
 /* Private variables ---------------------------------------------------------*/
 
 /* USER CODE BEGIN PV */
+volatile CP_State_t cp_state = EV_STATE_B_CONN_PREP;
 
 /* USER CODE END PV */
 
@@ -116,23 +119,26 @@ int main(void)
   MX_UART5_Init();
   MX_USART1_UART_Init();
   MX_USART3_UART_Init();
+  MX_TIM3_Init();
   /* USER CODE BEGIN 2 */
   CAN_ReInit();
   Init_Peripheral();
   LED_Init();
-
+  LOAD_Init();
   HAL_Delay(300);
   GBT_Init();
   set_Time(1721651966);
-  printf("Startup (type \'help\' for command list)\n");
-  debug_init();
-  EDCAN_Init(0x00);
-  EDCAN_printf(LOG_INFO, "Startup FW %d.%d.%d\n", FWVER_MAJOR, FWVER_MINOR, FWVER_PATCH);
+  // printf("Startup serial control enabled\n");
+  EDCAN_Init(InfoBlock->addrEdcan);
+  log_printf(LOG_INFO, "Startup FW %d.%d.%d\n", FWVER_MAJOR, FWVER_MINOR, FWVER_PATCH);
   //EDCAN_Init(0x20); //Адрес EDCAN
   GBT_CAN_ReInit();
   CAN_ReInit();
 
   CONN_Init();
+  SC_Init();
+  CP_Init();
+
   /* USER CODE END 2 */
 
   /* Infinite loop */
@@ -142,10 +148,15 @@ int main(void)
     /* USER CODE END WHILE */
 
     /* USER CODE BEGIN 3 */
-//	    HAL_Delay(1);
+
+    CONN[1].MeasuredVoltage = ISO.voltageComm;
+    LOAD_Task();
 		EDCAN_Loop();
 		//can_task();
-		debug_task();
+		J1939_ExchangeRxBuffer();
+		J1939_ExchangeTxBuffer();
+		SC_Task();
+		CP_Task();
 		CONN_CC_ReadStateFiltered();
 //		GBT_ManageLock();
 		CONN_Task();