diff --git a/APP/application/Src/start.c b/APP/application/Src/start.c index cb0ac3d..fc3e8ba 100644 --- a/APP/application/Src/start.c +++ b/APP/application/Src/start.c @@ -64,12 +64,10 @@ void start(void) startInfo(); // HAL_Delay(5000); - // while (1) { - // cfgTest(); - // HAL_Delay(1000); - // } - - + while (1) { + cfgTest(); + HAL_Delay(1000); + } TimeSliceOffset_Start(); } diff --git a/APP/businessLogic/Inc/inFlash.h b/APP/businessLogic/Inc/inFlash.h index 23c1645..22403ff 100644 --- a/APP/businessLogic/Inc/inFlash.h +++ b/APP/businessLogic/Inc/inFlash.h @@ -116,8 +116,15 @@ typedef struct _config_info{ uint16_t crc; /* 校验 */ }config_info; - #define CONFIG_INFO_SIZE (sizeof(config_info)) +// typedef struct _other_info { +// float loopImpedance; +// float totalElectricityConsumption; +// float totalChargCapacity; +// float lastTime; +// }other_info; +// #define OTHER_INFO_SIZE (sizeof(other_info)) + #pragma pack(pop) #define CONFIG_SAVE_addr (0) @@ -128,6 +135,12 @@ typedef struct _config_info{ #define totalChargCapacity_SAVE_addr (CONFIG_INFO_SIZE + CONFIG_INFO_SIZE + 30) #define time_SAVE_addr (CONFIG_INFO_SIZE + CONFIG_INFO_SIZE + 40) +// #define LoopImpedance_SAVE_addr (4096) +// #define totalElectricityConsumption_SAVE_addr (LoopImpedance_SAVE_addr + 4) +// #define totalChargCapacity_SAVE_addr (LoopImpedance_SAVE_addr + 8) +// #define time_SAVE_addr (LoopImpedance_SAVE_addr + 12) + + // void save_config_info(config_info *save_config_info); void read_config_info(config_info *output_config_info); void saveConfigInfo(config_info *config_info); @@ -143,6 +156,8 @@ void savetotalChargCapacity(float *totalChargCapacity); void readtotalChargCapacity(float *totalChargCapacity); void saveTime(timeInfo *time); void readTime(timeInfo *time); +// void saveOtherInfo(other_info *otherInfo); +// void readOtherInfo(other_info *otherInfo); diff --git a/APP/businessLogic/Src/abnormalManage.c b/APP/businessLogic/Src/abnormalManage.c index f1f0efe..d0c589d 100644 --- a/APP/businessLogic/Src/abnormalManage.c +++ b/APP/businessLogic/Src/abnormalManage.c @@ -268,11 +268,11 @@ BOOL getExcessiveLoadFlag(void) // temp_PV_VOLT_OUT = get_PV_VOLT_OUT(); // temp_OUT_VOLT_IN = get_OUT_VOLT_IN(); if (state == TRUE) { - if (get_OUT_VOLT_IN() < (get_PV_VOLT_OUT() - 0.1f)) { + // if (get_OUT_VOLT_IN() < (get_PV_VOLT_OUT() - 0.1f)) { // if (temp_OUT_VOLT_IN < (temp_PV_VOLT_OUT - 0.5f)) { POW_FF_PCON_Open(); POW_OUT_PCON_Open(); - } + // } } else { POW_FF_PCON_Close(); POW_OUT_PCON_Close(); diff --git a/APP/businessLogic/Src/inFlash.c b/APP/businessLogic/Src/inFlash.c index 7d2d47c..a50b286 100644 --- a/APP/businessLogic/Src/inFlash.c +++ b/APP/businessLogic/Src/inFlash.c @@ -55,19 +55,19 @@ void saveConfigInfo(config_info *configInfo) void cfgTest(void) { - uint32_t tempTime = HAL_GetTick(); - config_info temp_configInfo; - read_config_info(&temp_configInfo); - log_info("1 read time : %d \n", HAL_GetTick() - tempTime); - tempTime = HAL_GetTick(); - saveConfigInfo(&temp_configInfo); - log_info("1 write time : %d \n", HAL_GetTick() - tempTime); - tempTime = HAL_GetTick(); - for (int i = 0; i < 10; i++) { - read_config_info(&temp_configInfo); - saveConfigInfo(&temp_configInfo); - } - log_info("10 time : %d \n", HAL_GetTick() - tempTime); + // uint32_t tempTime = HAL_GetTick(); + // config_info temp_configInfo; + // read_config_info(&temp_configInfo); + // log_info("1 read time : %d \n", HAL_GetTick() - tempTime); + // tempTime = HAL_GetTick(); + // saveConfigInfo(&temp_configInfo); + // log_info("1 write time : %d \n", HAL_GetTick() - tempTime); + // tempTime = HAL_GetTick(); + // for (int i = 0; i < 10; i++) { + // read_config_info(&temp_configInfo); + // saveConfigInfo(&temp_configInfo); + // } + // log_info("10 time : %d \n", HAL_GetTick() - tempTime); // uint32_t tempTime = HAL_GetTick(); // float tempF; @@ -97,20 +97,20 @@ void cfgTest(void) // } // log_info("10 time : %d \n", HAL_GetTick() - tempTime); - // uint32_t tempTime = HAL_GetTick(); - // uint8_t tempBuf[30]; - // write_Flash((uint8_t *)"hello 12345\n", 2048, sizeof("hello 12345\n")); - // log_info("1 write time : %d \n", HAL_GetTick() - tempTime); - // tempTime = HAL_GetTick(); - // read_Flash(tempBuf, 2048, sizeof("hello world\n")); - // log_info("1 read time : %d \n", HAL_GetTick() - tempTime); - // log_info("%s\n", tempBuf); - // tempTime = HAL_GetTick(); - // for (int i = 0; i < 10; i++) { - // read_Flash(tempBuf, 2048, sizeof("hello world\n")); - // write_Flash((uint8_t *)"hello world\n", 2048, sizeof("hello world\n")); - // } - // log_info("10 time : %d \n", HAL_GetTick() - tempTime); + uint32_t tempTime = HAL_GetTick(); + uint8_t tempBuf[30]; + write_Flash((uint8_t *)"hello 12345\n", 2048, sizeof("hello 12345\n")); + log_info("1 write time : %d \n", HAL_GetTick() - tempTime); + tempTime = HAL_GetTick(); + read_Flash(tempBuf, 2048, sizeof("hello 12345\n")); + log_info("1 read time : %d \n", HAL_GetTick() - tempTime); + log_info("%s\n", tempBuf); + tempTime = HAL_GetTick(); + for (int i = 0; i < 10; i++) { + read_Flash(tempBuf, 2048, sizeof("hello world\n")); + write_Flash((uint8_t *)"hello world\n", 2048, sizeof("hello world\n")); + } + log_info("10 time : %d \n", HAL_GetTick() - tempTime); } @@ -365,5 +365,13 @@ void readTime(timeInfo *time) read_Flash((uint8_t *)time, time_SAVE_addr, sizeof(timeInfo)); } +// void saveOtherInfo(other_info *otherInfo) +// { +// write_Flash((uint8_t *)otherInfo, LoopImpedance_SAVE_addr, sizeof(OTHER_INFO_SIZE)); +// } +// void readOtherInfo(other_info *otherInfo) +// { +// read_Flash((uint8_t *)otherInfo, LoopImpedance_SAVE_addr, sizeof(OTHER_INFO_SIZE)); +// } diff --git a/APP/functionalModule/Src/capture.c b/APP/functionalModule/Src/capture.c index 6881307..3b8983b 100644 --- a/APP/functionalModule/Src/capture.c +++ b/APP/functionalModule/Src/capture.c @@ -469,6 +469,9 @@ float get_OUT_VOLT_IN(void) void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hdma) { if (hdma->Instance == ADC1) { + // HAL_GPIO_TogglePin(POW_FF_CON_GPIO_Port, POW_FF_CON_Pin); + HAL_GPIO_WritePin(POW_FF_CON_GPIO_Port, POW_FF_CON_Pin,GPIO_PIN_SET); + setSoftShortCircuit(adcBuff[DSG_CURR_NUM]); WORK_VOLT_capture.totalInData -= WORK_VOLT_capture.inData16[pointer]; @@ -500,6 +503,9 @@ void HAL_ADC_ConvCpltCallback(ADC_HandleTypeDef *hdma) DSG_CURR_capture.IODataF[3] = (float32_t)DSG_CURR_capture.totalInData / indata16_size; PV_VOLT_IN_capture.IODataF[3] = (float32_t)PV_VOLT_IN_capture.totalInData / indata16_size; CHG_CURR_capture.IODataF[3] = (float32_t)CHG_CURR_capture.totalInData / indata16_size; + + // HAL_GPIO_TogglePin(POW_FF_CON_GPIO_Port, POW_FF_CON_Pin); + HAL_GPIO_WritePin(POW_FF_CON_GPIO_Port, POW_FF_CON_Pin,GPIO_PIN_RESET); } } diff --git a/APP/hardwareDriver/Src/w25q256.c b/APP/hardwareDriver/Src/w25q256.c index d2298be..eadf2e2 100644 --- a/APP/hardwareDriver/Src/w25q256.c +++ b/APP/hardwareDriver/Src/w25q256.c @@ -54,7 +54,6 @@ static void Flash_WriteOneByte(uint8_t DataBuffer) } FLASH_CLK_LOW; FLASH_MOSI_HIGH; //一字节数据传送完毕,MOSI数据线置高表示空闲状态 - } ///@brief 写指令