pengsx
/
chargeController
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

采样电阻修改，汇源网关适配

This commit is contained in:
起床就犯困 2025-09-25 15:19:00 +08:00
parent aa9cd85543
commit b474462ac6
5 changed files with 91 additions and 88 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
APP/businessLogic/Src/bl_chargControl.c
View File

@ -394,7 +394,7 @@ void mppt_readJust(void)
/* 延时一段时间才判断 */
static uint16_t flag = 0;
flag++;
if (flag < 200) {
if (flag < 250) {
// float pv1Volt = getSolarInCircuitVoltage();
// float error = pv1Volt - SolarInCircuitV;
// float stepPwm = kp * error + ki * pv1Volt;
@ -432,7 +432,7 @@ void mppt_readJust(void)
static uint8_t currMinFlag1 = 0;
// if (getChargCurrent() < 0.8f) {
if (totalChargeCurr < 100) {
if (totalChargeCurr < 200) {
// hysteresisValue1 = getChargCurrent() * 1.7f;
// hysteresisValue2 = getChargCurrent() * 12;
currMinFlag++;
@ -446,20 +446,20 @@ void mppt_readJust(void)
}
// else if (getChargCurrent() < 3 && currMinFlag1) {
else if (totalChargeCurr < 150 && currMinFlag1) {
else if (totalChargeCurr < 250 && currMinFlag1) {
// currMinFlag1 = 0;
currMinFlag = 0;
return;
}
// else if (getChargCurrent() < 5) {
else if (totalChargeCurr < 250) {
else if (totalChargeCurr < 300) {
currMinFlag1 = 0;
currMinFlag = 0;
// hysteresisValue1 = getChargCurrent() * 1.1f;
// hysteresisValue2 = getChargCurrent() * 10;
hysteresisValue1 = totalChargeCurr / 35.0f;
hysteresisValue2 = totalChargeCurr / 3.5f;
hysteresisValue1 = totalChargeCurr / 25.0f;
hysteresisValue2 = totalChargeCurr / 2.5f;
}
// else if (getChargCurrent() < 13) {
@ -468,8 +468,8 @@ void mppt_readJust(void)
currMinFlag = 0;
// hysteresisValue1 = getChargCurrent() * 1.1f;
// hysteresisValue2 = getChargCurrent() * 10;
hysteresisValue1 = totalChargeCurr / 45.0f;
hysteresisValue2 = totalChargeCurr / 4.5f;
hysteresisValue1 = totalChargeCurr / 35.0f;
hysteresisValue2 = totalChargeCurr / 3.5f;
}
// else if (getChargCurrent() < 20) {

2
APP/businessLogic/Src/bl_usart.c
View File

@ -21,7 +21,7 @@
#define HY_communicationIDStartAddr (HY_hardWordIDStartAddr + HY_hardWordIDSize)
#define HY_communicationIDSize 4
static uint8_t HY_hardWordID[HY_hardWordIDSize] = {0x48, 0x59, 0x30, 0x30, 0x30, 0x31};
static uint8_t HY_communicationID[HY_communicationIDSize] = {0x00, 0x00, 0x00, 0x01};
static uint8_t HY_communicationID[HY_communicationIDSize] = {0x00, 0x00, 0x00, 0x02};
static uint8_t HY_startFlag = 0x68;
static uint8_t HY_endFlag = 0x16;

9
APP/functionalModule/Src/capture.c
View File

@ -188,11 +188,14 @@ void proportionalInt(int mode)
if (mode) {
/* 光伏充电输出电流比例，放大倍数*电阻 */
// P_CHG_CURR = (1.0 / (50 * (1 / (1 / 0.01 + 1 / 0.002)))) * Proportion;
P_CHG_CURR = (1.0 / (50 * (1 / (1 / 0.001 + 1 / 0.002)))) * Proportion;
// P_CHG_CURR = (1.0 / (50 * (1 / (1 / 0.001 + 1 / 0.002)))) * Proportion;
P_CHG_CURR = (1.0 / (50 * (1 / (1 / 0.002 + 1 / 0.002)))) * Proportion;
/* 充电控制盒输出电压比例，分压系数 */
P_PV_VOLT_OUT = ((56.0 + 10.0) / 10.0) * Proportion;
// P_PV_VOLT_OUT = ((56.0 + 10.0) / 10.0) * Proportion;
P_PV_VOLT_OUT = ((47.0 + 4.7) / 4.7) * Proportion;
/* 放电电流采集电流倍数 */
P_DSG_CURR = (1.0 / (50 * (1 / (1 / 0.002 + 1 / 0.001)))) * Proportion;
// P_DSG_CURR = (1.0 / (50 * (1 / (1 / 0.002 + 1 / 0.001)))) * Proportion;
P_DSG_CURR = (1.0 / (50 * (1 / (1 / 0.002 + 1 / 0.002)))) * Proportion;
/* 光伏板输出电压比例 */
P_PV1_VOLT_IN = ((47.0 + 4.7) / 4.7) * Proportion;
/* 系统电源电压比例 */

150
EWARM/chargeController.ewd
View File

@ -36,7 +36,7 @@
</option>
<option>
<name>MacFile</name>
<state />
<state></state>
</option>
<option>
<name>MemOverride</name>
@ -60,7 +60,7 @@
</option>
<option>
<name>CExtraOptions</name>
<state />
<state></state>
</option>
<option>
<name>CFpuProcessor</name>
@ -68,7 +68,7 @@
</option>
<option>
<name>OCDDFArgumentProducer</name>
<state />
<state></state>
</option>
<option>
<name>OCDownloadSuppressDownload</name>
@ -104,7 +104,7 @@
</option>
<option>
<name>MacFile2</name>
<state />
<state></state>
</option>
<option>
<name>CDevice</name>
@ -120,7 +120,7 @@
</option>
<option>
<name>OCImagesPath1</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck2</name>
@ -128,7 +128,7 @@
</option>
<option>
<name>OCImagesPath2</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck3</name>
@ -136,7 +136,7 @@
</option>
<option>
<name>OCImagesPath3</name>
<state />
<state></state>
</option>
<option>
<name>OverrideDefFlashBoard</name>
@ -148,11 +148,11 @@
</option>
<option>
<name>OCImagesOffset2</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesOffset3</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesUse1</name>
@ -184,15 +184,15 @@
</option>
<option>
<name>OCMulticoreWorkspace</name>
<state />
<state></state>
</option>
<option>
<name>OCMulticoreSlaveProject</name>
<state />
<state></state>
</option>
<option>
<name>OCMulticoreSlaveConfiguration</name>
<state />
<state></state>
</option>
<option>
<name>OCDownloadExtraImage</name>
@ -216,7 +216,7 @@
</option>
<option>
<name>OCMulticoreSessionFile</name>
<state />
<state></state>
</option>
<option>
<name>OCTpiuBaseOption</name>
@ -228,7 +228,7 @@
</option>
<option>
<name>OCOverrideSlavePath</name>
<state />
<state></state>
</option>
<option>
<name>C_32_64Device</name>
@ -244,11 +244,11 @@
</option>
<option>
<name>AuthSdmManifest</name>
<state />
<state></state>
</option>
<option>
<name>AuthSdmExplicitLib</name>
<state />
<state></state>
</option>
<option>
<name>AuthEnforce</name>
@ -277,7 +277,7 @@
</option>
<option>
<name>OCSimPspConfigFile</name>
<state />
<state></state>
</option>
</data>
</settings>
@ -294,7 +294,7 @@
</option>
<option>
<name>Fast Model</name>
<state />
<state></state>
</option>
<option>
<name>CCADILogFileCheck</name>
@ -461,7 +461,7 @@
</option>
<option>
<name>OCProbeConfig</name>
<state />
<state></state>
</option>
<option>
<name>CMSISDAPProbeConfigRadio</name>
@ -469,11 +469,11 @@
</option>
<option>
<name>CMSISDAPSelectedCPUBehaviour</name>
<state />
<state></state>
</option>
<option>
<name>ICpuName</name>
<state />
<state></state>
</option>
<option>
<name>OCJetEmuParams</name>
@ -481,7 +481,7 @@
</option>
<option>
<name>CCCMSISDAPUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCCMSISDAPUsbSerialNoSelect</name>
@ -502,7 +502,7 @@
</option>
<option>
<name>CE2UsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CE2IdCodeEditB</name>
@ -642,7 +642,7 @@
</option>
<option>
<name>IjetCpuClockEdit</name>
<state />
<state></state>
</option>
<option>
<name>IjetSwoPrescalerList</name>
@ -735,7 +735,7 @@
</option>
<option>
<name>OCProbeConfig</name>
<state />
<state></state>
</option>
<option>
<name>IjetProbeConfigRadio</name>
@ -755,7 +755,7 @@
</option>
<option>
<name>ICpuName</name>
<state />
<state></state>
</option>
<option>
<name>OCJetEmuParams</name>
@ -781,7 +781,7 @@
</option>
<option>
<name>CCIjetUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCIjetUsbSerialNoSelect</name>
@ -952,7 +952,7 @@
<option>
<name>CCJLinkResetList</name>
<version>6</version>
<state>5</state>
<state>7</state>
</option>
<option>
<name>CCJLinkInterfaceCmdLine</name>
@ -1004,7 +1004,7 @@
</option>
<option>
<name>CCJLinkUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCTcpIpAlt</name>
@ -1013,11 +1013,11 @@
</option>
<option>
<name>CCJLinkTcpIpSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCCpuClockEdit</name>
<state />
<state>170.0</state>
</option>
<option>
<name>CCSwoClockAuto</name>
@ -1074,7 +1074,7 @@
</option>
<option>
<name>CCLmiftdiUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCLmiftdiUsbSerialNoSelect</name>
@ -1227,7 +1227,7 @@
</option>
<option>
<name>CCSTLinkUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCSTLinkUsbSerialNoSelect</name>
@ -1240,7 +1240,7 @@
</option>
<option>
<name>CCSTLinkDAPNumber</name>
<state />
<state></state>
</option>
<option>
<name>CCSTLinkDebugAccessPortRadio</name>
@ -1378,11 +1378,11 @@
</option>
<option>
<name>TIPackage</name>
<state />
<state></state>
</option>
<option>
<name>BoardFile</name>
<state />
<state></state>
</option>
<option>
<name>DoLogfile</name>
@ -1474,7 +1474,7 @@
</option>
<option>
<name>CCXds100CpuClockEdit</name>
<state />
<state></state>
</option>
<option>
<name>CCXds100SwoClockAuto</name>
@ -1495,7 +1495,7 @@
</option>
<option>
<name>CCXds100UsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCXds100UsbSerialNoSelect</name>
@ -1647,7 +1647,7 @@
</option>
<option>
<name>MacFile</name>
<state />
<state></state>
</option>
<option>
<name>MemOverride</name>
@ -1671,7 +1671,7 @@
</option>
<option>
<name>CExtraOptions</name>
<state />
<state></state>
</option>
<option>
<name>CFpuProcessor</name>
@ -1679,7 +1679,7 @@
</option>
<option>
<name>OCDDFArgumentProducer</name>
<state />
<state></state>
</option>
<option>
<name>OCDownloadSuppressDownload</name>
@ -1715,7 +1715,7 @@
</option>
<option>
<name>MacFile2</name>
<state />
<state></state>
</option>
<option>
<name>CDevice</name>
@ -1731,7 +1731,7 @@
</option>
<option>
<name>OCImagesPath1</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck2</name>
@ -1739,7 +1739,7 @@
</option>
<option>
<name>OCImagesPath2</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesSuppressCheck3</name>
@ -1747,7 +1747,7 @@
</option>
<option>
<name>OCImagesPath3</name>
<state />
<state></state>
</option>
<option>
<name>OverrideDefFlashBoard</name>
@ -1759,11 +1759,11 @@
</option>
<option>
<name>OCImagesOffset2</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesOffset3</name>
<state />
<state></state>
</option>
<option>
<name>OCImagesUse1</name>
@ -1795,15 +1795,15 @@
</option>
<option>
<name>OCMulticoreWorkspace</name>
<state />
<state></state>
</option>
<option>
<name>OCMulticoreSlaveProject</name>
<state />
<state></state>
</option>
<option>
<name>OCMulticoreSlaveConfiguration</name>
<state />
<state></state>
</option>
<option>
<name>OCDownloadExtraImage</name>
@ -1827,7 +1827,7 @@
</option>
<option>
<name>OCMulticoreSessionFile</name>
<state />
<state></state>
</option>
<option>
<name>OCTpiuBaseOption</name>
@ -1839,7 +1839,7 @@
</option>
<option>
<name>OCOverrideSlavePath</name>
<state />
<state></state>
</option>
<option>
<name>C_32_64Device</name>
@ -1855,11 +1855,11 @@
</option>
<option>
<name>AuthSdmManifest</name>
<state />
<state></state>
</option>
<option>
<name>AuthSdmExplicitLib</name>
<state />
<state></state>
</option>
<option>
<name>AuthEnforce</name>
@ -1888,7 +1888,7 @@
</option>
<option>
<name>OCSimPspConfigFile</name>
<state />
<state></state>
</option>
</data>
</settings>
@ -1905,7 +1905,7 @@
</option>
<option>
<name>Fast Model</name>
<state />
<state></state>
</option>
<option>
<name>CCADILogFileCheck</name>
@ -2072,7 +2072,7 @@
</option>
<option>
<name>OCProbeConfig</name>
<state />
<state></state>
</option>
<option>
<name>CMSISDAPProbeConfigRadio</name>
@ -2080,11 +2080,11 @@
</option>
<option>
<name>CMSISDAPSelectedCPUBehaviour</name>
<state />
<state></state>
</option>
<option>
<name>ICpuName</name>
<state />
<state></state>
</option>
<option>
<name>OCJetEmuParams</name>
@ -2092,7 +2092,7 @@
</option>
<option>
<name>CCCMSISDAPUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCCMSISDAPUsbSerialNoSelect</name>
@ -2113,7 +2113,7 @@
</option>
<option>
<name>CE2UsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CE2IdCodeEditB</name>
@ -2253,7 +2253,7 @@
</option>
<option>
<name>IjetCpuClockEdit</name>
<state />
<state></state>
</option>
<option>
<name>IjetSwoPrescalerList</name>
@ -2346,7 +2346,7 @@
</option>
<option>
<name>OCProbeConfig</name>
<state />
<state></state>
</option>
<option>
<name>IjetProbeConfigRadio</name>
@ -2366,7 +2366,7 @@
</option>
<option>
<name>ICpuName</name>
<state />
<state></state>
</option>
<option>
<name>OCJetEmuParams</name>
@ -2392,7 +2392,7 @@
</option>
<option>
<name>CCIjetUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCIjetUsbSerialNoSelect</name>
@ -2615,7 +2615,7 @@
</option>
<option>
<name>CCJLinkUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCTcpIpAlt</name>
@ -2624,11 +2624,11 @@
</option>
<option>
<name>CCJLinkTcpIpSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCCpuClockEdit</name>
<state />
<state></state>
</option>
<option>
<name>CCSwoClockAuto</name>
@ -2685,7 +2685,7 @@
</option>
<option>
<name>CCLmiftdiUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCLmiftdiUsbSerialNoSelect</name>
@ -2838,7 +2838,7 @@
</option>
<option>
<name>CCSTLinkUsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCSTLinkUsbSerialNoSelect</name>
@ -2851,7 +2851,7 @@
</option>
<option>
<name>CCSTLinkDAPNumber</name>
<state />
<state></state>
</option>
<option>
<name>CCSTLinkDebugAccessPortRadio</name>
@ -2989,11 +2989,11 @@
</option>
<option>
<name>TIPackage</name>
<state />
<state></state>
</option>
<option>
<name>BoardFile</name>
<state />
<state></state>
</option>
<option>
<name>DoLogfile</name>
@ -3085,7 +3085,7 @@
</option>
<option>
<name>CCXds100CpuClockEdit</name>
<state />
<state></state>
</option>
<option>
<name>CCXds100SwoClockAuto</name>
@ -3106,7 +3106,7 @@
</option>
<option>
<name>CCXds100UsbSerialNo</name>
<state />
<state></state>
</option>
<option>
<name>CCXds100UsbSerialNoSelect</name>