diff --git a/SLCan_whithDLL/READ_INI.vi b/SLCan_whithDLL/READ_INI.vi index 1c45f17..d463504 100644 Binary files a/SLCan_whithDLL/READ_INI.vi and b/SLCan_whithDLL/READ_INI.vi differ diff --git a/SLCan_whithDLL/main_project.vi b/SLCan_whithDLL/main_project.vi index 92c25ea..84a6b5e 100644 Binary files a/SLCan_whithDLL/main_project.vi and b/SLCan_whithDLL/main_project.vi differ diff --git a/SLCan_whithDLL/setup.ini b/SLCan_whithDLL/setup.ini index 034c5ea..056b8a0 100644 --- a/SLCan_whithDLL/setup.ini +++ b/SLCan_whithDLL/setup.ini @@ -1,10 +1,24 @@ +; Настройки для COM-порта (RS232) + +[RS232] +Port = COM3 +Baud Rate = 115200 +Data Bits = 8 +Parity = None +Stop Bits = 1.0 +Flow Control = None +VISA Timeout = 10000 +; Настройки для CAN интерфейса + [CAN] -BaudRate = 115200 +Interface = PCIe-8512/2 +Channel = 0 +Baud Rate = 1000 Mode = Normal -BitRateIndex = 0x8003 -Timeout = 1000 +Request Timeout = 5000 +; Общие настройки устройства [Device] -Port = "com1" -DeviceID = 0 -MaxRetries = 3 \ No newline at end of file +Name = STM32F103 +ID = 001 +LastConfig = 2023-11-15 \ No newline at end of file diff --git a/SLCan_whithDLL/slcan.lvproj b/SLCan_whithDLL/slcan.lvproj index 5dc9837..ef5102d 100644 --- a/SLCan_whithDLL/slcan.lvproj +++ b/SLCan_whithDLL/slcan.lvproj @@ -11,12 +11,22 @@ true false + - + + + + + + + + + + diff --git a/SLCan_whithDLL/test_ini.ini b/SLCan_whithDLL/test_ini.ini new file mode 100644 index 0000000..2e49793 --- /dev/null +++ b/SLCan_whithDLL/test_ini.ini @@ -0,0 +1,27 @@ +; Настройки для COM-порта (RS232) + +[RS232] +Port = COM3 +Baud Rate = 9600 +Data Bits = 8 +Parity = None +Stop Bits = 1.0 +Flow Control = None +VISA Timeout = 10000 +; Настройки для CAN интерфейса + +[CAN] +Interface = PCIe-8512/2 +Channel = 0 +Baud Rate = 500000 +Mode = Normal +Request Timeout = 5000 +; Общие настройки устройства + +[Device] +Name = STM32F103 +ID = 001 +LastConfig = 2023-11-15 + +[test] +pole = 65535 \ No newline at end of file