forked from achamaikin/CCSModuleSW30Web
Update version to 1.0.3. Everest timeout changed to 2000ms. CP Line improved, added hysteresis, debounce and EMA filtering
This commit is contained in:
50
.mxproject
50
.mxproject
File diff suppressed because one or more lines are too long
@@ -43,7 +43,7 @@ extern "C" {
|
|||||||
/* USER CODE BEGIN EC */
|
/* USER CODE BEGIN EC */
|
||||||
#define FW_VERSION_MAJOR 0x01
|
#define FW_VERSION_MAJOR 0x01
|
||||||
#define FW_VERSION_MINOR 0x00
|
#define FW_VERSION_MINOR 0x00
|
||||||
#define FW_VERSION_PATCH 0x02
|
#define FW_VERSION_PATCH 0x03
|
||||||
/* USER CODE END EC */
|
/* USER CODE END EC */
|
||||||
|
|
||||||
/* Exported macro ------------------------------------------------------------*/
|
/* Exported macro ------------------------------------------------------------*/
|
||||||
|
|||||||
125
Core/Src/cp.c
125
Core/Src/cp.c
@@ -2,13 +2,50 @@
|
|||||||
#include "adc.h"
|
#include "adc.h"
|
||||||
#include "board.h"
|
#include "board.h"
|
||||||
#include "tim.h"
|
#include "tim.h"
|
||||||
|
#include "debug.h"
|
||||||
#include <stdint.h>
|
#include <stdint.h>
|
||||||
|
|
||||||
#define MAX_DUTY 450
|
#define MAX_DUTY 450
|
||||||
|
#define CP_EMA_ALPHA_Q8 38
|
||||||
|
#define CP_DEBOUNCE_MS_DEFAULT 10
|
||||||
|
#define CP_DEBOUNCE_MS_F 60
|
||||||
|
#define CP_DEBOUNCE_MS_F_LOW_DUTY 100
|
||||||
|
#define CP_LOW_DUTY_THRESHOLD_PERCENT 10
|
||||||
|
|
||||||
|
#define CP_A_ENTER_MV 11000
|
||||||
|
#define CP_A_EXIT_MV 10000
|
||||||
|
|
||||||
|
#define CP_B_ENTER_LOW_MV 8000
|
||||||
|
#define CP_B_ENTER_HIGH_MV 10000
|
||||||
|
#define CP_B_EXIT_LOW_MV 7500
|
||||||
|
#define CP_B_EXIT_HIGH_MV 10500
|
||||||
|
|
||||||
|
#define CP_C_ENTER_LOW_MV 5000
|
||||||
|
#define CP_C_ENTER_HIGH_MV 7000
|
||||||
|
#define CP_C_EXIT_LOW_MV 4500
|
||||||
|
#define CP_C_EXIT_HIGH_MV 7500
|
||||||
|
|
||||||
|
#define CP_D_ENTER_LOW_MV 2000
|
||||||
|
#define CP_D_ENTER_HIGH_MV 4000
|
||||||
|
#define CP_D_EXIT_LOW_MV 1500
|
||||||
|
#define CP_D_EXIT_HIGH_MV 4500
|
||||||
|
|
||||||
|
#define CP_E_ENTER_LOW_MV -1000
|
||||||
|
#define CP_E_ENTER_HIGH_MV 2000
|
||||||
|
#define CP_E_EXIT_LOW_MV -1500
|
||||||
|
#define CP_E_EXIT_HIGH_MV 2500
|
||||||
|
|
||||||
|
#define CP_F_ENTER_MV -11500
|
||||||
|
#define CP_F_EXIT_MV -10500
|
||||||
|
|
||||||
static int32_t cp_voltage_mv = 0;
|
static int32_t cp_voltage_mv = 0;
|
||||||
|
static int32_t cp_voltage_filt_mv = 0;
|
||||||
|
static uint8_t cp_filter_initialized = 0;
|
||||||
static uint8_t cp_duty = 0;
|
static uint8_t cp_duty = 0;
|
||||||
CP_State_t fake_cp_state = EV_STATE_ACQUIRING;
|
CP_State_t fake_cp_state = EV_STATE_ACQUIRING;
|
||||||
|
static CP_State_t cp_stable_state = EV_STATE_ACQUIRING;
|
||||||
|
static CP_State_t cp_candidate_state = EV_STATE_ACQUIRING;
|
||||||
|
static uint32_t cp_candidate_since_ms = 0;
|
||||||
|
|
||||||
static uint32_t CP_ReadAdcChannel(uint32_t ch) {
|
static uint32_t CP_ReadAdcChannel(uint32_t ch) {
|
||||||
uint32_t adc = 0;
|
uint32_t adc = 0;
|
||||||
@@ -23,6 +60,64 @@ static uint32_t CP_ReadAdcChannel(uint32_t ch) {
|
|||||||
}
|
}
|
||||||
#define VREFINT_CAL_ADDR ((uint16_t*)0x1FFFF7BA) // для STM32F1!
|
#define VREFINT_CAL_ADDR ((uint16_t*)0x1FFFF7BA) // для STM32F1!
|
||||||
|
|
||||||
|
static uint8_t CP_IsInRange(int32_t v, int32_t lo, int32_t hi) {
|
||||||
|
return (v >= lo && v <= hi) ? 1u : 0u;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int32_t CP_ApplyEma(int32_t raw_mv) {
|
||||||
|
if (!cp_filter_initialized) {
|
||||||
|
cp_voltage_filt_mv = raw_mv;
|
||||||
|
cp_filter_initialized = 1;
|
||||||
|
return cp_voltage_filt_mv;
|
||||||
|
}
|
||||||
|
|
||||||
|
cp_voltage_filt_mv += ((raw_mv - cp_voltage_filt_mv) * CP_EMA_ALPHA_Q8) / 256;
|
||||||
|
return cp_voltage_filt_mv;
|
||||||
|
}
|
||||||
|
|
||||||
|
static CP_State_t CP_ClassifyWithHysteresis(int32_t v, CP_State_t prev) {
|
||||||
|
switch (prev) {
|
||||||
|
case EV_STATE_A_IDLE:
|
||||||
|
if (v >= CP_A_EXIT_MV) return EV_STATE_A_IDLE;
|
||||||
|
break;
|
||||||
|
case EV_STATE_B_CONN_PREP:
|
||||||
|
if (CP_IsInRange(v, CP_B_EXIT_LOW_MV, CP_B_EXIT_HIGH_MV)) return EV_STATE_B_CONN_PREP;
|
||||||
|
break;
|
||||||
|
case EV_STATE_C_CONN_ACTIVE:
|
||||||
|
if (CP_IsInRange(v, CP_C_EXIT_LOW_MV, CP_C_EXIT_HIGH_MV)) return EV_STATE_C_CONN_ACTIVE;
|
||||||
|
break;
|
||||||
|
case EV_STATE_D_CONN_ACT_VENT:
|
||||||
|
if (CP_IsInRange(v, CP_D_EXIT_LOW_MV, CP_D_EXIT_HIGH_MV)) return EV_STATE_D_CONN_ACT_VENT;
|
||||||
|
break;
|
||||||
|
case EV_STATE_E_NO_POWER:
|
||||||
|
if (CP_IsInRange(v, CP_E_EXIT_LOW_MV, CP_E_EXIT_HIGH_MV)) return EV_STATE_E_NO_POWER;
|
||||||
|
break;
|
||||||
|
case EV_STATE_F_ERROR:
|
||||||
|
if (v <= CP_F_EXIT_MV) return EV_STATE_F_ERROR;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (v >= CP_A_ENTER_MV) return EV_STATE_A_IDLE;
|
||||||
|
if (CP_IsInRange(v, CP_B_ENTER_LOW_MV, CP_B_ENTER_HIGH_MV)) return EV_STATE_B_CONN_PREP;
|
||||||
|
if (CP_IsInRange(v, CP_C_ENTER_LOW_MV, CP_C_ENTER_HIGH_MV)) return EV_STATE_C_CONN_ACTIVE;
|
||||||
|
if (CP_IsInRange(v, CP_D_ENTER_LOW_MV, CP_D_ENTER_HIGH_MV)) return EV_STATE_D_CONN_ACT_VENT;
|
||||||
|
if (CP_IsInRange(v, CP_E_ENTER_LOW_MV, CP_E_ENTER_HIGH_MV)) return EV_STATE_E_NO_POWER;
|
||||||
|
if (v <= CP_F_ENTER_MV) return EV_STATE_F_ERROR;
|
||||||
|
return EV_STATE_ACQUIRING;
|
||||||
|
}
|
||||||
|
|
||||||
|
static uint32_t CP_GetDebounceMs(CP_State_t next_state) {
|
||||||
|
if (next_state == EV_STATE_F_ERROR) {
|
||||||
|
if (cp_duty <= CP_LOW_DUTY_THRESHOLD_PERCENT) {
|
||||||
|
return CP_DEBOUNCE_MS_F_LOW_DUTY;
|
||||||
|
}
|
||||||
|
return CP_DEBOUNCE_MS_F;
|
||||||
|
}
|
||||||
|
return CP_DEBOUNCE_MS_DEFAULT;
|
||||||
|
}
|
||||||
|
|
||||||
static int32_t CP_ReadVoltageMv(void)
|
static int32_t CP_ReadVoltageMv(void)
|
||||||
{
|
{
|
||||||
uint32_t adc = 0;
|
uint32_t adc = 0;
|
||||||
@@ -75,29 +170,30 @@ int32_t CP_GetVoltage(void) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
CP_State_t CP_GetState(void) {
|
CP_State_t CP_GetState(void) {
|
||||||
int32_t voltage_real = cp_voltage_mv;
|
int32_t voltage_real = cp_voltage_filt_mv;
|
||||||
|
uint32_t now = HAL_GetTick();
|
||||||
|
|
||||||
if(fake_cp_state != EV_STATE_ACQUIRING) {
|
if(fake_cp_state != EV_STATE_ACQUIRING) {
|
||||||
return fake_cp_state;
|
return fake_cp_state;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (voltage_real >= (12000-1000)) {
|
CP_State_t instant_state = CP_ClassifyWithHysteresis(voltage_real, cp_stable_state);
|
||||||
return EV_STATE_A_IDLE;
|
|
||||||
} else if (voltage_real >= (9000-1000) && voltage_real <= (9000+1000)) {
|
if (instant_state == cp_stable_state) {
|
||||||
return EV_STATE_B_CONN_PREP;
|
cp_candidate_state = cp_stable_state;
|
||||||
} else if (voltage_real >= (6000-1000) && voltage_real <= (6000+1000)) {
|
cp_candidate_since_ms = now;
|
||||||
return EV_STATE_C_CONN_ACTIVE;
|
|
||||||
} else if (voltage_real >= (3000-1000) && voltage_real <= (3000 + 1000)) {
|
|
||||||
return EV_STATE_D_CONN_ACT_VENT;
|
|
||||||
} else if (voltage_real >= (0-1000) && voltage_real <= (0+2000)){
|
|
||||||
return EV_STATE_E_NO_POWER;
|
|
||||||
} else if (voltage_real <= (-12000+1000)) {
|
|
||||||
return EV_STATE_F_ERROR;
|
|
||||||
} else {
|
} else {
|
||||||
return EV_STATE_ACQUIRING;
|
if (cp_candidate_state != instant_state) {
|
||||||
|
cp_candidate_state = instant_state;
|
||||||
|
cp_candidate_since_ms = now;
|
||||||
|
} else if ((now - cp_candidate_since_ms) >= CP_GetDebounceMs(cp_candidate_state)) {
|
||||||
|
cp_stable_state = cp_candidate_state;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return cp_stable_state;
|
||||||
|
}
|
||||||
|
|
||||||
void CP_Loop(void) {
|
void CP_Loop(void) {
|
||||||
(void)CP_GetState();
|
(void)CP_GetState();
|
||||||
}
|
}
|
||||||
@@ -109,6 +205,7 @@ void HAL_TIM_OC_DelayElapsedCallback(TIM_HandleTypeDef *htim)
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
cp_voltage_mv = CP_ReadVoltageMv();
|
cp_voltage_mv = CP_ReadVoltageMv();
|
||||||
|
(void)CP_ApplyEma(cp_voltage_mv);
|
||||||
ADC_Unlock();
|
ADC_Unlock();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,6 +27,7 @@ uint8_t ev_enable_output = 0;
|
|||||||
#define CMD_INTERVAL 10
|
#define CMD_INTERVAL 10
|
||||||
#define MAX_TX_BUFFER_SIZE 256
|
#define MAX_TX_BUFFER_SIZE 256
|
||||||
#define MAX_RX_BUFFER_SIZE 256
|
#define MAX_RX_BUFFER_SIZE 256
|
||||||
|
#define EVEREST_TIMEOUT_MS 2000
|
||||||
|
|
||||||
static uint8_t rx_buffer[MAX_RX_BUFFER_SIZE];
|
static uint8_t rx_buffer[MAX_RX_BUFFER_SIZE];
|
||||||
static uint8_t tx_buffer[MAX_TX_BUFFER_SIZE];
|
static uint8_t tx_buffer[MAX_TX_BUFFER_SIZE];
|
||||||
@@ -178,11 +179,11 @@ void CCS_SerialLoop(void) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (last_host_seen > 0 && (HAL_GetTick() - last_host_seen) > 500) {
|
if (last_host_seen > 0 && (HAL_GetTick() - last_host_seen) > EVEREST_TIMEOUT_MS) {
|
||||||
|
log_printf(LOG_ERR, "Everest timeout\n");
|
||||||
CONN.EnableOutput = 0;
|
CONN.EnableOutput = 0;
|
||||||
CCS_EvseState = Unknown;
|
CCS_EvseState = Unknown;
|
||||||
CP_SetDuty(100);
|
CP_SetDuty(100);
|
||||||
log_printf(LOG_ERR, "Everest timeout\n");
|
|
||||||
} else {
|
} else {
|
||||||
if (last_cmd == CMD_STOP) {
|
if (last_cmd == CMD_STOP) {
|
||||||
CONN.EnableOutput = 0;
|
CONN.EnableOutput = 0;
|
||||||
|
|||||||
@@ -61,10 +61,6 @@ void MX_TIM3_Init(void)
|
|||||||
{
|
{
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
if (HAL_TIM_OC_Init(&htim3) != HAL_OK)
|
|
||||||
{
|
|
||||||
Error_Handler();
|
|
||||||
}
|
|
||||||
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
sMasterConfig.MasterOutputTrigger = TIM_TRGO_RESET;
|
||||||
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
sMasterConfig.MasterSlaveMode = TIM_MASTERSLAVEMODE_DISABLE;
|
||||||
if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
|
if (HAL_TIMEx_MasterConfigSynchronization(&htim3, &sMasterConfig) != HAL_OK)
|
||||||
@@ -79,12 +75,6 @@ void MX_TIM3_Init(void)
|
|||||||
{
|
{
|
||||||
Error_Handler();
|
Error_Handler();
|
||||||
}
|
}
|
||||||
sConfigOC.OCMode = TIM_OCMODE_TIMING;
|
|
||||||
sConfigOC.Pulse = 1;
|
|
||||||
if (HAL_TIM_OC_ConfigChannel(&htim3, &sConfigOC, TIM_CHANNEL_1) != HAL_OK)
|
|
||||||
{
|
|
||||||
Error_Handler();
|
|
||||||
}
|
|
||||||
/* USER CODE BEGIN TIM3_Init 2 */
|
/* USER CODE BEGIN TIM3_Init 2 */
|
||||||
|
|
||||||
/* USER CODE END TIM3_Init 2 */
|
/* USER CODE END TIM3_Init 2 */
|
||||||
|
|||||||
@@ -59,7 +59,6 @@ defined in linker script */
|
|||||||
.weak Reset_Handler
|
.weak Reset_Handler
|
||||||
.type Reset_Handler, %function
|
.type Reset_Handler, %function
|
||||||
Reset_Handler:
|
Reset_Handler:
|
||||||
ldr sp, =_estack /* set stack pointer */
|
|
||||||
|
|
||||||
/* Call the clock system initialization function.*/
|
/* Call the clock system initialization function.*/
|
||||||
bl SystemInit
|
bl SystemInit
|
||||||
@@ -253,7 +252,6 @@ g_pfnVectors:
|
|||||||
.word 0
|
.word 0
|
||||||
.word BootRAM /* @0x1E0. This is for boot in RAM mode for
|
.word BootRAM /* @0x1E0. This is for boot in RAM mode for
|
||||||
STM32F10x Connectivity line Devices. */
|
STM32F10x Connectivity line Devices. */
|
||||||
.word 0x66666666 /* Reserved for OpenBLT checksum*/
|
|
||||||
|
|
||||||
/*******************************************************************************
|
/*******************************************************************************
|
||||||
*
|
*
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@@ -1,9 +1,13 @@
|
|||||||
../Core/Src/cp.c:13:17:CP_ReadAdcChannel 1
|
../Core/Src/cp.c:50:17:CP_ReadAdcChannel 1
|
||||||
../Core/Src/cp.c:26:16:CP_ReadVoltageMv 1
|
../Core/Src/cp.c:63:16:CP_IsInRange 3
|
||||||
../Core/Src/cp.c:39:6:CP_Init 1
|
../Core/Src/cp.c:67:16:CP_ApplyEma 3
|
||||||
../Core/Src/cp.c:56:6:CP_SetDuty 1
|
../Core/Src/cp.c:78:19:CP_ClassifyWithHysteresis 19
|
||||||
../Core/Src/cp.c:69:9:CP_GetDuty 1
|
../Core/Src/cp.c:111:17:CP_GetDebounceMs 3
|
||||||
../Core/Src/cp.c:73:9:CP_GetVoltage 1
|
../Core/Src/cp.c:121:16:CP_ReadVoltageMv 1
|
||||||
../Core/Src/cp.c:77:12:CP_GetState 12
|
../Core/Src/cp.c:134:6:CP_Init 1
|
||||||
../Core/Src/cp.c:101:6:CP_Loop 1
|
../Core/Src/cp.c:151:6:CP_SetDuty 1
|
||||||
../Core/Src/cp.c:105:6:HAL_TIM_OC_DelayElapsedCallback 4
|
../Core/Src/cp.c:164:9:CP_GetDuty 1
|
||||||
|
../Core/Src/cp.c:168:9:CP_GetVoltage 1
|
||||||
|
../Core/Src/cp.c:172:12:CP_GetState 5
|
||||||
|
../Core/Src/cp.c:197:6:CP_Loop 1
|
||||||
|
../Core/Src/cp.c:201:6:HAL_TIM_OC_DelayElapsedCallback 4
|
||||||
|
|||||||
@@ -1,15 +1,15 @@
|
|||||||
../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset 1
|
../Drivers/CMSIS/Include/core_cm3.h:1762:34:__NVIC_SystemReset 1
|
||||||
../Core/Src/serial.c:51:6:CCS_RxEventCallback 4
|
../Core/Src/serial.c:52:6:CCS_RxEventCallback 4
|
||||||
../Core/Src/serial.c:61:6:CCS_SerialLoop 41
|
../Core/Src/serial.c:62:6:CCS_SerialLoop 41
|
||||||
../Core/Src/serial.c:206:6:CCS_Init 1
|
../Core/Src/serial.c:207:6:CCS_Init 1
|
||||||
../Core/Src/serial.c:218:17:crc16_ibm 4
|
../Core/Src/serial.c:219:17:crc16_ibm 4
|
||||||
../Core/Src/serial.c:233:17:CCS_BuildPacket 4
|
../Core/Src/serial.c:234:17:CCS_BuildPacket 4
|
||||||
../Core/Src/serial.c:249:13:CCS_SendPacket 2
|
../Core/Src/serial.c:250:13:CCS_SendPacket 2
|
||||||
../Core/Src/serial.c:257:13:CCS_SendResetReason 1
|
../Core/Src/serial.c:258:13:CCS_SendResetReason 1
|
||||||
../Core/Src/serial.c:261:6:CCS_SendEmergencyStop 1
|
../Core/Src/serial.c:262:6:CCS_SendEmergencyStop 1
|
||||||
../Core/Src/serial.c:265:6:CCS_SendStart 1
|
../Core/Src/serial.c:266:6:CCS_SendStart 1
|
||||||
../Core/Src/serial.c:269:13:CCS_CalculateEnergy 2
|
../Core/Src/serial.c:270:13:CCS_CalculateEnergy 2
|
||||||
../Core/Src/serial.c:284:13:send_state 2
|
../Core/Src/serial.c:285:13:send_state 2
|
||||||
../Core/Src/serial.c:311:17:expected_payload_len 11
|
../Core/Src/serial.c:312:17:expected_payload_len 11
|
||||||
../Core/Src/serial.c:327:13:apply_command 13
|
../Core/Src/serial.c:328:13:apply_command 13
|
||||||
../Core/Src/serial.c:394:16:process_received_packet 6
|
../Core/Src/serial.c:395:16:process_received_packet 6
|
||||||
|
|||||||
@@ -31,33 +31,6 @@ C_SRCS += \
|
|||||||
../Core/Src/tim.c \
|
../Core/Src/tim.c \
|
||||||
../Core/Src/usart.c
|
../Core/Src/usart.c
|
||||||
|
|
||||||
C_DEPS += \
|
|
||||||
./Core/Src/adc.d \
|
|
||||||
./Core/Src/board.d \
|
|
||||||
./Core/Src/can.d \
|
|
||||||
./Core/Src/charger_control.d \
|
|
||||||
./Core/Src/cp.d \
|
|
||||||
./Core/Src/crc.d \
|
|
||||||
./Core/Src/debug.d \
|
|
||||||
./Core/Src/gpio.d \
|
|
||||||
./Core/Src/main.d \
|
|
||||||
./Core/Src/meter.d \
|
|
||||||
./Core/Src/psu_control.d \
|
|
||||||
./Core/Src/rgb_controller.d \
|
|
||||||
./Core/Src/rtc.d \
|
|
||||||
./Core/Src/serial.d \
|
|
||||||
./Core/Src/serial_control.d \
|
|
||||||
./Core/Src/serial_handler.d \
|
|
||||||
./Core/Src/sma_filter.d \
|
|
||||||
./Core/Src/soft_rtc.d \
|
|
||||||
./Core/Src/stm32f1xx_hal_msp.d \
|
|
||||||
./Core/Src/stm32f1xx_it.d \
|
|
||||||
./Core/Src/syscalls.d \
|
|
||||||
./Core/Src/sysmem.d \
|
|
||||||
./Core/Src/system_stm32f1xx.d \
|
|
||||||
./Core/Src/tim.d \
|
|
||||||
./Core/Src/usart.d
|
|
||||||
|
|
||||||
OBJS += \
|
OBJS += \
|
||||||
./Core/Src/adc.o \
|
./Core/Src/adc.o \
|
||||||
./Core/Src/board.o \
|
./Core/Src/board.o \
|
||||||
@@ -85,6 +58,33 @@ OBJS += \
|
|||||||
./Core/Src/tim.o \
|
./Core/Src/tim.o \
|
||||||
./Core/Src/usart.o
|
./Core/Src/usart.o
|
||||||
|
|
||||||
|
C_DEPS += \
|
||||||
|
./Core/Src/adc.d \
|
||||||
|
./Core/Src/board.d \
|
||||||
|
./Core/Src/can.d \
|
||||||
|
./Core/Src/charger_control.d \
|
||||||
|
./Core/Src/cp.d \
|
||||||
|
./Core/Src/crc.d \
|
||||||
|
./Core/Src/debug.d \
|
||||||
|
./Core/Src/gpio.d \
|
||||||
|
./Core/Src/main.d \
|
||||||
|
./Core/Src/meter.d \
|
||||||
|
./Core/Src/psu_control.d \
|
||||||
|
./Core/Src/rgb_controller.d \
|
||||||
|
./Core/Src/rtc.d \
|
||||||
|
./Core/Src/serial.d \
|
||||||
|
./Core/Src/serial_control.d \
|
||||||
|
./Core/Src/serial_handler.d \
|
||||||
|
./Core/Src/sma_filter.d \
|
||||||
|
./Core/Src/soft_rtc.d \
|
||||||
|
./Core/Src/stm32f1xx_hal_msp.d \
|
||||||
|
./Core/Src/stm32f1xx_it.d \
|
||||||
|
./Core/Src/syscalls.d \
|
||||||
|
./Core/Src/sysmem.d \
|
||||||
|
./Core/Src/system_stm32f1xx.d \
|
||||||
|
./Core/Src/tim.d \
|
||||||
|
./Core/Src/usart.d
|
||||||
|
|
||||||
|
|
||||||
# Each subdirectory must supply rules for building sources it contributes
|
# Each subdirectory must supply rules for building sources it contributes
|
||||||
Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
|
Core/Src/%.o Core/Src/%.su Core/Src/%.cyclo: ../Core/Src/%.c Core/Src/subdir.mk
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
../Core/Src/tim.c:31:6:MX_TIM3_Init 8
|
../Core/Src/tim.c:31:6:MX_TIM3_Init 6
|
||||||
../Core/Src/tim.c:95:6:MX_TIM4_Init 8
|
../Core/Src/tim.c:85:6:MX_TIM4_Init 8
|
||||||
../Core/Src/tim.c:157:6:HAL_TIM_Base_MspInit 3
|
../Core/Src/tim.c:147:6:HAL_TIM_Base_MspInit 3
|
||||||
../Core/Src/tim.c:187:6:HAL_TIM_MspPostInit 3
|
../Core/Src/tim.c:177:6:HAL_TIM_MspPostInit 3
|
||||||
../Core/Src/tim.c:235:6:HAL_TIM_Base_MspDeInit 3
|
../Core/Src/tim.c:225:6:HAL_TIM_Base_MspDeInit 3
|
||||||
|
|||||||
@@ -7,16 +7,16 @@
|
|||||||
S_SRCS += \
|
S_SRCS += \
|
||||||
../Core/Startup/startup_stm32f107vctx.s
|
../Core/Startup/startup_stm32f107vctx.s
|
||||||
|
|
||||||
S_DEPS += \
|
|
||||||
./Core/Startup/startup_stm32f107vctx.d
|
|
||||||
|
|
||||||
OBJS += \
|
OBJS += \
|
||||||
./Core/Startup/startup_stm32f107vctx.o
|
./Core/Startup/startup_stm32f107vctx.o
|
||||||
|
|
||||||
|
S_DEPS += \
|
||||||
|
./Core/Startup/startup_stm32f107vctx.d
|
||||||
|
|
||||||
|
|
||||||
# Each subdirectory must supply rules for building sources it contributes
|
# Each subdirectory must supply rules for building sources it contributes
|
||||||
Core/Startup/%.o: ../Core/Startup/%.s Core/Startup/subdir.mk
|
Core/Startup/%.o: ../Core/Startup/%.s Core/Startup/subdir.mk
|
||||||
arm-none-eabi-gcc -mcpu=cortex-m3 -g3 -DDEBUG -c -I/Users/colorbass/STM32CubeIDE/workspace_1.12.0/lib_EDCAN -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<"
|
arm-none-eabi-gcc -mcpu=cortex-m3 -g3 -DDEBUG -c -x assembler-with-cpp -MMD -MP -MF"$(@:%.o=%.d)" -MT"$@" --specs=nano.specs -mfloat-abi=soft -mthumb -o "$@" "$<"
|
||||||
|
|
||||||
clean: clean-Core-2f-Startup
|
clean: clean-Core-2f-Startup
|
||||||
|
|
||||||
|
|||||||
@@ -26,28 +26,6 @@ C_SRCS += \
|
|||||||
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
|
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.c \
|
||||||
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
|
../Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.c
|
||||||
|
|
||||||
C_DEPS += \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.d \
|
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.d
|
|
||||||
|
|
||||||
OBJS += \
|
OBJS += \
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o \
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.o \
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.o \
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.o \
|
||||||
@@ -70,6 +48,28 @@ OBJS += \
|
|||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.o \
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.o \
|
||||||
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.o
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.o
|
||||||
|
|
||||||
|
C_DEPS += \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_adc_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_can.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_cortex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_crc.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_dma.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_exti.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_flash_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_gpio_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_pwr.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rcc_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_rtc_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_tim_ex.d \
|
||||||
|
./Drivers/STM32F1xx_HAL_Driver/Src/stm32f1xx_hal_uart.d
|
||||||
|
|
||||||
|
|
||||||
# Each subdirectory must supply rules for building sources it contributes
|
# Each subdirectory must supply rules for building sources it contributes
|
||||||
Drivers/STM32F1xx_HAL_Driver/Src/%.o Drivers/STM32F1xx_HAL_Driver/Src/%.su Drivers/STM32F1xx_HAL_Driver/Src/%.cyclo: ../Drivers/STM32F1xx_HAL_Driver/Src/%.c Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
|
Drivers/STM32F1xx_HAL_Driver/Src/%.o Drivers/STM32F1xx_HAL_Driver/Src/%.su Drivers/STM32F1xx_HAL_Driver/Src/%.cyclo: ../Drivers/STM32F1xx_HAL_Driver/Src/%.c Drivers/STM32F1xx_HAL_Driver/Src/subdir.mk
|
||||||
|
|||||||
@@ -10,18 +10,15 @@ C_SRCS :=
|
|||||||
S_UPPER_SRCS :=
|
S_UPPER_SRCS :=
|
||||||
O_SRCS :=
|
O_SRCS :=
|
||||||
CYCLO_FILES :=
|
CYCLO_FILES :=
|
||||||
OBJDUMP_LIST :=
|
|
||||||
S_DEPS :=
|
|
||||||
OBJCOPY_SREC :=
|
|
||||||
C_DEPS :=
|
|
||||||
OBJCOPY_BIN :=
|
|
||||||
OBJCOPY_HEX :=
|
|
||||||
SIZE_OUTPUT :=
|
SIZE_OUTPUT :=
|
||||||
|
OBJDUMP_LIST :=
|
||||||
SU_FILES :=
|
SU_FILES :=
|
||||||
EXECUTABLES :=
|
EXECUTABLES :=
|
||||||
OBJS :=
|
OBJS :=
|
||||||
MAP_FILES :=
|
MAP_FILES :=
|
||||||
|
S_DEPS :=
|
||||||
S_UPPER_DEPS :=
|
S_UPPER_DEPS :=
|
||||||
|
C_DEPS :=
|
||||||
|
|
||||||
# Every subdirectory with source files must be described here
|
# Every subdirectory with source files must be described here
|
||||||
SUBDIRS := \
|
SUBDIRS := \
|
||||||
|
|||||||
Reference in New Issue
Block a user