Skip to content

Commit a09d4e5

Browse files
authored
Merge pull request #6 from riptideio/New-Simu
Simulation Updates
2 parents 1fd3d22 + c5d0ab9 commit a09d4e5

File tree

15 files changed

+588
-193
lines changed

15 files changed

+588
-193
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ target/
6666

6767
#JSONFiles
6868
*.json
69+
70+
/.venv
71+
6972
**/*.ini
7073
instructions
7174
read

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Modbus Simulator
22

3-
Modbus Simulator with GUI based on modbus-tk
3+
Modbus Simulator with GUI based on modbus-tk and Pymodbus
44

55
## Checking Out the Source
66
$ git clone https://github.com/riptideio/modbus-simulator.git
@@ -16,7 +16,7 @@ Modbus Simulator with GUI based on modbus-tk
1616
$ pip install -r requirements
1717
$ # Choose Modbus Backend modbus_tk or pymodbus (default)
1818
$ # To install pymodbus
19-
$ pip install pymodbus==1.3.2
19+
$ pip install pymodbus==1.5.2
2020
$ # To install modbus tk
2121
$ Pip install modbus-tk
2222
@@ -40,7 +40,7 @@ All the settings for various modbus related settings (block size/minimum/maximun
4040
![settings_screen.png](img/settings_screen.png)
4141
4242
## Usage instructions
43-
[![Demo Modbus Simulator](/img/simu.gif)](https://youtu.be/nlu3S5jdEn4)
43+
[![Demo Modbus Simulator](/img/simu.gif)](https://www.youtube.com/watch?v=a5-OridSlt8)
4444
4545
## Packaging for different OS (Standalone applications)
4646
A standalone application specific to target OS can be created with Kivy package manager

img/simu.gif

-920 KB
Loading

modbus_simulator/main.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,12 @@
44
'''
55
import click
66
import sys
7-
import __builtin__
7+
import six
8+
9+
if six.PY2:
10+
import __builtin__
11+
else:
12+
import builtins as __builtin__
813

914

1015
@click.command()

modbus_simulator/templates/modbussimu.kv

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
size: self.width - 2 * self.margin , self.thickness
1818

1919

20-
<DataModal>:
20+
<DataModel>:
2121
<FloatInput>:
2222
<Gui>:
2323
slave_list: slave_list
@@ -254,11 +254,13 @@
254254
id: add_data
255255
text: "add"
256256
on_release: root.update_data_models(*args)
257-
Widget:
258-
Button:
259-
id: delete_data
260-
text: "delete"
261-
on_release: root.delete_data_entry(*args)
257+
# Widget:
258+
# Button:
259+
# id: delete_data
260+
# text: "delete"
261+
# disabled: True
262+
# on_release: root.delete_data_entry(*args)
263+
# hide: True
262264
Separator:
263265
TabbedPanel:
264266
id: data_model_screen
@@ -298,7 +300,7 @@
298300
id: riptide_logo
299301
with_previous: False
300302
disabled: True
301-
title: ' v1.0.0'
303+
title: ' v2.0.0'
302304
ActionOverflow:
303305
ActionButton:
304306
id: reset_simulation

0 commit comments

Comments
 (0)