Templates/STM32_Modbus
8
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

убраны пользовательские данные в modbus_data.h - каждый их настраивает сам

Browse Source
This commit is contained in:
Razvalyaev
2025-05-28 13:45:45 +03:00
parent 1e592a510f
commit 25d833ca8e
2 changed files with 17 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
Modbus/modbus_data.h
View File

@@ -37,8 +37,7 @@
*/ */
typedef struct //MB_DataInRegsTypeDef typedef struct //MB_DataInRegsTypeDef
{ {
uint16_t ForwardVoltage;
uint16_t ReversePeakVoltage;
}MB_DataInRegsTypeDef; }MB_DataInRegsTypeDef;
@@ -47,27 +46,17 @@ typedef struct //MB_DataInRegsTypeDef
*/ */
typedef struct //MB_DataInRegsTypeDef typedef struct //MB_DataInRegsTypeDef
{ {
uint16_t TimeForForward;
uint16_t TimeForReverse;
uint16_t TimeBeforeTest;
uint16_t TimeDeadtime;
uint16_t TimeBeforePeak;
uint16_t Adc_PulseWidth;
uint16_t Adc_PulseSign;
uint16_t Adc_CalibrValue;
uint16_t Adc_ZeroValue;
uint16_t Adc_U_Calibr;
}MB_DataHoldRegsTypeDef; }MB_DataHoldRegsTypeDef;
// DEFINES FOR INPUT REGISTERS ARRAYS // DEFINES FOR INPUT REGISTERS ARRAYS
#define R_INPUT_ADDR 0 #define R_INPUT_ADDR 0
#define R_INPUT_QNT 2 #define R_INPUT_QNT 0
// DEFINES FOR HOLDING REGISTERS ARRAYS // DEFINES FOR HOLDING REGISTERS ARRAYS
#define R_HOLDING_ADDR 0 #define R_HOLDING_ADDR 0
#define R_HOLDING_QNT 10 #define R_HOLDING_QNT 0
// DEFINES FOR REGISTERS LOCAL ADDRESSES // DEFINES FOR REGISTERS LOCAL ADDRESSES
@@ -97,35 +86,16 @@ typedef struct //MB_DataInRegsTypeDef
/** /**
* @brief Коилы * @brief Коилы
* @details Желательно с помощью reserved делать стркутуру кратной 16-битам
*/ */
typedef struct //MB_DataCoilsTypeDef typedef struct //MB_DataCoilsTypeDef
{ {
/* reg 1 - control */ unsigned reserved:16;
unsigned ForwardTest:1;
unsigned ReverseTest:1;
unsigned StartTest:1;
unsigned KeyForwardHiTest:1;
unsigned KeyForwardLoTest:1;
unsigned KeyReverseHiTest:1;
unsigned KeyReverseLoTest:1;
unsigned reserved:9;
/* reg 2 - settings */
unsigned msTimeForForward_enable:1;
unsigned msTimeForReverse_enable:1;
unsigned msTimeBeforeTest_enable:1;
unsigned msTimeDeadtime_enable:1;
unsigned msTimeBeforePeak_enable:1;
unsigned reserved2:11;
}MB_DataCoilsTypeDef; }MB_DataCoilsTypeDef;
// DEFINES FOR COIL ARRAYS // DEFINES FOR COIL ARRAYS
#define C_CONTROL_ADDR 0 #define C_CONTROL_ADDR 0
#define C_CONTROL_QNT 7 #define C_CONTROL_QNT 16
#define C_SETTINGS_ADDR 16
#define C_SETTINGS_QNT 5
/** MODBUS_DATA_COILS_DEFINES /** MODBUS_DATA_COILS_DEFINES
* @} * @}

22
STM32F103_Example/MDK-ARM/Modbus_example.uvguix.I
View File

File diff suppressed because one or more lines are too long