Skip to content

Commit b350d7b

Browse files
load config.ini for mbus option and set_page command
1 parent 122cea0 commit b350d7b

File tree

7 files changed

+45
-28
lines changed

7 files changed

+45
-28
lines changed

mbus/example.config.ini

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
serial_port = /dev/ttyUSB0
2+
baud_rate = 2400
3+
address = 1

mbus/load_config.py

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Load config.ini if it exists
2+
def load():
3+
try:
4+
import configobj
5+
config = configobj.ConfigObj("config.ini")
6+
serial_port = config['serial_port']
7+
baud_rate = int(config['baud_rate'])
8+
address = int(config['address'])
9+
print ("Loaded settings from config.ini file")
10+
except:
11+
print ("No config.ini file found")
12+
serial_port = input("Please enter serial port (default: /dev/ttyUSB0): ") or "/dev/ttyUSB0"
13+
baud_rate = int(input("Please enter baud rate (default: 2400): ") or "2400")
14+
address = int(input("Please enter address to check (default: 0): ") or "0")
15+
16+
17+
print ("Trying to connect on port:"+str(serial_port)+" baud:"+str(baud_rate)+" address:"+str(address))
18+
return serial_port, baud_rate, address
19+
20+

mbus/mbus_app_reset.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
import sys, time
2-
3-
serial_port = input("Please enter serial port (default: /dev/ttyUSB0): ") or "/dev/ttyUSB0"
4-
baud_rate = int(input("Please enter baud rate (default: 2400): ") or "2400")
5-
6-
print ("Trying to connect on "+str(serial_port)+" "+str(baud_rate))
2+
import load_config as conf
3+
serial_port, baud_rate, address = conf.load()
74

85
sys.path.append('/opt/openenergymonitor/emonhub/src')
96
from interfacers import *
107
mbus = EmonHubMBUSInterfacer.EmonHubMBUSInterfacer("MBUS",serial_port,baud_rate)
118

12-
address = int(input("Please enter address to check (default: 0): ") or "0")
13-
149
mbus.mbus_application_reset(address)

mbus/mbus_check_address.py

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,12 @@
11
import sys, time
2-
3-
serial_port = input("Please enter serial port (default: /dev/ttyUSB0): ") or "/dev/ttyUSB0"
4-
baud_rate = int(input("Please enter baud rate (default: 2400): ") or "2400")
5-
6-
print ("Trying to connect on "+str(serial_port)+" "+str(baud_rate))
2+
import load_config as conf
3+
serial_port, baud_rate, address = conf.load()
74

85
sys.path.append('/opt/openenergymonitor/emonhub/src')
96
from interfacers import *
107
mbus = EmonHubMBUSInterfacer.EmonHubMBUSInterfacer("MBUS",serial_port,baud_rate)
118

129
while True:
13-
address = int(input("Please enter address to check (default: 0): ") or "0")
14-
1510
print ("Sending command to check meter at address "+str(address))
1611
mbus.mbus_short_frame(address, 0x40)
1712
time.sleep(1.0)
@@ -25,3 +20,5 @@
2520
if not reply:
2621
print("no reply received")
2722
sys.exit(0)
23+
24+
address = int(input("Please enter address to check (default: "+str(address)+"): ") or address)

mbus/mbus_request_data_5b.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import sys, time
2-
3-
serial_port = input("Please enter serial port (default: /dev/ttyUSB0): ") or "/dev/ttyUSB0"
4-
baud_rate = int(input("Please enter baud rate (default: 2400): ") or "2400")
5-
6-
print ("Trying to connect on "+str(serial_port)+" "+str(baud_rate))
2+
import load_config as conf
3+
serial_port, baud_rate, address = conf.load()
74

85
sys.path.append('/opt/openenergymonitor/emonhub/src')
96
from interfacers import *
107
mbus = EmonHubMBUSInterfacer.EmonHubMBUSInterfacer("MBUS",serial_port,baud_rate)
118

12-
address = int(input("Please enter address to check (default: 0): ") or "0")
13-
149
mbus.debug_data_frame = True
1510

1611
# mbus.set_page(address, 1)

mbus/mbus_request_data_7b.py

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
11
import sys, time
2-
3-
serial_port = input("Please enter serial port (default: /dev/ttyUSB0): ") or "/dev/ttyUSB0"
4-
baud_rate = int(input("Please enter baud rate (default: 2400): ") or "2400")
5-
6-
print ("Trying to connect on "+str(serial_port)+" "+str(baud_rate))
2+
import load_config as conf
3+
serial_port, baud_rate, address = conf.load()
74

85
sys.path.append('/opt/openenergymonitor/emonhub/src')
96
from interfacers import *
107
mbus = EmonHubMBUSInterfacer.EmonHubMBUSInterfacer("MBUS",serial_port,baud_rate)
118

12-
address = int(input("Please enter address to check (default: 0): ") or "0")
13-
149
mbus.debug_data_frame = True
1510

1611
# mbus.set_page(address, 1)

mbus/mbus_set_page.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
import sys, time
2+
import load_config as conf
3+
serial_port, baud_rate, address = conf.load()
4+
5+
sys.path.append('/opt/openenergymonitor/emonhub/src')
6+
from interfacers import *
7+
mbus = EmonHubMBUSInterfacer.EmonHubMBUSInterfacer("MBUS",serial_port,baud_rate)
8+
9+
page = int(input("Please enter page (default: 1): ") or "1")
10+
11+
mbus.set_page(address, page)
12+

0 commit comments

Comments
 (0)