Compare commits
9 Commits
a27b6bcb50
...
modbus_tcp
| Author | SHA1 | Date | |
|---|---|---|---|
| 2b49e0069e | |||
| f92bfb2e08 | |||
| 9de66f740a | |||
| a1e67d0835 | |||
| 8beff99135 | |||
| e96ca9d3f5 | |||
| 7f8361ae5b | |||
| d1a2b032ec | |||
| 62906c6685 |
1
.gitignore
vendored
1
.gitignore
vendored
@@ -45,3 +45,4 @@ JLinkLog.txt
|
||||
|
||||
# Other Files
|
||||
|
||||
/john103C6T6/MDK-ARM/john103C6T6.uvoptx
|
||||
|
||||
7
.gitmodules
vendored
Normal file
7
.gitmodules
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
[submodule "external_flash_eeprom"]
|
||||
path = external_flash_eeprom
|
||||
url = https://git.arktika.cyou/set506/external_flash_eeprom.git
|
||||
[submodule "labview_proj"]
|
||||
path = labview_proj
|
||||
url = https://git.arktika.cyou/Andrey/labview_proj.git
|
||||
branch = master
|
||||
BIN
Project Backups/schem [Autosaved].pdsprj
Normal file
BIN
Project Backups/schem [Autosaved].pdsprj
Normal file
Binary file not shown.
@@ -1,3 +0,0 @@
|
||||
[My Computer]
|
||||
My Computer = "127.0.0.1"
|
||||
|
||||
@@ -1,19 +0,0 @@
|
||||
[ProjectWindow_Data]
|
||||
ProjectExplorer.ClassicPosition[String] = "124,868,1361,1826"
|
||||
|
||||
[AB_Cache_{C8EBF7D6-657A-4E65-AEE3-B862EABA3F7F}]
|
||||
Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{C8EBF7D6-6"
|
||||
Cache_Path[Path] Line0002 = "57A-4E65-AEE3-B862EABA3F7F}.txt"
|
||||
|
||||
[AB_Cache_{087EE1D5-3790-4A5C-A7A3-C86684E2BE1D}]
|
||||
Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{087EE1D5-3"
|
||||
Cache_Path[Path] Line0002 = "790-4A5C-A7A3-C86684E2BE1D}.txt"
|
||||
|
||||
[AB_Cache_{B7340701-DE2A-44B0-AF07-6C66FF5DCD86}]
|
||||
Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{B7340701-D"
|
||||
Cache_Path[Path] Line0002 = "E2A-44B0-AF07-6C66FF5DCD86}.txt"
|
||||
|
||||
[AB_Cache_{EE6280B4-6A30-4F73-8030-E414CD637626}]
|
||||
Cache_Path[Path] Line0001 = "/C/Users/z/AppData/Local/Temp/AB_Cache_{EE6280B4-6"
|
||||
Cache_Path[Path] Line0002 = "A30-4F73-8030-E414CD637626}.txt"
|
||||
|
||||
119
ds18b20.lvproj
119
ds18b20.lvproj
@@ -1,119 +0,0 @@
|
||||
<?xml version='1.0' encoding='UTF-8'?>
|
||||
<Project Type="Project" LVVersion="19008000">
|
||||
<Item Name="My Computer" Type="My Computer">
|
||||
<Property Name="server.app.propertiesEnabled" Type="Bool">true</Property>
|
||||
<Property Name="server.control.propertiesEnabled" Type="Bool">true</Property>
|
||||
<Property Name="server.tcp.enabled" Type="Bool">false</Property>
|
||||
<Property Name="server.tcp.port" Type="Int">0</Property>
|
||||
<Property Name="server.tcp.serviceName" Type="Str">My Computer/VI Server</Property>
|
||||
<Property Name="server.tcp.serviceName.default" Type="Str">My Computer/VI Server</Property>
|
||||
<Property Name="server.vi.callsEnabled" Type="Bool">true</Property>
|
||||
<Property Name="server.vi.propertiesEnabled" Type="Bool">true</Property>
|
||||
<Property Name="specify.custom.address" Type="Bool">false</Property>
|
||||
<Item Name="gomno.vi" Type="VI" URL="../../gomno.vi"/>
|
||||
<Item Name="modbus_master.vi" Type="VI" URL="../modbus_master.vi"/>
|
||||
<Item Name="modbus_slave.vi" Type="VI" URL="../../HV_Source/modbus_slave.vi"/>
|
||||
<Item Name="termDallas.vi" Type="VI" URL="../termDallas.vi"/>
|
||||
<Item Name="Dependencies" Type="Dependencies">
|
||||
<Item Name="vi.lib" Type="Folder">
|
||||
<Item Name="Clear Errors.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Clear Errors.vi"/>
|
||||
<Item Name="Error Cluster From Error Code.vi" Type="VI" URL="/<vilib>/Utility/error.llb/Error Cluster From Error Code.vi"/>
|
||||
<Item Name="Modbus Master.lvclass" Type="LVClass" URL="/<vilib>/Modbus/master/Modbus Master.lvclass"/>
|
||||
<Item Name="Modbus Slave.lvclass" Type="LVClass" URL="/<vilib>/Modbus/slave/Modbus Slave.lvclass"/>
|
||||
<Item Name="SubVIs.lvlib" Type="Library" URL="/<vilib>/Modbus/subvis/SubVIs.lvlib"/>
|
||||
</Item>
|
||||
</Item>
|
||||
<Item Name="Build Specifications" Type="Build">
|
||||
<Item Name="My DLL" Type="DLL">
|
||||
<Property Name="App_copyErrors" Type="Bool">true</Property>
|
||||
<Property Name="App_INI_aliasGUID" Type="Str">{40E93CB7-FDA1-4C19-8AE3-0F2342690D29}</Property>
|
||||
<Property Name="App_INI_GUID" Type="Str">{D4D69FF4-7E4E-46F9-A918-DB8071436980}</Property>
|
||||
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
|
||||
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
|
||||
<Property Name="Bld_buildCacheID" Type="Str">{B7340701-DE2A-44B0-AF07-6C66FF5DCD86}</Property>
|
||||
<Property Name="Bld_buildSpecName" Type="Str">My DLL</Property>
|
||||
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
|
||||
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
|
||||
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
|
||||
<Property Name="Bld_localDestDir" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL</Property>
|
||||
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
|
||||
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
|
||||
<Property Name="Bld_previewCacheID" Type="Str">{EE6280B4-6A30-4F73-8030-E414CD637626}</Property>
|
||||
<Property Name="Bld_version.build" Type="Int">1</Property>
|
||||
<Property Name="Bld_version.major" Type="Int">1</Property>
|
||||
<Property Name="Destination[0].destName" Type="Str">SharedLib.dll</Property>
|
||||
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL/SharedLib.dll</Property>
|
||||
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
|
||||
<Property Name="Destination[0].type" Type="Str">App</Property>
|
||||
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
|
||||
<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/My DLL/data</Property>
|
||||
<Property Name="DestinationCount" Type="Int">2</Property>
|
||||
<Property Name="Dll_compatibilityWith2011" Type="Bool">false</Property>
|
||||
<Property Name="Dll_delayOSMsg" Type="Bool">true</Property>
|
||||
<Property Name="Dll_headerGUID" Type="Str">{D40D4CE1-A3D4-4337-A107-D7FF181A1F6A}</Property>
|
||||
<Property Name="Dll_libGUID" Type="Str">{6BF091CB-5B82-4A69-8232-D98FEA75C60C}</Property>
|
||||
<Property Name="Dll_privateExecSys" Type="Bool">true</Property>
|
||||
<Property Name="Source[0].itemID" Type="Str">{6EC34403-A46C-4C4D-AA54-72C2544BDDF7}</Property>
|
||||
<Property Name="Source[0].type" Type="Str">Container</Property>
|
||||
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
|
||||
<Property Name="Source[1].itemID" Type="Ref">/My Computer/termDallas.vi</Property>
|
||||
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
|
||||
<Property Name="Source[1].type" Type="Str">ExportedVI</Property>
|
||||
<Property Name="SourceCount" Type="Int">2</Property>
|
||||
<Property Name="TgtF_fileDescription" Type="Str">My DLL</Property>
|
||||
<Property Name="TgtF_internalName" Type="Str">My DLL</Property>
|
||||
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2025 </Property>
|
||||
<Property Name="TgtF_productName" Type="Str">My DLL</Property>
|
||||
<Property Name="TgtF_targetfileGUID" Type="Str">{FA36A048-F0EF-42EE-B21D-99F1B1A89CD6}</Property>
|
||||
<Property Name="TgtF_targetfileName" Type="Str">SharedLib.dll</Property>
|
||||
<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
|
||||
</Item>
|
||||
<Item Name="termDallas" Type="EXE">
|
||||
<Property Name="App_copyErrors" Type="Bool">true</Property>
|
||||
<Property Name="App_INI_aliasGUID" Type="Str">{6FFBC329-834E-4724-A67C-F272BFAC2E01}</Property>
|
||||
<Property Name="App_INI_GUID" Type="Str">{5F4A30D2-D400-477F-A778-24EB5FDFA319}</Property>
|
||||
<Property Name="App_serverConfig.httpPort" Type="Int">8002</Property>
|
||||
<Property Name="Bld_autoIncrement" Type="Bool">true</Property>
|
||||
<Property Name="Bld_buildCacheID" Type="Str">{C8EBF7D6-657A-4E65-AEE3-B862EABA3F7F}</Property>
|
||||
<Property Name="Bld_buildSpecName" Type="Str">termDallas</Property>
|
||||
<Property Name="Bld_excludeInlineSubVIs" Type="Bool">true</Property>
|
||||
<Property Name="Bld_excludeLibraryItems" Type="Bool">true</Property>
|
||||
<Property Name="Bld_excludePolymorphicVIs" Type="Bool">true</Property>
|
||||
<Property Name="Bld_localDestDir" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas</Property>
|
||||
<Property Name="Bld_localDestDirType" Type="Str">relativeToCommon</Property>
|
||||
<Property Name="Bld_modifyLibraryFile" Type="Bool">true</Property>
|
||||
<Property Name="Bld_previewCacheID" Type="Str">{087EE1D5-3790-4A5C-A7A3-C86684E2BE1D}</Property>
|
||||
<Property Name="Bld_version.build" Type="Int">1</Property>
|
||||
<Property Name="Bld_version.major" Type="Int">1</Property>
|
||||
<Property Name="Destination[0].destName" Type="Str">Application.exe</Property>
|
||||
<Property Name="Destination[0].path" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas/Application.exe</Property>
|
||||
<Property Name="Destination[0].preserveHierarchy" Type="Bool">true</Property>
|
||||
<Property Name="Destination[0].type" Type="Str">App</Property>
|
||||
<Property Name="Destination[1].destName" Type="Str">Support Directory</Property>
|
||||
<Property Name="Destination[1].path" Type="Path">../builds/NI_AB_PROJECTNAME/termDallas/data</Property>
|
||||
<Property Name="DestinationCount" Type="Int">2</Property>
|
||||
<Property Name="Source[0].itemID" Type="Str">{6EC34403-A46C-4C4D-AA54-72C2544BDDF7}</Property>
|
||||
<Property Name="Source[0].type" Type="Str">Container</Property>
|
||||
<Property Name="Source[1].destinationIndex" Type="Int">0</Property>
|
||||
<Property Name="Source[1].itemID" Type="Ref">/My Computer/termDallas.vi</Property>
|
||||
<Property Name="Source[1].sourceInclusion" Type="Str">TopLevel</Property>
|
||||
<Property Name="Source[1].type" Type="Str">VI</Property>
|
||||
<Property Name="Source[2].itemID" Type="Ref">/My Computer/gomno.vi</Property>
|
||||
<Property Name="Source[2].properties[0].type" Type="Str">Run when opened</Property>
|
||||
<Property Name="Source[2].properties[0].value" Type="Bool">false</Property>
|
||||
<Property Name="Source[2].properties[1].type" Type="Str">Allow debugging</Property>
|
||||
<Property Name="Source[2].properties[1].value" Type="Bool">false</Property>
|
||||
<Property Name="Source[2].propertiesCount" Type="Int">2</Property>
|
||||
<Property Name="Source[2].type" Type="Str">VI</Property>
|
||||
<Property Name="SourceCount" Type="Int">3</Property>
|
||||
<Property Name="TgtF_fileDescription" Type="Str">termDallas</Property>
|
||||
<Property Name="TgtF_internalName" Type="Str">termDallas</Property>
|
||||
<Property Name="TgtF_legalCopyright" Type="Str">Copyright © 2025 </Property>
|
||||
<Property Name="TgtF_productName" Type="Str">termDallas</Property>
|
||||
<Property Name="TgtF_targetfileGUID" Type="Str">{FFC19120-369B-4C06-8250-2488CB234A4F}</Property>
|
||||
<Property Name="TgtF_targetfileName" Type="Str">Application.exe</Property>
|
||||
<Property Name="TgtF_versionIndependent" Type="Bool">true</Property>
|
||||
</Item>
|
||||
</Item>
|
||||
</Item>
|
||||
</Project>
|
||||
1
external_flash_eeprom
Submodule
1
external_flash_eeprom
Submodule
Submodule external_flash_eeprom added at 6ec779c11d
@@ -112,7 +112,7 @@ struct _SensorHandleStruct
|
||||
|
||||
|
||||
float set_temp;
|
||||
int hyst;
|
||||
uint16_t hyst;
|
||||
|
||||
DALLAS_HandleTypeDef *hdallas;
|
||||
uint64_t sensROM; ///< ROM-код датчика
|
||||
|
||||
@@ -63,8 +63,8 @@ typedef struct
|
||||
/* USER CODE BEGIN ET */
|
||||
#define reset_blink_delay 50
|
||||
#define rest_iter 10
|
||||
#define GPIOB11_valve MB_DATA.Coils.coils.state_val_bit.state_val_01
|
||||
|
||||
#define GPIOB11_valve MB_DATA.Coils.coils[0].state_val_bit.state_val_01
|
||||
#define ralay_5v_on GPIOA->ODR&(1<<10);
|
||||
|
||||
|
||||
|
||||
@@ -96,6 +96,8 @@ void Error_Handler(void);
|
||||
/* USER CODE END EFP */
|
||||
|
||||
/* Private defines -----------------------------------------------------------*/
|
||||
#define One_wire_Pin GPIO_PIN_15
|
||||
#define One_wire_GPIO_Port GPIOA
|
||||
|
||||
/* USER CODE BEGIN Private defines */
|
||||
|
||||
|
||||
@@ -55,6 +55,7 @@ void SVC_Handler(void);
|
||||
void DebugMon_Handler(void);
|
||||
void PendSV_Handler(void);
|
||||
void SysTick_Handler(void);
|
||||
void RTC_IRQHandler(void);
|
||||
void TIM1_BRK_IRQHandler(void);
|
||||
void TIM1_UP_IRQHandler(void);
|
||||
void TIM1_TRG_COM_IRQHandler(void);
|
||||
|
||||
@@ -53,12 +53,12 @@ void MX_GPIO_Init(void)
|
||||
/*Configure GPIO pin Output Level */
|
||||
HAL_GPIO_WritePin(GPIOA, GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
|
||||
|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
|
||||
|GPIO_PIN_9|GPIO_PIN_10, GPIO_PIN_RESET);
|
||||
|GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin, GPIO_PIN_SET);
|
||||
|
||||
/*Configure GPIO pin Output Level */
|
||||
HAL_GPIO_WritePin(GPIOB, GPIO_PIN_0|GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_10
|
||||
|GPIO_PIN_11|GPIO_PIN_12|GPIO_PIN_13|GPIO_PIN_14
|
||||
|GPIO_PIN_15, GPIO_PIN_RESET);
|
||||
|GPIO_PIN_15, GPIO_PIN_SET);
|
||||
|
||||
/*Configure GPIO pin : PA0 */
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_0;
|
||||
@@ -68,10 +68,10 @@ void MX_GPIO_Init(void)
|
||||
|
||||
/*Configure GPIO pins : PA1 PA2 PA3 PA4
|
||||
PA5 PA6 PA7 PA8
|
||||
PA9 PA10 */
|
||||
PA9 PA10 PAPin */
|
||||
GPIO_InitStruct.Pin = GPIO_PIN_1|GPIO_PIN_2|GPIO_PIN_3|GPIO_PIN_4
|
||||
|GPIO_PIN_5|GPIO_PIN_6|GPIO_PIN_7|GPIO_PIN_8
|
||||
|GPIO_PIN_9|GPIO_PIN_10;
|
||||
|GPIO_PIN_9|GPIO_PIN_10|One_wire_Pin;
|
||||
GPIO_InitStruct.Mode = GPIO_MODE_OUTPUT_PP;
|
||||
GPIO_InitStruct.Pull = GPIO_NOPULL;
|
||||
GPIO_InitStruct.Speed = GPIO_SPEED_FREQ_LOW;
|
||||
|
||||
@@ -51,6 +51,8 @@ int fputc(int ch, FILE *f)
|
||||
/* Private define ------------------------------------------------------------*/
|
||||
/* USER CODE BEGIN PD */
|
||||
uint16_t iter,cnt=5;
|
||||
|
||||
uint8_t ralay_5v_on_var=0;
|
||||
/* USER CODE END PD */
|
||||
|
||||
/* Private macro -------------------------------------------------------------*/
|
||||
@@ -58,7 +60,7 @@ uint16_t iter,cnt=5;
|
||||
float temperature;
|
||||
extern uint8_t roms[MAX_DEVICES][8];
|
||||
//extern uint8_t devices_found ;
|
||||
uint8_t init=1;
|
||||
uint8_t _debug_init=1;
|
||||
//TEMP temp_sense[30];
|
||||
float set_temp_old[30];
|
||||
char rx_buffer[64];
|
||||
@@ -93,6 +95,7 @@ void SystemClock_Config(void);
|
||||
* @retval int
|
||||
*/
|
||||
int main(void)
|
||||
|
||||
{
|
||||
|
||||
/* USER CODE BEGIN 1 */
|
||||
@@ -118,6 +121,7 @@ int main(void)
|
||||
|
||||
/* Initialize all configured peripherals */
|
||||
MX_GPIO_Init();
|
||||
|
||||
MX_TIM1_Init();
|
||||
MX_USART1_UART_Init();
|
||||
MX_TIM2_Init();
|
||||
@@ -144,8 +148,8 @@ int main(void)
|
||||
sens[i].Init.InitParam.Ind = i;
|
||||
sens[i].Init.init_func = &Dallas_SensorInitByInd;
|
||||
sens[i].Init.Resolution = DALLAS_CONFIG_9_BITS;
|
||||
MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
|
||||
sens[i].hyst =3;
|
||||
MB_DATA.HoldRegs.set_Temp[i] =sens[i].set_temp =20.;
|
||||
MB_DATA.HoldRegs.set_hyst[i]=sens[i].hyst =1;
|
||||
Dallas_AddNewSensors(&hdallas, &sens[i]);
|
||||
|
||||
}
|
||||
@@ -155,22 +159,24 @@ int main(void)
|
||||
/* USER CODE BEGIN WHILE */
|
||||
while (1)
|
||||
{
|
||||
if (init)
|
||||
|
||||
|
||||
if (_debug_init||MB_DATA.Coils.init_param)
|
||||
{
|
||||
init=0;
|
||||
_debug_init=0;
|
||||
|
||||
MB_DATA.Coils.init_param=0;
|
||||
for(int i=0;i<hdallas.onewire->RomCnt;i++)
|
||||
{
|
||||
MB_DATA.HoldRegs.set_Temp[i]=21;
|
||||
|
||||
sens[i].set_temp=MB_DATA.HoldRegs.set_Temp[i];
|
||||
sens[i].hyst=MB_DATA.HoldRegs.set_hyst[i];
|
||||
}
|
||||
// init_all_T_sense();
|
||||
//DS18B20_Search(&DS, &OW);
|
||||
|
||||
|
||||
|
||||
}
|
||||
|
||||
init=MB_DATA.Coils.init_param;
|
||||
|
||||
Dallas_StartConvertTAll(&hdallas,DALLAS_WAIT_BUS,0);
|
||||
|
||||
for(int i=0;i<hdallas.onewire->RomCnt;i++)
|
||||
@@ -182,32 +188,44 @@ int main(void)
|
||||
Dallas_ReadTemperature(&sens[i]);
|
||||
sens[i].set_temp = MB_DATA.HoldRegs.set_Temp[i];
|
||||
MB_DATA.InRegs.sens_Temp[i]=sens[i].temperature*10;
|
||||
|
||||
|
||||
|
||||
ralay_5v_on_var=MB_DATA.Coils.coils[1].state_val_bit.state_val_05;
|
||||
if (ralay_5v_on_var)
|
||||
{
|
||||
GPIOA->ODR|=1<<10;
|
||||
}
|
||||
else
|
||||
{
|
||||
GPIOA->ODR&=~(1<<10);
|
||||
}
|
||||
|
||||
if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
|
||||
|
||||
{
|
||||
|
||||
MB_DATA.Coils.coils.all|=1<<i;
|
||||
|
||||
}
|
||||
|
||||
else
|
||||
|
||||
if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
|
||||
{
|
||||
|
||||
MB_DATA.Coils.coils.all&=~(1<<i);
|
||||
|
||||
}
|
||||
if(GPIOB11_valve)
|
||||
{
|
||||
GPIOB->ODR|=1<<11;
|
||||
}
|
||||
else
|
||||
{
|
||||
GPIOB->ODR&=~(1<<11);
|
||||
|
||||
}
|
||||
//// if (sens[i].temperature<sens[i].set_temp-sens[i].hyst)
|
||||
////
|
||||
//// {
|
||||
////
|
||||
//// MB_DATA.Coils.coils[0].all|=1<<i;
|
||||
////
|
||||
//// }
|
||||
////
|
||||
//// else
|
||||
////
|
||||
//// if (sens[i].temperature>sens[i].set_temp+sens[i].hyst)
|
||||
//// {
|
||||
////
|
||||
//// MB_DATA.Coils.coils[0].all&=~(1<<i);
|
||||
////
|
||||
//// }
|
||||
//// if(GPIOB11_valve)
|
||||
//// {
|
||||
//// GPIOB->ODR|=1<<11;
|
||||
//// }
|
||||
//// else
|
||||
//// {
|
||||
//// GPIOB->ODR&=~(1<<11);
|
||||
////
|
||||
//// }
|
||||
}
|
||||
|
||||
|
||||
|
||||
@@ -36,7 +36,6 @@ void MX_RTC_Init(void)
|
||||
|
||||
RTC_TimeTypeDef sTime = {0};
|
||||
RTC_DateTypeDef DateToUpdate = {0};
|
||||
RTC_TamperTypeDef sTamper = {0};
|
||||
|
||||
/* USER CODE BEGIN RTC_Init 1 */
|
||||
|
||||
@@ -46,7 +45,7 @@ void MX_RTC_Init(void)
|
||||
*/
|
||||
hrtc.Instance = RTC;
|
||||
hrtc.Init.AsynchPrediv = RTC_AUTO_1_SECOND;
|
||||
hrtc.Init.OutPut = RTC_OUTPUTSOURCE_NONE;
|
||||
hrtc.Init.OutPut = RTC_OUTPUTSOURCE_SECOND;
|
||||
if (HAL_RTC_Init(&hrtc) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
@@ -58,32 +57,24 @@ void MX_RTC_Init(void)
|
||||
|
||||
/** Initialize RTC and set the Time and Date
|
||||
*/
|
||||
sTime.Hours = 0x0;
|
||||
sTime.Minutes = 0x0;
|
||||
sTime.Seconds = 0x0;
|
||||
|
||||
// sTime.Hours = 0x0;
|
||||
// sTime.Minutes = 0x0;
|
||||
// sTime.Seconds = 0x0;
|
||||
|
||||
if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
|
||||
DateToUpdate.Month = RTC_MONTH_JANUARY;
|
||||
DateToUpdate.Date = 0x1;
|
||||
DateToUpdate.Year = 0x0;
|
||||
// // if (HAL_RTC_SetTime(&hrtc, &sTime, RTC_FORMAT_BCD) != HAL_OK)
|
||||
// {
|
||||
// Error_Handler();
|
||||
// }
|
||||
// DateToUpdate.WeekDay = RTC_WEEKDAY_MONDAY;
|
||||
// DateToUpdate.Month = RTC_MONTH_JANUARY;
|
||||
// DateToUpdate.Date = 0x1;
|
||||
// DateToUpdate.Year = 0x0;
|
||||
|
||||
if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
|
||||
/** Enable the RTC Tamper
|
||||
*/
|
||||
sTamper.Tamper = RTC_TAMPER_1;
|
||||
sTamper.Trigger = RTC_TAMPERTRIGGER_LOWLEVEL;
|
||||
if (HAL_RTCEx_SetTamper(&hrtc, &sTamper) != HAL_OK)
|
||||
{
|
||||
Error_Handler();
|
||||
}
|
||||
// if (HAL_RTC_SetDate(&hrtc, &DateToUpdate, RTC_FORMAT_BCD) != HAL_OK)
|
||||
// {
|
||||
// Error_Handler();
|
||||
// }
|
||||
/* USER CODE BEGIN RTC_Init 2 */
|
||||
|
||||
/* USER CODE END RTC_Init 2 */
|
||||
@@ -103,6 +94,10 @@ void HAL_RTC_MspInit(RTC_HandleTypeDef* rtcHandle)
|
||||
__HAL_RCC_BKP_CLK_ENABLE();
|
||||
/* RTC clock enable */
|
||||
__HAL_RCC_RTC_ENABLE();
|
||||
|
||||
/* RTC interrupt Init */
|
||||
HAL_NVIC_SetPriority(RTC_IRQn, 0, 0);
|
||||
HAL_NVIC_EnableIRQ(RTC_IRQn);
|
||||
/* USER CODE BEGIN RTC_MspInit 1 */
|
||||
|
||||
/* USER CODE END RTC_MspInit 1 */
|
||||
@@ -119,6 +114,9 @@ void HAL_RTC_MspDeInit(RTC_HandleTypeDef* rtcHandle)
|
||||
/* USER CODE END RTC_MspDeInit 0 */
|
||||
/* Peripheral clock disable */
|
||||
__HAL_RCC_RTC_DISABLE();
|
||||
|
||||
/* RTC interrupt Deinit */
|
||||
HAL_NVIC_DisableIRQ(RTC_IRQn);
|
||||
/* USER CODE BEGIN RTC_MspDeInit 1 */
|
||||
|
||||
/* USER CODE END RTC_MspDeInit 1 */
|
||||
|
||||
@@ -56,6 +56,7 @@
|
||||
/* USER CODE END 0 */
|
||||
|
||||
/* External variables --------------------------------------------------------*/
|
||||
extern RTC_HandleTypeDef hrtc;
|
||||
extern TIM_HandleTypeDef htim1;
|
||||
extern TIM_HandleTypeDef htim2;
|
||||
extern UART_HandleTypeDef huart1;
|
||||
@@ -203,6 +204,20 @@ void SysTick_Handler(void)
|
||||
/* please refer to the startup file (startup_stm32f1xx.s). */
|
||||
/******************************************************************************/
|
||||
|
||||
/**
|
||||
* @brief This function handles RTC global interrupt.
|
||||
*/
|
||||
void RTC_IRQHandler(void)
|
||||
{
|
||||
/* USER CODE BEGIN RTC_IRQn 0 */
|
||||
|
||||
/* USER CODE END RTC_IRQn 0 */
|
||||
HAL_RTCEx_RTCIRQHandler(&hrtc);
|
||||
/* USER CODE BEGIN RTC_IRQn 1 */
|
||||
|
||||
/* USER CODE END RTC_IRQn 1 */
|
||||
}
|
||||
|
||||
/**
|
||||
* @brief This function handles TIM1 break interrupt.
|
||||
*/
|
||||
|
||||
@@ -145,7 +145,7 @@
|
||||
<SetRegEntry>
|
||||
<Number>0</Number>
|
||||
<Key>ST-LINKIII-KEIL_SWO</Key>
|
||||
<Name>-U37FF71064E57343625581443 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F103C6$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
|
||||
<Name>-U37FF71064E57343625581443 -O2254 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL08000 -FP0($$Device:STM32F103C6$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
|
||||
</SetRegEntry>
|
||||
</TargetDriverDllRegistry>
|
||||
<Breakpoint/>
|
||||
@@ -168,52 +168,87 @@
|
||||
<Ww>
|
||||
<count>3</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>MB_DATA,0x0A</ItemText>
|
||||
<ItemText>hmodbus1</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>4</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>hmodbus1</ItemText>
|
||||
<ItemText>hiwdg</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>5</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>hiwdg</ItemText>
|
||||
<ItemText>OW</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>6</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>OW</ItemText>
|
||||
<ItemText>_debug_init</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>7</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>init</ItemText>
|
||||
<ItemText>htim1,0x0A</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>8</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>htim1,0x0A</ItemText>
|
||||
<ItemText>DS18B20_DEVICE_AMOUNT</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>9</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>DS18B20_DEVICE_AMOUNT</ItemText>
|
||||
<ItemText>set_temp_old</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>10</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>set_temp_old</ItemText>
|
||||
<ItemText>hrtc.Instance,0x0A</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>11</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>MB_DATA.Coils.coils</ItemText>
|
||||
<ItemText>\\john103C6T6\../Modbus/modbus.c\MB_DATA,0x0A</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>12</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>hrtc.Instance,0x0A</ItemText>
|
||||
<ItemText>sTime</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>13</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>ralay_5v_on_var</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>14</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>MB_DATA.Coils.coils[1].state_val_bit.state_val_01,0x0A</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>15</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>MODBUS_MSG</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>16</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>RS_RES</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>17</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>rx_buffer</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>18</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>RS_msg</ItemText>
|
||||
</Ww>
|
||||
<Ww>
|
||||
<count>19</count>
|
||||
<WinNumber>1</WinNumber>
|
||||
<ItemText>pMessagePtr</ItemText>
|
||||
</Ww>
|
||||
</WatchWindow1>
|
||||
<WatchWindow2>
|
||||
@@ -231,7 +266,7 @@
|
||||
<periodic>1</periodic>
|
||||
<aLwin>1</aLwin>
|
||||
<aCover>0</aCover>
|
||||
<aSer1>0</aSer1>
|
||||
<aSer1>1</aSer1>
|
||||
<aSer2>0</aSer2>
|
||||
<aPa>0</aPa>
|
||||
<viewmode>1</viewmode>
|
||||
@@ -266,38 +301,6 @@
|
||||
<pSingCmdsp></pSingCmdsp>
|
||||
<pMultCmdsp></pMultCmdsp>
|
||||
<SystemViewers>
|
||||
<Entry>
|
||||
<Name>System Viewer\GPIOA</Name>
|
||||
<WinId>35904</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\GPIOB</Name>
|
||||
<WinId>35900</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\IWDG</Name>
|
||||
<WinId>35905</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\PWR</Name>
|
||||
<WinId>35899</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\RCC</Name>
|
||||
<WinId>35898</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\RTC</Name>
|
||||
<WinId>35897</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\TIM1</Name>
|
||||
<WinId>35903</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\TIM2</Name>
|
||||
<WinId>35901</WinId>
|
||||
</Entry>
|
||||
<Entry>
|
||||
<Name>System Viewer\USART1</Name>
|
||||
<WinId>35902</WinId>
|
||||
@@ -391,7 +394,7 @@
|
||||
<GroupNumber>2</GroupNumber>
|
||||
<FileNumber>6</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>1</tvExp>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>..\Core\Src\ow_port.c</PathWithFileName>
|
||||
|
||||
@@ -17,8 +17,8 @@
|
||||
<TargetCommonOption>
|
||||
<Device>STM32F103C6</Device>
|
||||
<Vendor>STMicroelectronics</Vendor>
|
||||
<PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
|
||||
<PackURL>http://www.keil.com/pack/</PackURL>
|
||||
<PackID>Keil.STM32F1xx_DFP.2.4.1</PackID>
|
||||
<PackURL>https://www.keil.com/pack/</PackURL>
|
||||
<Cpu>IRAM(0x20000000-0x200027FF) IROM(0x8000000-0x8007FFF) CLOCK(8000000) CPUTYPE("Cortex-M3") TZ</Cpu>
|
||||
<FlashUtilSpec></FlashUtilSpec>
|
||||
<StartupFile></StartupFile>
|
||||
@@ -138,7 +138,7 @@
|
||||
<DriverSelection>4101</DriverSelection>
|
||||
</Flash1>
|
||||
<bUseTDR>1</bUseTDR>
|
||||
<Flash2>BIN\UL2V8M.DLL</Flash2>
|
||||
<Flash2>STLink\ST-LINKIII-KEIL_SWO.dll</Flash2>
|
||||
<Flash3>"" ()</Flash3>
|
||||
<Flash4></Flash4>
|
||||
<pFcarmOut></pFcarmOut>
|
||||
|
||||
@@ -134,6 +134,10 @@ typedef struct
|
||||
/** @brief Structure for modbus messsage */
|
||||
typedef struct // RS_MsgTypeDef
|
||||
{
|
||||
uint16_t Transaction_ID; ///< Modbus TCP Transaction_ID
|
||||
uint16_t Protocol_ID; ///<
|
||||
uint16_t Pack_length;
|
||||
|
||||
uint8_t MbAddr; ///< Modbus Slave Address
|
||||
MB_FunctonTypeDef Func_Code; ///< Modbus Function Code
|
||||
MB_DevIdMsgTypeDef DevId; ///< Read Device Identification Header struct
|
||||
|
||||
@@ -64,16 +64,17 @@ typedef struct //MB_DataInRegsTypeDef
|
||||
typedef struct //MB_DataInRegsTypeDef
|
||||
{
|
||||
uint16_t set_Temp[MAX_SENSE];
|
||||
uint16_t set_hyst[MAX_SENSE];
|
||||
}MB_DataHoldRegsTypeDef;
|
||||
|
||||
|
||||
// DEFINES FOR INPUT REGISTERS ARRAYS
|
||||
#define R_INPUT_ADDR 0
|
||||
#define R_INPUT_QNT 10
|
||||
#define R_INPUT_QNT 40
|
||||
|
||||
// DEFINES FOR HOLDING REGISTERS ARRAYS
|
||||
#define R_HOLDING_ADDR 0
|
||||
#define R_HOLDING_QNT 10
|
||||
#define R_HOLDING_QNT 40
|
||||
|
||||
|
||||
/** MODBUS_DATA_RERISTERS_DEFINES
|
||||
@@ -108,9 +109,9 @@ typedef struct //MB_DataInRegsTypeDef
|
||||
* @brief Коилы
|
||||
* @details Желательно с помощью reserved делать стркутуру кратной 16-битам
|
||||
*/
|
||||
typedef union
|
||||
typedef union
|
||||
{
|
||||
struct {
|
||||
struct __packed {
|
||||
unsigned state_val_01:1;
|
||||
unsigned state_val_02:1;
|
||||
unsigned state_val_03:1;
|
||||
@@ -132,11 +133,11 @@ typedef union
|
||||
|
||||
|
||||
}word;
|
||||
typedef struct //MB_DataCoilsTypeDef
|
||||
typedef struct //MB_DataCoilsTypeDef
|
||||
{
|
||||
|
||||
|
||||
word coils;
|
||||
word coils[2];
|
||||
unsigned init_param:1;
|
||||
unsigned reserved:15;
|
||||
|
||||
@@ -144,7 +145,7 @@ typedef struct //MB_DataCoilsTypeDef
|
||||
|
||||
// DEFINES FOR COIL ARRAYS
|
||||
#define C_CONTROL_ADDR 0
|
||||
#define C_CONTROL_QNT 16
|
||||
#define C_CONTROL_QNT 100
|
||||
|
||||
/** MODBUS_DATA_COILS_DEFINES
|
||||
* @}
|
||||
|
||||
@@ -33,47 +33,50 @@ Mcu.IPNb=11
|
||||
Mcu.Name=STM32F103C(4-6)Tx
|
||||
Mcu.Package=LQFP48
|
||||
Mcu.Pin0=PC13-TAMPER-RTC
|
||||
Mcu.Pin1=PD0-OSC_IN
|
||||
Mcu.Pin10=PA7
|
||||
Mcu.Pin11=PB0
|
||||
Mcu.Pin12=PB1
|
||||
Mcu.Pin13=PB2
|
||||
Mcu.Pin14=PB10
|
||||
Mcu.Pin15=PB11
|
||||
Mcu.Pin16=PB12
|
||||
Mcu.Pin17=PB13
|
||||
Mcu.Pin18=PB14
|
||||
Mcu.Pin19=PB15
|
||||
Mcu.Pin2=PD1-OSC_OUT
|
||||
Mcu.Pin20=PA8
|
||||
Mcu.Pin21=PA9
|
||||
Mcu.Pin22=PA10
|
||||
Mcu.Pin23=PA11
|
||||
Mcu.Pin24=PA12
|
||||
Mcu.Pin25=PA13
|
||||
Mcu.Pin26=PA14
|
||||
Mcu.Pin27=PB3
|
||||
Mcu.Pin28=PB4
|
||||
Mcu.Pin29=PB5
|
||||
Mcu.Pin3=PA0-WKUP
|
||||
Mcu.Pin30=PB6
|
||||
Mcu.Pin31=PB7
|
||||
Mcu.Pin32=PB8
|
||||
Mcu.Pin33=PB9
|
||||
Mcu.Pin34=VP_ADC1_TempSens_Input
|
||||
Mcu.Pin35=VP_ADC1_Vref_Input
|
||||
Mcu.Pin36=VP_RTC_VS_RTC_Activate
|
||||
Mcu.Pin37=VP_RTC_VS_RTC_Calendar
|
||||
Mcu.Pin38=VP_SYS_VS_tim3
|
||||
Mcu.Pin39=VP_TIM1_VS_ClockSourceINT
|
||||
Mcu.Pin4=PA1
|
||||
Mcu.Pin40=VP_TIM2_VS_ClockSourceINT
|
||||
Mcu.Pin5=PA2
|
||||
Mcu.Pin6=PA3
|
||||
Mcu.Pin7=PA4
|
||||
Mcu.Pin8=PA5
|
||||
Mcu.Pin9=PA6
|
||||
Mcu.PinsNb=41
|
||||
Mcu.Pin1=PC14-OSC32_IN
|
||||
Mcu.Pin10=PA5
|
||||
Mcu.Pin11=PA6
|
||||
Mcu.Pin12=PA7
|
||||
Mcu.Pin13=PB0
|
||||
Mcu.Pin14=PB1
|
||||
Mcu.Pin15=PB2
|
||||
Mcu.Pin16=PB10
|
||||
Mcu.Pin17=PB11
|
||||
Mcu.Pin18=PB12
|
||||
Mcu.Pin19=PB13
|
||||
Mcu.Pin2=PC15-OSC32_OUT
|
||||
Mcu.Pin20=PB14
|
||||
Mcu.Pin21=PB15
|
||||
Mcu.Pin22=PA8
|
||||
Mcu.Pin23=PA9
|
||||
Mcu.Pin24=PA10
|
||||
Mcu.Pin25=PA11
|
||||
Mcu.Pin26=PA12
|
||||
Mcu.Pin27=PA13
|
||||
Mcu.Pin28=PA14
|
||||
Mcu.Pin29=PA15
|
||||
Mcu.Pin3=PD0-OSC_IN
|
||||
Mcu.Pin30=PB3
|
||||
Mcu.Pin31=PB4
|
||||
Mcu.Pin32=PB5
|
||||
Mcu.Pin33=PB6
|
||||
Mcu.Pin34=PB7
|
||||
Mcu.Pin35=PB8
|
||||
Mcu.Pin36=PB9
|
||||
Mcu.Pin37=VP_ADC1_TempSens_Input
|
||||
Mcu.Pin38=VP_ADC1_Vref_Input
|
||||
Mcu.Pin39=VP_RTC_VS_RTC_Activate
|
||||
Mcu.Pin4=PD1-OSC_OUT
|
||||
Mcu.Pin40=VP_RTC_VS_RTC_Calendar
|
||||
Mcu.Pin41=VP_SYS_VS_tim3
|
||||
Mcu.Pin42=VP_TIM1_VS_ClockSourceINT
|
||||
Mcu.Pin43=VP_TIM2_VS_ClockSourceINT
|
||||
Mcu.Pin5=PA0-WKUP
|
||||
Mcu.Pin6=PA1
|
||||
Mcu.Pin7=PA2
|
||||
Mcu.Pin8=PA3
|
||||
Mcu.Pin9=PA4
|
||||
Mcu.PinsNb=44
|
||||
Mcu.ThirdPartyNb=0
|
||||
Mcu.UserConstants=
|
||||
Mcu.UserName=STM32F103C6Tx
|
||||
@@ -87,6 +90,7 @@ NVIC.MemoryManagement_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
|
||||
NVIC.NonMaskableInt_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
|
||||
NVIC.PendSV_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
|
||||
NVIC.PriorityGroup=NVIC_PRIORITYGROUP_4
|
||||
NVIC.RTC_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
|
||||
NVIC.SVCall_IRQn=true\:0\:0\:false\:false\:true\:false\:false\:false
|
||||
NVIC.SysTick_IRQn=true\:15\:0\:false\:false\:true\:false\:true\:false
|
||||
NVIC.TIM1_BRK_IRQn=true\:0\:0\:false\:false\:true\:true\:true\:true
|
||||
@@ -103,6 +107,8 @@ PA0-WKUP.Locked=true
|
||||
PA0-WKUP.Signal=GPIO_Input
|
||||
PA1.Locked=true
|
||||
PA1.Signal=GPIO_Output
|
||||
PA10.GPIOParameters=GPIO_Label
|
||||
PA10.GPIO_Label=Relay_dc5v
|
||||
PA10.Locked=true
|
||||
PA10.Signal=GPIO_Output
|
||||
PA11.Mode=CAN_Activate
|
||||
@@ -113,6 +119,10 @@ PA13.Mode=Serial_Wire
|
||||
PA13.Signal=SYS_JTMS-SWDIO
|
||||
PA14.Mode=Serial_Wire
|
||||
PA14.Signal=SYS_JTCK-SWCLK
|
||||
PA15.GPIOParameters=GPIO_Label
|
||||
PA15.GPIO_Label=One_wire
|
||||
PA15.Locked=true
|
||||
PA15.Signal=GPIO_Output
|
||||
PA2.Locked=true
|
||||
PA2.Signal=GPIO_Output
|
||||
PA3.Locked=true
|
||||
@@ -161,8 +171,12 @@ PB8.Mode=I2C
|
||||
PB8.Signal=I2C1_SCL
|
||||
PB9.Mode=I2C
|
||||
PB9.Signal=I2C1_SDA
|
||||
PC13-TAMPER-RTC.Mode=Tamper
|
||||
PC13-TAMPER-RTC.Signal=RTC_TAMPER
|
||||
PC13-TAMPER-RTC.Mode=RTC OUT
|
||||
PC13-TAMPER-RTC.Signal=RTC_OUT
|
||||
PC14-OSC32_IN.Mode=LSE-External-Oscillator
|
||||
PC14-OSC32_IN.Signal=RCC_OSC32_IN
|
||||
PC15-OSC32_OUT.Mode=LSE-External-Oscillator
|
||||
PC15-OSC32_OUT.Signal=RCC_OSC32_OUT
|
||||
PD0-OSC_IN.Mode=HSE-External-Oscillator
|
||||
PD0-OSC_IN.Signal=RCC_OSC_IN
|
||||
PD1-OSC_OUT.Mode=HSE-External-Oscillator
|
||||
@@ -198,7 +212,7 @@ ProjectManager.ToolChainLocation=
|
||||
ProjectManager.UAScriptAfterPath=
|
||||
ProjectManager.UAScriptBeforePath=
|
||||
ProjectManager.UnderRoot=false
|
||||
ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM1_Init-TIM1-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM2_Init-TIM2-false-HAL-true,6-MX_ADC1_Init-ADC1-false-HAL-true
|
||||
ProjectManager.functionlistsort=1-SystemClock_Config-RCC-false-HAL-false,2-MX_GPIO_Init-GPIO-false-HAL-true,3-MX_TIM1_Init-TIM1-false-HAL-true,4-MX_USART1_UART_Init-USART1-false-HAL-true,5-MX_TIM2_Init-TIM2-false-HAL-true,6-MX_ADC1_Init-ADC1-false-HAL-true,7-MX_CAN_Init-CAN-false-HAL-true,8-MX_I2C1_Init-I2C1-false-HAL-true,9-MX_RTC_Init-RTC-false-HAL-true,10-MX_SPI1_Init-SPI1-false-HAL-true
|
||||
RCC.ADCFreqValue=12000000
|
||||
RCC.ADCPresc=RCC_ADCPCLK2_DIV6
|
||||
RCC.AHBFreq_Value=72000000
|
||||
@@ -222,8 +236,10 @@ RCC.TimSysFreq_Value=72000000
|
||||
RCC.USBFreq_Value=48000000
|
||||
RCC.USBPrescaler=RCC_USBCLKSOURCE_PLL_DIV1_5
|
||||
RCC.VCOOutput2Freq_Value=8000000
|
||||
SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_2
|
||||
SPI1.CalculateBaudRate=36.0 MBits/s
|
||||
RTC.IPParameters=OutPut
|
||||
RTC.OutPut=RTC_OUTPUTSOURCE_SECOND
|
||||
SPI1.BaudRatePrescaler=SPI_BAUDRATEPRESCALER_4
|
||||
SPI1.CalculateBaudRate=18.0 MBits/s
|
||||
SPI1.Direction=SPI_DIRECTION_2LINES
|
||||
SPI1.IPParameters=VirtualType,Mode,Direction,BaudRatePrescaler,CalculateBaudRate
|
||||
SPI1.Mode=SPI_MODE_MASTER
|
||||
|
||||
1
labview_john/labview_proj
Submodule
1
labview_john/labview_proj
Submodule
Submodule labview_john/labview_proj added at fcba827e91
1
labview_proj
Submodule
1
labview_proj
Submodule
Submodule labview_proj added at fcba827e91
BIN
modbus_master.vi
BIN
modbus_master.vi
Binary file not shown.
BIN
schem.pdsprj
Normal file
BIN
schem.pdsprj
Normal file
Binary file not shown.
37
schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace
Normal file
37
schem.pdsprj.DESKTOP-FJP9EG2.friman.workspace
Normal file
@@ -0,0 +1,37 @@
|
||||
<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
|
||||
<WORKSPACE>
|
||||
<FRAME activewindow="0">
|
||||
<PLACEMENT>2c0000000200000003000000ffffffffffffffffffffffffffffffff70f6ffffb1000000bcfeffff07060000</PLACEMENT>
|
||||
<WINDOW type="default" module="ISIS">
|
||||
<editor metric="0" gridmajor="2540000" mode="00000001" zoom="0" scale="126" flipped="0" gridminor="254000" gridmode="32" snapidx="1" snap="127000" xcursor="0" orgmode="0" snaprange="100793">
|
||||
<world y1="-8890000" x1="-12700000" y2="8890000" x2="12700000"/>
|
||||
<centre x="0" y="0"/>
|
||||
<origin x="0" y="0"/>
|
||||
</editor>
|
||||
</WINDOW>
|
||||
<WINDOW type="default" module="ARES">
|
||||
<editor metric="1" gridmajor="10000000" mode="00000000" zoom="-1" scale="82" flipped="0" gridminor="250000" gridmode="32" snapidx="3" snap="250000" xcursor="0" orgmode="0" snaprange="154878">
|
||||
<world y1="-12700000" x1="-15240000" y2="12700000" x2="15240000"/>
|
||||
<centre x="0" y="0"/>
|
||||
<origin x="0" y="0"/>
|
||||
</editor>
|
||||
</WINDOW>
|
||||
</FRAME>
|
||||
<MODULE name="ARES">
|
||||
<editor metric="1" gridmajor="10000000" mode="00000000" zoom="-1" scale="82" flipped="0" gridminor="250000" gridmode="32" snapidx="3" snap="250000" xcursor="0" orgmode="0" snaprange="154878">
|
||||
<world y1="-12700000" x1="-15240000" y2="12700000" x2="15240000"/>
|
||||
<centre x="0" y="0"/>
|
||||
<origin x="0" y="0"/>
|
||||
</editor>
|
||||
</MODULE>
|
||||
<MODULE name="ISIS">
|
||||
<editor metric="0" gridmajor="2540000" mode="00000001" zoom="0" scale="126" flipped="0" gridminor="254000" gridmode="32" snapidx="1" snap="127000" xcursor="0" orgmode="0" snaprange="100793">
|
||||
<world y1="-8890000" x1="-12700000" y2="8890000" x2="12700000"/>
|
||||
<centre x="0" y="0"/>
|
||||
<origin x="0" y="0"/>
|
||||
</editor>
|
||||
</MODULE>
|
||||
<MODULE name="VSMDEBUG">
|
||||
<PWI/>
|
||||
</MODULE>
|
||||
</WORKSPACE>
|
||||
BIN
termDallas.vi
BIN
termDallas.vi
Binary file not shown.
Reference in New Issue
Block a user