diff --git a/8F-3AW-PowerMeter/power_meter.c b/8F_5AW_PowerMeter/8f_5aw_powerMeter.c similarity index 67% rename from 8F-3AW-PowerMeter/power_meter.c rename to 8F_5AW_PowerMeter/8f_5aw_powerMeter.c index d1090eb..b4a4298 100644 --- a/8F-3AW-PowerMeter/power_meter.c +++ b/8F_5AW_PowerMeter/8f_5aw_powerMeter.c @@ -1,6 +1,6 @@ /** ****************************************************************************** - * @file power_meter.c + * @file 8f_5aw_powerMeter.c * @author Motor Control SDK Team, Yuwell Software XiangenWang * @brief Voice Recognition Module Initialization Section, including peripheral initialization and message node insertion, etc. @@ -47,14 +47,14 @@ */ /* USER CODE END Header */ -#include "power_meter.h" +#include "8f_5aw_powerMeter.h" // 提供给外部的采样结果数据 -EleC_V_data elec_v_data; +EleC_V_Data elec_v_data; -#if COULOMBMETER_SET_FUNC_ENABLE +#if POWER_METER_SET_FUNC_ENABLE // 使用默认寄存器配置 不修改寄存器内容 /** * @brief 向BL0942指定寄存器写入24位数据 * @param addr: 寄存器地址(8位) @@ -65,25 +65,25 @@ EleC_V_data elec_v_data; * 3. 校验和计算：(写命令+地址+3字节数据)的低8位取反 * 4. 数据发送大小限定为3个字节，超出部分无效 */ -static void coulombmeter_write_reg(uint8_t addr, uint8_t* reg_data) +static void power_meter_write_reg(uint8_t addr, uint8_t* reg_data) { uint8_t check_sum = 0; // 1. 下发命令字节 BL0942_ADDR_W - COULOMBMETER_UART_TRANS_BYTE(BL0942_ADDR_W); + POWER_METER_UART_TRANS_BYTE(BL0942_ADDR_W); // 2. 下发需要写寄存器的地址 - COULOMBMETER_UART_TRANS_BYTE(addr); + POWER_METER_UART_TRANS_BYTE(addr); // 3. 发送需要往寄存器地址写入的数据 - COULOMBMETER_UART_TRANS_BYTE(reg_data[0]); - COULOMBMETER_UART_TRANS_BYTE(reg_data[1]); - COULOMBMETER_UART_TRANS_BYTE(reg_data[2]); + POWER_METER_UART_TRANS_BYTE(reg_data[0]); + POWER_METER_UART_TRANS_BYTE(reg_data[1]); + POWER_METER_UART_TRANS_BYTE(reg_data[2]); // 4. 发送校验和 check_sum = (BL0942_ADDR_W + addr + reg_data[0] + reg_data[1] + reg_data[2]); check_sum = ~(check_sum & 0xFF); - COULOMBMETER_UART_TRANS_BYTE(check_sum); + POWER_METER_UART_TRANS_BYTE(check_sum); } #endif @@ -96,15 +96,15 @@ static void coulombmeter_write_reg(uint8_t addr, uint8_t* reg_data) * @retval 无 * @note 1. 通信协议：UART发送帧格式为[读命令(BL0942_ADDR_R)+寄存器地址] * 2. 芯片收到读命令后，会在150us内通过UART返回4字节数据(3字节有效数据+1字节校验) - * 3. 建议1s执行一次该函数，返回数据在UART接收中断中处理 + * 3. 建议500ms执行一次该函数，返回数据在UART接收中断中处理(系统寄存器每隔400ms刷新一次) */ -static void coulombmeter_read_reg(uint8_t addr) +static void power_meter_read_reg(uint8_t addr) { // 1. 下发命令字节 BL0942_ADDR_R - COULOMBMETER_UART_TRANS_BYTE(BL0942_ADDR_R); + POWER_METER_UART_TRANS_BYTE(BL0942_ADDR_R); // 2. 下发地址数据 - COULOMBMETER_UART_TRANS_BYTE(addr); + POWER_METER_UART_TRANS_BYTE(addr); } @@ -123,20 +123,20 @@ static void coulombmeter_read_reg(uint8_t addr) void User_PowerMeter_Init(void) { - FL_GPIO_InitTypeDef GPIO_InitStruct; + FL_GPIO_InitTypeDef GPIO_InitStruct; // 初始化GPIO - GPIO_InitStruct.pin = COULOMBMETER_UART_RX_GPIO_PIN; + GPIO_InitStruct.pin = POWER_METER_UART_RX_GPIO_PIN; GPIO_InitStruct.mode = FL_GPIO_MODE_DIGITAL; GPIO_InitStruct.outputType = FL_GPIO_OUTPUT_PUSHPULL; GPIO_InitStruct.pull = FL_DISABLE; GPIO_InitStruct.remapPin = FL_DISABLE; GPIO_InitStruct.analogSwitch = FL_DISABLE; - FL_GPIO_Init(COULOMBMETER_UART_RX_GPIO_PORT, &GPIO_InitStruct); + FL_GPIO_Init(POWER_METER_UART_RX_GPIO_PORT, &GPIO_InitStruct); - GPIO_InitStruct.pin = COULOMBMETER_UART_TX_GPIO_PIN; - FL_GPIO_Init(COULOMBMETER_UART_TX_GPIO_PORT, &GPIO_InitStruct); + GPIO_InitStruct.pin = POWER_METER_UART_TX_GPIO_PIN; + FL_GPIO_Init(POWER_METER_UART_TX_GPIO_PORT, &GPIO_InitStruct); // 初始化串口参数 FL_UART_InitTypeDef UART_InitStruct = {0}; @@ -145,20 +145,18 @@ void User_PowerMeter_Init(void) UART_InitStruct.stopBits = FL_UART_STOP_BIT_WIDTH_1B; //停止位 UART_InitStruct.parity = FL_UART_PARITY_NONE; //奇偶校验 UART_InitStruct.transferDirection = FL_UART_DIRECTION_TX_RX; //接收-发送使能 - FL_UART_Init(COULOMBMETER_USED_UART_NUM, &UART_InitStruct); + FL_UART_Init(POWER_METER_USED_UART_NUM, &UART_InitStruct); - NVIC_DisableIRQ(COULOMBMETER_IRQn); - NVIC_SetPriority(COULOMBMETER_IRQn,2); //中断优先级配置 - NVIC_EnableIRQ(COULOMBMETER_IRQn); + NVIC_DisableIRQ(POWER_METER_IRQn); + NVIC_SetPriority(POWER_METER_IRQn,2); //中断优先级配置 + NVIC_EnableIRQ(POWER_METER_IRQn); // 开启接收中断 - FL_UART_ClearFlag_RXBuffFull(COULOMBMETER_USED_UART_NUM); - FL_UART_EnableIT_RXBuffFull(COULOMBMETER_USED_UART_NUM); + FL_UART_ClearFlag_RXBuffFull(POWER_METER_USED_UART_NUM); + FL_UART_EnableIT_RXBuffFull(POWER_METER_USED_UART_NUM); // 清空结果 memset(&elec_v_data, 0, sizeof(elec_v_data)); - - } @@ -173,27 +171,36 @@ void User_PowerMeter_Init(void) * 3. 触发读取后，会设置对应的等待状态，数据接收和解析在UART中断中完成 * 4. 最终解析后的电压/电流值存储在全局变量elec_v_data中 */ -void User_Coulombmeter_Data_refresh(void) +void User_Power_refresh(void) { - static Bus_Mod mod = MOD_CURRENT_METER; + static Bus_Mod mod = MOD_VOLTAGE_METER; if(mod == MOD_VOLTAGE_METER) { mod = MOD_CURRENT_METER; - coulombmeter_read_reg(Addr_V_RMS); + power_meter_read_reg(Addr_V_RMS); elec_v_data.bus_com_stm = BUS_COM_STATE_WAITE_VOLTAGE; // 转入等待电压数据状态 elec_v_data.current_index = 0; elec_v_data.voltage_raw = 0; - }else{ + }else if(mod == MOD_CURRENT_METER){ - mod = MOD_VOLTAGE_METER; - coulombmeter_read_reg(Addr_I_RMS); + mod = MOD_POWER_METER; + power_meter_read_reg(Addr_I_RMS); - elec_v_data.bus_com_stm = BUS_COM_STATE_WAITE_CURRENT; // 转入等待电压数据状态 + elec_v_data.bus_com_stm = BUS_COM_STATE_WAITE_CURRENT; // 转入等待电流数据状态 elec_v_data.current_index = 0; elec_v_data.current_raw = 0; + }else if(mod == MOD_POWER_METER){ + + mod = MOD_VOLTAGE_METER; + power_meter_read_reg(Addr_WATT); + + elec_v_data.bus_com_stm = BUS_COM_STATE_WAITE_POWER; // 转入等待功率数据状态 + elec_v_data.current_index = 0; + elec_v_data.power_raw = 0; } + } @@ -201,21 +208,21 @@ void User_Coulombmeter_Data_refresh(void) /** - * @brief UART5中断服务函数（库仑计数据接收处理） + * @brief UART5中断服务函数（电量计数据接收处理） * @param 无 * @retval 无 * @note 1. 仅处理接收缓冲区满中断(RXBuffFull) - * 2. 根据当前通信状态(BUS_COM_STATE)分别处理电压/电流数据 + * 2. 根据当前通信状态(BUS_COM_STATE)分别处理电压/电流/有功功率数据 * 3. 数据接收格式：3字节有效数据(低位在前)+1字节校验和 - * 4. 校验和验证通过后，转换为实际电压(V)/电流(mA)值并更新全局变量 - * 5. 接收中断标志通过读取RXBuff寄存器自动清除，需手动清除RXBuffFull标志 + * 4. 校验和验证通过后，转换为实际电压(V)/电流(mA)/有功功率值并更新全局变量 + * 5. 接收中断标志通过读取RXBuff寄存器自动清除，为防止出现脏数据还需手动清除RXBuffFull标志 */ void UART5_IRQHandler(void) { // 接收中断处理 - if(FL_UART_IsEnabledIT_RXBuffFull(COULOMBMETER_USED_UART_NUM) && - FL_UART_IsActiveFlag_RXBuffFull(COULOMBMETER_USED_UART_NUM)) + if(FL_UART_IsEnabledIT_RXBuffFull(POWER_METER_USED_UART_NUM) && + FL_UART_IsActiveFlag_RXBuffFull(POWER_METER_USED_UART_NUM)) { if(elec_v_data.bus_com_stm == BUS_COM_STATE_WAITE_VOLTAGE) @@ -223,7 +230,7 @@ void UART5_IRQHandler(void) //接收中断标志可通过读取rxreg寄存器清除 uint8_t tmp_data = 0; - tmp_data = FL_UART_ReadRXBuff(COULOMBMETER_USED_UART_NUM); + tmp_data = FL_UART_ReadRXBuff(POWER_METER_USED_UART_NUM); if(elec_v_data.current_index < 3) { @@ -254,7 +261,7 @@ void UART5_IRQHandler(void) }else if(elec_v_data.bus_com_stm == BUS_COM_STATE_WAITE_CURRENT) { uint8_t tmp_data = 0; - tmp_data = FL_UART_ReadRXBuff(COULOMBMETER_USED_UART_NUM); + tmp_data = FL_UART_ReadRXBuff(POWER_METER_USED_UART_NUM); if(elec_v_data.current_index < 3) { @@ -282,9 +289,47 @@ void UART5_IRQHandler(void) } - } + + }else if(elec_v_data.bus_com_stm == BUS_COM_STATE_WAITE_POWER) + { + uint8_t tmp_data = 0; + tmp_data = FL_UART_ReadRXBuff(POWER_METER_USED_UART_NUM); + + if(elec_v_data.current_index < 3) + { + elec_v_data.power_raw |= (tmp_data<<(elec_v_data.current_index*8)); + } + + elec_v_data.power_array[elec_v_data.current_index++] = tmp_data; + + if(elec_v_data.current_index == 4) + { + + uint8_t checkSum = ~((elec_v_data.power_array[0] + elec_v_data.power_array[1] + elec_v_data.power_array[2] + BL0942_ADDR_R + Addr_WATT)&0xFF); + + if(elec_v_data.power_array[3] == checkSum) + { + // 校验正确对数据进行赋值 + elec_v_data.bus_com_stm = BUS_COM_STATE_IDLE; + + // 当接收到的数据为负值时将其转为正值 + if(elec_v_data.power_array[2] > 0x7F) + { + elec_v_data.power_raw = ~elec_v_data.power_raw + 1; + } + + elec_v_data.bus_active_power_watt = elec_v_data.power_raw * 100 /Power_K; + + elec_v_data.power_raw = 0; + + elec_v_data.current_index = 0; + } + } - FL_UART_ClearFlag_RXBuffFull(COULOMBMETER_USED_UART_NUM); + } + + + FL_UART_ClearFlag_RXBuffFull(POWER_METER_USED_UART_NUM); } } diff --git a/8F-3AW-PowerMeter/power_meter.h b/8F_5AW_PowerMeter/8f_5aw_powerMeter.h similarity index 74% rename from 8F-3AW-PowerMeter/power_meter.h rename to 8F_5AW_PowerMeter/8f_5aw_powerMeter.h index 6a05b86..e47155a 100644 --- a/8F-3AW-PowerMeter/power_meter.h +++ b/8F_5AW_PowerMeter/8f_5aw_powerMeter.h @@ -1,7 +1,7 @@ /* USER CODE BEGIN Header */ /** ****************************************************************************** - * @file : power_meter.h + * @file : 8f_5aw_powerMeter.h * @brief : 电量计驱动程序 * @version : 1.0 * @changelog : version 1.0 初始版本 2025.12.31 @@ -23,8 +23,8 @@ /* USER CODE END Header */ /* Define to prevent recursive inclusion -------------------------------------*/ -#ifndef __COULOMBMETER_H -#define __COULOMBMETER_H +#ifndef __8F_5AW_POWER_METER_H +#define __8F_5AW_POWER_METER_H #ifdef __cplusplus extern "C" { @@ -36,23 +36,22 @@ extern "C" { /************************** 硬件参数重映射 **************************/ -/* 对硬件使用进行配置 */ -#define COULOMBMETER_USED_UART_NUM UART5 -#define COULOMBMETER_UART_TX_GPIO_PORT GPIOC -#define COULOMBMETER_UART_TX_GPIO_PIN FL_GPIO_PIN_5 -#define COULOMBMETER_UART_RX_GPIO_PORT GPIOC -#define COULOMBMETER_UART_RX_GPIO_PIN FL_GPIO_PIN_4 +// 对硬件进行重定向 +#define POWER_METER_USED_UART_NUM UART5 +#define POWER_METER_UART_TX_GPIO_PORT GPIOC +#define POWER_METER_UART_TX_GPIO_PIN FL_GPIO_PIN_5 +#define POWER_METER_UART_RX_GPIO_PORT GPIOC +#define POWER_METER_UART_RX_GPIO_PIN FL_GPIO_PIN_4 - -#define COULOMBMETER_IRQn UART5_IRQn +#define POWER_METER_IRQn UART5_IRQn // CPU阻塞式发送 -#define CHECK_TRANS_DONE while(FL_UART_IsActiveFlag_TXShiftBuffEmpty(COULOMBMETER_USED_UART_NUM) != FL_SET){}; -#define COULOMBMETER_UART_TRANS_BYTE(x) FL_UART_WriteTXBuff(COULOMBMETER_USED_UART_NUM, x);CHECK_TRANS_DONE; +#define CHECK_TRANS_DONE while(FL_UART_IsActiveFlag_TXShiftBuffEmpty(POWER_METER_USED_UART_NUM) != FL_SET){}; +#define POWER_METER_UART_TRANS_BYTE(x) FL_UART_WriteTXBuff(POWER_METER_USED_UART_NUM, x);CHECK_TRANS_DONE; -#define COULOMBMETER_SET_FUNC_ENABLE (0) +#define POWER_METER_SET_FUNC_ENABLE (0) /************************** 芯片内部寄存器地址定义 **************************/ @@ -100,10 +99,10 @@ extern "C" { // 电流采用1毫欧电阻采样，电压采用390K*5+0.51K进行分压，实际测试发现电阻存在偏差，进行微调 // BL0942评估版，立创直接贴片合金电阻(台湾厚声MS121WF100NT4E )，实际测量比1毫欧偏小，约0.93毫欧 -#define Power_K 5798; //理论值*0.93 -#define Current_K 50243; //理论值*0.93 -#define Voltage_K 15883; // -#define Energy_K 4976; //理论值*0.93 +#define Power_K 6234; // 理论值 +#define Current_K 25121; // 理论值 +#define Voltage_K 15883; // 理论值 +#define Energy_K 4976; // 理论值 //采用美隆1毫欧贴片合金电阻，实际比1毫欧偏大，约1.023毫欧 /* @@ -122,6 +121,7 @@ typedef enum BUS_COM_STATE_IDLE, BUS_COM_STATE_WAITE_CURRENT, BUS_COM_STATE_WAITE_VOLTAGE, + BUS_COM_STATE_WAITE_POWER, BUS_CHECK_ERROR, BUS_COM_STATE_WAITE_CHECK @@ -131,16 +131,21 @@ typedef enum typedef enum { MOD_CURRENT_METER, - MOD_VOLTAGE_METER + MOD_VOLTAGE_METER, + MOD_POWER_METER }Bus_Mod; typedef struct { - uint16_t bus_rms_current_mA; // 总线供电电路有效值 单位为mA - uint16_t bus_rms_voltage_V; // 总线供电电压有效值 单位为V + uint16_t bus_rms_current_mA; // 总线供电电路有效值 单位为mA + uint16_t bus_rms_voltage_V; // 总线供电电压有效值 单位为V + uint16_t bus_active_power_watt; // 总线有功功率 单位为瓦特 + uint32_t power_raw; + uint8_t power_array[4]; + uint32_t voltage_raw; uint8_t voltage_array[4]; @@ -151,23 +156,24 @@ typedef struct uint8_t current_index; -}EleC_V_data; +}EleC_V_Data; -extern EleC_V_data elec_v_data; +extern EleC_V_Data elec_v_data; // 周期性刷新该结构体变量中的内容 通过读取变量成员获取当前电压、电流、有功功率 /************************** 外部API函数导出 **************************/ -void User_PowerMeter_Init(void); -void UART5_IRQHandler(void); +void User_PowerMeter_Init(void); // 上电后执行一次 用于初始化GPIO UART +void User_Power_refresh(void); // 每500ms以上时间执行一次该函数以刷新elec_v_data中内容。 -void User_Coulombmeter_Data_refresh(void); + +void UART5_IRQHandler(void); #ifdef __cplusplus } #endif -#endif /* __COULOMBMETER_H */ +#endif /* __8F_5AW_POWER_METER_H */ /************************ (C) COPYRIGHT Yuwell *****END OF FILE****/ diff --git a/MDK-ARM/LG048-8F-10W.uvguix.Admin b/MDK-ARM/LG048-8F-10W.uvguix.Admin index 102bfa1..c090555 100644 --- a/MDK-ARM/LG048-8F-10W.uvguix.Admin +++ b/MDK-ARM/LG048-8F-10W.uvguix.Admin @@ -6,7 +6,7 @@
### uVision Project, (C) Keil Software
- D:\yuwell_workspace\69-鏂扮數閲忚鑺墖\娴嬭瘯浠ｇ爜\8F-3AW-PowerMeter + D:\yuwell_workspace\69-鏂扮數閲忚鑺墖\娴嬭瘯浠ｇ爜\8F_5AW_PowerMeter @@ -20,12 +20,12 @@ 346 Code Coverage - 930 1296 + 930 160 204 Performance Analyzer - 1090 163 163 810 + 1090 @@ -110,8 +110,8 @@ 0 - 465 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000010000000100000037443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF4C443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C38462D3341572D506F7765724D657465725C706F7765725F6D657465722E63000000000D706F7765725F6D657465722E6300000000FFDC7800FFFFFFFF4C443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C38462D3341572D506F7765724D657465725C706F7765725F6D657465722E68000000000D706F7765725F6D657465722E6800000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000004401000066000000000A000077040000 + 601 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000100000028000000280000000200000002000000010000000100000037443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C5372635C6D61696E2E6300000000066D61696E2E6301000000C5D4F200FFFFFFFF52443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C38465F3541575F506F7765724D657465725C38665F3561775F706F7765724D657465722E63000000001338665F3561775F706F7765724D657465722E6301000000FFDC7800FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000004401000066000000A20500007704000001000000000000000000000052443A5C797577656C6C5F776F726B73706163655C36392DD0C2B5E7C1BFBCC6D0BEC6AC5CB2E2CAD4B4FAC2EB5C38465F3541575F506F7765724D657465725C38665F3561775F706F7765724D657465722E68000000001338665F3561775F706F7765724D657465722E6800000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000A205000066000000000A000077040000 @@ -1805,8 +1805,8 @@ 59392 File - 2946 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000016557365725F436F756C6F6D626D657465725F496E69749600000000000000130016557365725F436F756C6F6D626D657465725F496E69740C434F554C4F4D424D4554455218454E41424C455F505245434953455F4932435F44454C415931566F696365205265636F676E6974696F6E204D6F64756C6520496E697469616C697A6174696F6E2053656374696F6E2C20027538094F325F53454E534F5208CBA2D0C2CFD4CABE196F78675F73746174655F696E666F726D6174696F6E5F6D7578043138303001380F4556454E545F3436345F434C45415207656C617073656404436F6D38125F5F37465F354B5F444953505F4150495F48166A685F73637265656E5F726566726573685F7461736B0E37665F356B5F646973705F617069155F5F37465F35465F444953505F4452495645525F48125F5F37465F35465F444953505F4150495F481137665F35665F646973705F64726976657200000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2765 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE8030000000000000000000000000000000000000000000000010000000100000096000000020020500000000012765461736B537769746368436F6E746578749600000000000000090014706F7765726D657465725F77726974655F72656713706F7765726D657465725F726561645F72656716636F756C6F6D626D657465725F77726974655F72656715636F756C6F6D626D657465725F726561645F7265671E557365725F436F756C6F6D626D657465725F446174615F726566726573680A504F5745524D4554455207434F554C4F4D4212765461736B537769746368436F6E746578741278506F727450656E64535648616E646C6572000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 984 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000C436F756C6F6D626D65746572960000000000000001000C436F756C6F6D626D65746572000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000002001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000C436F756C6F6D626D65746572960000000000000001000C436F756C6F6D626D65746572000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1838,7 +1838,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3599,34 +3599,38 @@ - 1 + 3 0 - 100 + 50 1 ..\Src\main.c - 0 + 6 48 - 64 + 114 1 0 - ..\8F-3AW-PowerMeter\power_meter.c - 5 - 203 - 219 + ..\8F_5AW_PowerMeter\8f_5aw_powerMeter.c + 12 + 171 + 289 1 0 + + + 50 + 0 - ..\8F-3AW-PowerMeter\power_meter.h - 36 - 12 - 55 + ..\8F_5AW_PowerMeter\8f_5aw_powerMeter.h + 22 + 105 + 146 1 0 diff --git a/MDK-ARM/LG048-8F-10W.uvoptx b/MDK-ARM/LG048-8F-10W.uvoptx index 886df53..67a2420 100644 --- a/MDK-ARM/LG048-8F-10W.uvoptx +++ b/MDK-ARM/LG048-8F-10W.uvoptx @@ -117,10 +117,6 @@ Segger\JL2CM3.dll - - 0 - DLGUARM - 0 JL2CM3 @@ -308,8 +304,8 @@ 0 0 0 - ..\8F-3AW-PowerMeter\power_meter.c - power_meter.c + ..\8F_5AW_PowerMeter\8f_5aw_powerMeter.c + 8f_5aw_powerMeter.c 0 0 diff --git a/MDK-ARM/LG048-8F-10W.uvprojx b/MDK-ARM/LG048-8F-10W.uvprojx index 70fb4bf..dc0aff1 100644 --- a/MDK-ARM/LG048-8F-10W.uvprojx +++ b/MDK-ARM/LG048-8F-10W.uvprojx @@ -340,7 +340,7 @@ FM33LG0XX,USE_FULL_ASSERT - ..\Drivers\CMSIS;..\Drivers\FM33LG0xx_FL_Driver\Inc;..\Inc;..\MF-config\Inc;..\8F-3AW-PowerMeter + ..\Drivers\CMSIS;..\Drivers\FM33LG0xx_FL_Driver\Inc;..\Inc;..\MF-config\Inc;..\8F_5AW_PowerMeter @@ -420,9 +420,9 @@ ..\Src\fm33lg0xx_fl_common.c - power_meter.c + 8f_5aw_powerMeter.c 1 - ..\8F-3AW-PowerMeter\power_meter.c + ..\8F_5AW_PowerMeter\8f_5aw_powerMeter.c diff --git a/Src/main.c b/Src/main.c index d9d1f1c..fdaf0d3 100644 --- a/Src/main.c +++ b/Src/main.c @@ -51,7 +51,7 @@ #include "main.h" #include "fm33_assert.h" -#include "power_meter.h" +#include "8f_5aw_powerMeter.h" #define FREQ_CHECK_ENABLE (1) // 閫夋嫨鏄惁浣胯兘棰戠巼妫鏌 浠呭湪debug闃舵浣跨敤 @@ -110,7 +110,7 @@ int main(void) { FL_DelayMs(1000); - User_Coulombmeter_Data_refresh(); + User_Power_refresh(); // LED鐏棯鐑 FL_GPIO_ToggleOutputPin(GPIOD, FL_GPIO_PIN_5);