From 0cba8cda8a31951b65c4bd4458692bbc6c0efcff Mon Sep 17 00:00:00 2001 From: Razvalyaev Date: Mon, 23 Dec 2024 14:16:33 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=B5=D1=80=D0=B5=D0=B8=D0=BC=D0=B5?= =?UTF-8?q?=D0=BD=D0=BE=D0=B2=D0=B0=D0=BD=D0=B0=20=D0=BF=D0=B5=D1=80=D0=B5?= =?UTF-8?q?=D0=BC=D0=B5=D0=BD=D0=BD=D0=B0=D1=8F=20=D0=B4=D0=BB=D1=8F=20?= =?UTF-8?q?=D1=85=D1=80=D0=B0=D0=BD=D0=B5=D0=BD=D0=B8=D1=8F=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D1=82=D0=BD=D0=BE=D0=B3=D0=BE=20=D1=81=D0=BA=D0=B0?= =?UTF-8?q?=D1=87=D0=BA=D0=B0=20=D0=BD=D0=B0=D0=BF=D1=80=D1=8F=D0=B6=D0=B5?= =?UTF-8?q?=D0=BD=D0=B8=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit PeakVoltage >ReversePeakVoltage --- diode_tester/Core/Interfaces/modbus_data.h | 2 +- diode_tester/Core/Tester_main/tester_func.c | 4 ++-- diode_tester/Core/Tester_main/tester_func.h | 2 +- diode_tester/Core/Tester_main/tester_main.c | 6 +++--- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/diode_tester/Core/Interfaces/modbus_data.h b/diode_tester/Core/Interfaces/modbus_data.h index a882f51..f31cbd2 100644 --- a/diode_tester/Core/Interfaces/modbus_data.h +++ b/diode_tester/Core/Interfaces/modbus_data.h @@ -38,7 +38,7 @@ typedef struct //MB_DataInRegsTypeDef { uint16_t ForwardVoltage; - uint16_t PeakVoltage; + uint16_t ReversePeakVoltage; }MB_DataInRegsTypeDef; diff --git a/diode_tester/Core/Tester_main/tester_func.c b/diode_tester/Core/Tester_main/tester_func.c index a80dcc4..d834757 100644 --- a/diode_tester/Core/Tester_main/tester_func.c +++ b/diode_tester/Core/Tester_main/tester_func.c @@ -85,7 +85,7 @@ void TESTER_TestDiode_Reverse(TESTER_TestHandleTypeDef *htest) TESTER_LED_WaitForAction(&htest->leds->LED1); - htest->DiodePeakVolt = htest->adc->chAdc.U_Current; + htest->DiodeReversePeakVolt = htest->adc->chAdc.U_Current; } @@ -121,7 +121,7 @@ void TESTER_TestDiode_SwitchConnection(TESTER_TestHandleTypeDef *htest) TESTER_LED_WaitForAction(&htest->leds->LED1); - htest->DiodePeakVolt = htest->adc->chAdc.U_Current; + htest->DiodeReversePeakVolt = htest->adc->chAdc.U_Current; } /** diff --git a/diode_tester/Core/Tester_main/tester_func.h b/diode_tester/Core/Tester_main/tester_func.h index feddbb1..c9403de 100644 --- a/diode_tester/Core/Tester_main/tester_func.h +++ b/diode_tester/Core/Tester_main/tester_func.h @@ -67,7 +67,7 @@ typedef struct uint32_t continuous_buff_size; float DiodeForwardVolt; - float DiodePeakVolt; + float DiodeReversePeakVolt; TESTER_LEDsTypeDef *leds; }TESTER_TestHandleTypeDef; diff --git a/diode_tester/Core/Tester_main/tester_main.c b/diode_tester/Core/Tester_main/tester_main.c index 06de807..fbe639e 100644 --- a/diode_tester/Core/Tester_main/tester_main.c +++ b/diode_tester/Core/Tester_main/tester_main.c @@ -14,7 +14,7 @@ void TESTER_Init(TESTER_ProjectTypeDef *tester) tester->delay = 250; tester->delay_en = 0; - + tester->htest->adc->chAdc.s tester->func.disable_reset_call = 0; tester->htest = &hTestDiode; TESTER_HandleInit(tester->htest, &tester->leds); @@ -56,7 +56,7 @@ void TESTER_main_while(TESTER_ProjectTypeDef *tester) TESTER_TestDiode_Reverse(tester->htest); /* Запись данных в modbus */ - tester->mbdata->InRegs.PeakVoltage = tester->htest->DiodePeakVolt*1000; + tester->mbdata->InRegs.ReversePeakVoltage = tester->htest->DiodeReversePeakVolt*1000; if(tester->func.disable_reset_call == 0) tester->func.test_diode_reverse = 0; @@ -85,7 +85,7 @@ void TESTER_main_while(TESTER_ProjectTypeDef *tester) TESTER_TestDiode_SwitchConnection(tester->htest); /* Запись данных в modbus */ - tester->mbdata->InRegs.PeakVoltage = tester->htest->DiodePeakVolt*1000; + tester->mbdata->InRegs.ReversePeakVoltage = tester->htest->DiodeReversePeakVolt*1000; tester->mbdata->InRegs.ForwardVoltage = tester->htest->DiodeForwardVolt*1000; if(tester->func.disable_reset_call == 0)