Razvalyaev/UPP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Добавлен осцилограф на Modbus

Browse Source
This commit is contained in:
Razvalyaev
2026-02-14 19:04:14 +03:00
parent eb48424111
commit 168debdfc1
9 changed files with 234 additions and 117 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
UPP/AllLibs/Modbus

Submodule UPP/AllLibs/Modbus updated: f03ffd5bfc...c4c8024512

2
UPP/Core/Configs/modbus_config.h
View File

@@ -36,7 +36,6 @@
#define MODBUS_MODEL_NAME ""
#define MODBUS_USER_APPLICATION_NAME ""
// Периферия (опционально)
//#define mb_huart huart1 ///< Удобный дефайн для модбасовского uart
//#define mb_htim htim3 ///< Удобный дефайн для модбасовского таймера
@@ -51,6 +50,7 @@
#define MODBUS_ENABLE_INPUTS ///< Включить обработку входных регистров
#define MODBUS_ENABLE_DEVICE_IDENTIFICATIONS ///< Включить обработку идентификаторы устройства
#define MODBUS_ENABLE_DIAGNOSTICS ///< Включить обработку диагностики модбас
#define MODBUS_ENABLE_OSCIL ///< Включить осциллограф Modbus
//#define MODBUS_PROTOCOL_TCP ///< Включить TCP-протокол, иначе - RTU

10
UPP/Core/Configs/modbus_data.c
View File

@@ -95,11 +95,21 @@ MB_ExceptionTypeDef MB_DefineRegistersAddress(uint16_t **pRegs, uint16_t Addr, u
local_addr = Addr - R_HOLDING_PRVT_ADDR;
*pRegs = MB_Set_Register_Ptr(&MB_INTERNAL.param, local_addr); // указатель на выбранный по Addr регистр
}
#ifdef MODBUS_ENABLE_OSCIL
else if(MB_Check_Address_For_Arr(Addr, Qnt, R_HOLDING_OSCIL_ADDR, R_HOLDING_OSCIL_QNT) == ET_NO_ERRORS)
{
local_addr = Addr - R_HOLDING_OSCIL_ADDR;
*pRegs = MB_Set_Register_Ptr(&MB_INTERNAL.oscil , local_addr); // указатель на выбранный по Addr регистр
}
#endif
// if address doesnt match any array - return illegal data address response
else
{
return ET_ILLEGAL_DATA_ADDRESS;
}
}
else if(RegisterType == RegisterType_Input)
{

12
UPP/Core/Configs/modbus_data.h
View File

@@ -51,6 +51,7 @@
#ifndef _MODBUS_DATA_H_
#define _MODBUS_DATA_H_
#include "modbus_oscil.h"
#include "upp_defs.h"
#include "upp_params.h"
#include "stdint.h"
@@ -143,12 +144,6 @@ typedef struct // tester modbus data
extern MB_DataStructureTypeDef MB_DATA;
typedef struct
{
uint8_t data[240];
}MB_OscilTypeDef;
typedef struct
{
UPP_FuncCalls_t FuncCalls;
@@ -162,7 +157,10 @@ extern MB_DataInternalTypeDef MB_INTERNAL;
//--------------SIZES OF DATA---------------
#define R_HOLDING_PRVT_ADDR 1000
#define R_HOLDING_PRVT_QNT (sizeof(UPP_PrvtParams_t)/sizeof(uint16_t))
#define R_HOLDING_PRVT_QNT (sizeof(UPP_PrvtParams_t)/sizeof(uint16_t))
#define R_HOLDING_OSCIL_ADDR 2000
#define R_HOLDING_OSCIL_QNT (sizeof(MB_OscilTypeDef)/sizeof(uint16_t))
#define C_COILS_PRVT_ADDR 1000
#define C_COILS_PRVT_QNT (16)

5
UPP/Core/UPP/upp_main.c
View File

@@ -46,6 +46,7 @@ int UPP_App_Init(void)
MODBUS_FirstInit(&hmodbus1, &mb_huart, &mb_htim, UPP_UART2_SetDirection);
MODBUS_FirstInit(&hmodbus_pui, &mb_pui_huart, &mb_pui_htim, UPP_UART1_SetDirection);
MB_Oscil_Init(&MB_INTERNAL.oscil, 120, 4, 2);
if(HAL_TIM_Base_Start(&ustim) != HAL_OK)
@@ -117,10 +118,6 @@ int UPP_While(void)
int retval = 0;
PWM_SetPolarity(&upp.hpwm, dbg_polarity);
if(upp.pm.adc.RawData[0] < 2000)
{
__NOP();
}
if(upp.pm.f.runSlow)
{
GPIO_LED_Duty_Set(&UPP_LEDS.green1, test_green1);

45
UPP/Core/UPP/upp_status.c
View File

@@ -7,7 +7,6 @@
******************************************************************************/
#include "upp_main.h" // всё остальное по работе с УПП
#include "upp_status.h"
int cnt_oscil_size = 100;
void UPP_Status_Handler_SlowCalc(void)
{
@@ -96,30 +95,28 @@ void UPP_Status_Handler_IRQ(void)
upp.PUI.values->Trad = upp.pm.measured.final.T[TEMP_RAD] * 10;
upp.PUI.values->Tshkaf = upp.pm.measured.final.T[TEMP_SHKAF] * 10;
static int mb_u_cnt = 0;
if(mb_u_cnt+4 >= 240)
uint8_t oscil_data[4] = {0};
switch(MB_INTERNAL.oscil.User[0])
{
mb_u_cnt = 0;
}
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.U[U_AB]+1)*127;
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.U[U_BC]+1)*127;
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.U[U_CA]+1)*127;
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.I[I_A]+1)*127;
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.I[I_B]+1)*127;
// MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.pm.measured.slow.I[I_C]+1)*127;
static int cnt_oscil = 0;
if(cnt_oscil == 0)
{
MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.hangle.Iref)*32;
MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.hangle.Imeas)*32;
MB_INTERNAL.oscil.data[mb_u_cnt++] = (upp.hangle.alpha)*127;
MB_INTERNAL.oscil.data[mb_u_cnt++] = 0;
}
if (++cnt_oscil>cnt_oscil_size)
{
cnt_oscil = 0;
case 0:
oscil_data[0] = (upp.pm.measured.slow.U[U_AB]+1)*127;
oscil_data[1] = (upp.pm.measured.slow.U[U_BC]+1)*127;
oscil_data[2] = (upp.pm.measured.slow.U[U_CA]+1)*127;
oscil_data[3] = local_time();
break;
case 1:
oscil_data[0] = (upp.pm.measured.slow.I[I_A]+1)*127;
oscil_data[1] = (upp.pm.measured.slow.I[I_B]+1)*127;
oscil_data[2] = (upp.pm.measured.slow.I[I_C]+1)*127;
break;
case 2:
oscil_data[0] = (upp.hangle.Iref)*32;
oscil_data[1] = (upp.hangle.Imeas)*32;
oscil_data[2] = (upp.hangle.alpha)*127;
break;
}
MB_Oscil_Add(&MB_INTERNAL.oscil, oscil_data);
}

186
UPP/MDK-ARM/UPP.uvoptx
View File

@@ -148,40 +148,7 @@
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F4xx_1024 -FS08000000 -FL0100000 -FP0($$Device:STM32F427ZGTx$CMSIS\Flash\STM32F4xx_1024.FLM))</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>351</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134232798</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\UPP\../Drivers/STM32F4xx_HAL_Driver/Src/stm32f4xx_hal_can.c\351</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>183</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134280762</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>..\Core\UPP\upp_main.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\UPP\../Core/UPP/upp_main.c\183</Expression>
</Bp>
</Breakpoint>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
@@ -196,7 +163,7 @@
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>hmodbus1</ItemText>
<ItemText>hmodbus1,0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
@@ -283,6 +250,46 @@
<WinNumber>1</WinNumber>
<ItemText>pCoils</ItemText>
</Ww>
<Ww>
<count>20</count>
<WinNumber>1</WinNumber>
<ItemText>MB_INTERNAL.oscil,0x0A</ItemText>
</Ww>
<Ww>
<count>21</count>
<WinNumber>1</WinNumber>
<ItemText>hmodbus1.lastPacketTick,0x0A</ItemText>
</Ww>
<Ww>
<count>22</count>
<WinNumber>1</WinNumber>
<ItemText>&amp;MB_INTERNAL.oscil.Preamble,0x0A</ItemText>
</Ww>
<Ww>
<count>23</count>
<WinNumber>1</WinNumber>
<ItemText>&amp;MB_INTERNAL.oscil.Data</ItemText>
</Ww>
<Ww>
<count>24</count>
<WinNumber>1</WinNumber>
<ItemText>hmodbus1.lastPacketTick,0x0A</ItemText>
</Ww>
<Ww>
<count>25</count>
<WinNumber>1</WinNumber>
<ItemText>lastPacketTick,0x0A</ItemText>
</Ww>
<Ww>
<count>26</count>
<WinNumber>1</WinNumber>
<ItemText>dbg_period,0x0A</ItemText>
</Ww>
<Ww>
<count>27</count>
<WinNumber>1</WinNumber>
<ItemText>mb_period,0x0A</ItemText>
</Ww>
</WatchWindow1>
<WatchWindow2>
<Ww>
@@ -373,15 +380,10 @@
<Ww>
<count>17</count>
<WinNumber>2</WinNumber>
<ItemText>MB_INTERNAL.oscil.data,0x0A</ItemText>
</Ww>
<Ww>
<count>18</count>
<WinNumber>2</WinNumber>
<ItemText>hmodbus1</ItemText>
</Ww>
<Ww>
<count>19</count>
<count>18</count>
<WinNumber>2</WinNumber>
<ItemText>cnt_oscil_size,0x0A</ItemText>
</Ww>
@@ -1403,7 +1405,7 @@
<Group>
<GroupName>Modbus</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@@ -1551,6 +1553,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>69</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\AllLibs\Modbus\Src\modbus_oscil.c</PathWithFileName>
<FilenameWithoutPath>modbus_oscil.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>70</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\AllLibs\Modbus\Inc\modbus_oscil.h</PathWithFileName>
<FilenameWithoutPath>modbus_oscil.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
@@ -1561,7 +1587,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>69</FileNumber>
<FileNumber>71</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1573,7 +1599,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>70</FileNumber>
<FileNumber>72</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1585,7 +1611,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>71</FileNumber>
<FileNumber>73</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1597,7 +1623,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>72</FileNumber>
<FileNumber>74</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1609,7 +1635,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>73</FileNumber>
<FileNumber>75</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1621,7 +1647,7 @@
</File>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>74</FileNumber>
<FileNumber>76</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1641,7 +1667,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>75</FileNumber>
<FileNumber>77</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1653,7 +1679,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>76</FileNumber>
<FileNumber>78</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1665,7 +1691,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>77</FileNumber>
<FileNumber>79</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1677,7 +1703,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>78</FileNumber>
<FileNumber>80</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1689,7 +1715,7 @@
</File>
<File>
<GroupNumber>8</GroupNumber>
<FileNumber>79</FileNumber>
<FileNumber>81</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1709,7 +1735,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>80</FileNumber>
<FileNumber>82</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1721,7 +1747,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>81</FileNumber>
<FileNumber>83</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1733,7 +1759,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>82</FileNumber>
<FileNumber>84</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1745,7 +1771,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>83</FileNumber>
<FileNumber>85</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1757,7 +1783,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>84</FileNumber>
<FileNumber>86</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1769,7 +1795,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>85</FileNumber>
<FileNumber>87</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1781,7 +1807,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>86</FileNumber>
<FileNumber>88</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1793,7 +1819,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>87</FileNumber>
<FileNumber>89</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1805,7 +1831,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>88</FileNumber>
<FileNumber>90</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1817,7 +1843,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>89</FileNumber>
<FileNumber>91</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1829,7 +1855,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>90</FileNumber>
<FileNumber>92</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1841,7 +1867,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>91</FileNumber>
<FileNumber>93</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1853,7 +1879,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>92</FileNumber>
<FileNumber>94</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1865,7 +1891,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>93</FileNumber>
<FileNumber>95</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1877,7 +1903,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>94</FileNumber>
<FileNumber>96</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1889,7 +1915,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>95</FileNumber>
<FileNumber>97</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1901,7 +1927,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>96</FileNumber>
<FileNumber>98</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1913,7 +1939,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>97</FileNumber>
<FileNumber>99</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1925,7 +1951,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>98</FileNumber>
<FileNumber>100</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1937,7 +1963,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>99</FileNumber>
<FileNumber>101</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1949,7 +1975,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>100</FileNumber>
<FileNumber>102</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1961,7 +1987,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>101</FileNumber>
<FileNumber>103</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1973,7 +1999,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>102</FileNumber>
<FileNumber>104</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -1985,7 +2011,7 @@
</File>
<File>
<GroupNumber>9</GroupNumber>
<FileNumber>103</FileNumber>
<FileNumber>105</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -2005,7 +2031,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>10</GroupNumber>
<FileNumber>104</FileNumber>
<FileNumber>106</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -2025,7 +2051,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>105</FileNumber>
<FileNumber>107</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@@ -2037,7 +2063,7 @@
</File>
<File>
<GroupNumber>11</GroupNumber>
<FileNumber>106</FileNumber>
<FileNumber>108</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

20
UPP/MDK-ARM/UPP.uvprojx
View File

@@ -1107,6 +1107,16 @@
<FileType>1</FileType>
<FilePath>..\AllLibs\Modbus\Src\rs_message.c</FilePath>
</File>
<File>
<FileName>modbus_oscil.c</FileName>
<FileType>1</FileType>
<FilePath>..\AllLibs\Modbus\Src\modbus_oscil.c</FilePath>
</File>
<File>
<FileName>modbus_oscil.h</FileName>
<FileType>5</FileType>
<FilePath>..\AllLibs\Modbus\Inc\modbus_oscil.h</FilePath>
</File>
</Files>
</Group>
<Group>
@@ -2489,6 +2499,16 @@
<FileType>1</FileType>
<FilePath>..\AllLibs\Modbus\Src\rs_message.c</FilePath>
</File>
<File>
<FileName>modbus_oscil.c</FileName>
<FileType>1</FileType>
<FilePath>..\AllLibs\Modbus\Src\modbus_oscil.c</FilePath>
</File>
<File>
<FileName>modbus_oscil.h</FileName>
<FileType>5</FileType>
<FilePath>..\AllLibs\Modbus\Inc\modbus_oscil.h</FilePath>
</File>
</Files>
</Group>
<Group>

69
Информация для программиста (УПП СП СЭД)/Modbus/ModbusPoll.mbw Normal file
View File

@@ -0,0 +1,69 @@
<?xml version="1.0" encoding="UTF-8"?>
<ModbusPoll>
<FileSchema r="0" c="0"/>
<Version major="12" minor="2" patch="0" build="2516"/>
<dpi>96</dpi>
<Connection>
<Connection>0</Connection>
<Port>10</Port>
<BaudRate>115200</BaudRate>
<DataBits>8</DataBits>
<Parity>0</Parity>
<StopBits>1</StopBits>
<EnableCustomBaudRate>0</EnableCustomBaudRate>
<CustomBaudRate>9600</CustomBaudRate>
<DSR>0</DSR>
<CTS>0</CTS>
<DTR>1</DTR>
<RTSToggle>1</RTSToggle>
<CLRRTSDelay>1</CLRRTSDelay>
<RemoveEcho>0</RemoveEcho>
<!--RTU = 0, ASCII = 1-->
<Mode>0</Mode>
<ResponeTimeout>1000</ResponeTimeout>
<DelayBetweenPolls>20</DelayBetweenPolls>
<IPAddress>127.0.0.1</IPAddress>
<ServerPort>502</ServerPort>
<ConnectionTimeout>3000</ConnectionTimeout>
<IPv6>0</IPv6>
<PortOpen>0</PortOpen>
</Connection>
<WP left="52" right="1312" top="52" bottom="789" ShowCmd="1" MaxPosX="-1" MaxPosY="-1" MinPosX="-1" MinPosY="-1"/>
<ChartData Action="0" xAxisMax="100" yAxisLeftMin="0" yAxisLeftMax="100" yAxisRightMin="0" yAxisRightMax="100" LegendPosition="0" ShowLegend="0" TimeUnit="0" ChartTitle="" ChartTitleVisible="0" WhiteBackGround="0"/>
<Series>
<Serie rightAxis="0" offset="0" color_r="0" color_g="255" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="255" color_g="255" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="0" color_g="0" color_b="255" name=""/>
<Serie rightAxis="0" offset="0" color_r="255" color_g="0" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="0" color_g="255" color_b="255" name=""/>
<Serie rightAxis="0" offset="0" color_r="255" color_g="0" color_b="255" name=""/>
<Serie rightAxis="0" offset="0" color_r="192" color_g="192" color_b="192" name=""/>
<Serie rightAxis="0" offset="0" color_r="128" color_g="128" color_b="128" name=""/>
<Serie rightAxis="0" offset="0" color_r="128" color_g="0" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="128" color_g="128" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="0" color_g="128" color_b="0" name=""/>
<Serie rightAxis="0" offset="0" color_r="128" color_g="0" color_b="128" name=""/>
</Series>
<Documents>
<Document>
<FilePath>Внутренние настройки.mbp</FilePath>
<WP left="-3" right="1676" top="-1" bottom="310" ShowCmd="1" MaxPosX="-8" MaxPosY="-31" MinPosX="0" MinPosY="606"/>
</Document>
<Document>
<FilePath>Вызов функций.mbp</FilePath>
<WP left="1" right="273" top="308" bottom="924" ShowCmd="1" MaxPosX="-1" MaxPosY="-1" MinPosX="-1" MinPosY="-1"/>
</Document>
<Document>
<FilePath>Значения для ПУИ.mbp</FilePath>
<WP left="736" right="1240" top="310" bottom="902" ShowCmd="1" MaxPosX="-8" MaxPosY="-31" MinPosX="320" MinPosY="606"/>
</Document>
<Document>
<FilePath>Настройки ПУИ.mbp</FilePath>
<WP left="272" right="516" top="444" bottom="895" ShowCmd="1" MaxPosX="-8" MaxPosY="-31" MinPosX="0" MinPosY="895"/>
</Document>
<Document>
<FilePath>Управление от ПУИ.mbp</FilePath>
<WP left="271" right="516" top="312" bottom="449" ShowCmd="1" MaxPosX="-1" MaxPosY="-1" MinPosX="-1" MinPosY="-1"/>
</Document>
</Documents>
</ModbusPoll>