wangfq/vd_960
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(vd960Loop): 编译错误修复 — Flt_Reg/SensTable/macros/INCNT

Browse Source
This commit is contained in:
wangfq
2026-06-25 16:41:50 +08:00
parent 633c20562d
commit d2b132a6ef
4 changed files with 11 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vd960Loop/utilities/at32f421_freertos_demo/inc/cmcng.h
View File

@@ -94,6 +94,10 @@ typedef struct _PKG_UART_
extern Pkg_Uart g_pkg_uart_1;
extern Pkg_Uart g_pkg_uart_report;
extern uint8_t g_flag_output;
extern uint8_t g_flag_output2;
extern uint8_t g_input_div;
void uart_report_packet_loop_acs(uint8_t flag);
#endif

13
vd960Loop/utilities/at32f421_freertos_demo/inc/storage.h
View File

@@ -39,9 +39,9 @@
#define Addr_Sens_Array_Out 0x50
#define MAX_LOOP_SENS_AMOUNT 8 // 4 // 5
extern const uint16_t SensTable[MAX_LOOP_SENS_AMOUNT];
extern const uint16_t SensTable_1[MAX_LOOP_SENS_AMOUNT];
#define MAX_LOOP_SENS_AMOUNT 4
extern const uint16_t SensTable[4];
extern const uint16_t SensTable_1[4];
#pragma pack(1)
@@ -169,13 +169,6 @@ typedef struct _DBN_BLE_STATE_
#pragma pack()
#define HOLD_TIME 5*1200
#define LC_HOLD_TIME 4*1200 // 4 minute
#define IN_DELAY 10
#define OUT_DELAY 39
#define PLUSE_DELAY 10
void set_flp_level(uint8_t loop_num, uint8_t freq_level);
void set_factory_param(void);

9
vd960Loop/utilities/at32f421_freertos_demo/src/TaskLoop.c
View File

@@ -40,7 +40,7 @@ uint32_t get_flt_value(uint32_t new_value, uint32_t last_Value)
uint32_t delta = (new_value > last_Value)
? (new_value - last_Value)
: (last_Value - new_value);
uint32_t scaled_delta = (delta * (uint32_t)Flt_Reg) >> 8;
uint32_t scaled_delta = (delta * ALFA_CAP1) >> 8;
if (new_value > last_Value) {
value_Flt = last_Value + scaled_delta;
@@ -99,8 +99,8 @@ void set_loops_relay_off(uint8_t loop_num)
*===========================================================================*/
void init_vd_single(Loop154_Unit *unit)
{
unit->loop_INCNT = 0;
unit->loop_OUTCNT = 0;
unit->INCNT = 0;
unit->OUTCNT = 0;
unit->loop_CapCnt = 0;
unit->loop_CapLast = 0;
unit->loop_LPCNT = 0;
@@ -428,10 +428,7 @@ void vd1_task_per_channel(Loop154_Unit *unit)
if (unit->loop_CAPVD == 0) {
unit->loop_CAPVD = unit->loop_Value;
} else {
uint8_t saved_flt_reg = Flt_Reg;
Flt_Reg = unit->Flt_Reg;
unit->loop_CAPVD = get_flt_value(unit->loop_Value, unit->loop_CAPVD);
Flt_Reg = saved_flt_reg;
}
/*--- 2. 稳定期：只跟踪基线，不检测车辆 ---*/

3
vd960Loop/utilities/at32f421_freertos_demo/src/main.c
View File

@@ -52,6 +52,7 @@ __IO uint32_t sys_counter = 0;
__IO uint64_t TimingDelayInc;
__IO uint32_t TimingDelayDec;
uint8_t g_input_div = 1;
TaskHandle_t loop_task_handler;
@@ -703,8 +704,6 @@ void manage_dbn_ble_default(uint8_t *pkg, uint8_t len)
return;
}
memset(tmp_ble_buf, 0, BUFF_STACK_SIZE);
if(_ota_pre_flag){
PRINT("OTA Pre Flag: %d\n", _ota_pre_flag);
if(pkg[1] == 0x01 && pkg[2] == 0x00 && pkg[3] == 0x01 && pkg[4] == 0xA5 && pkg[5] == 0xA7){