v/openplotter-maiana
1
0
Fork 0
mirror of https://github.com/openplotter/openplotter-maiana.git synced 2025-05-31 22:40:11 -07:00
Code Issues Projects Releases Wiki Activity

fix issue with aproving SK connection

Browse Source
This commit is contained in:
sailoog 2021-11-25 19:09:38 +01:00
parent f937948ed5
commit 2c0fcd6b35
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openplotterMaiana/maianaPreUninstall.py
View File

@ -26,7 +26,7 @@ def main():
package = 'openplotter-maiana' package = 'openplotter-maiana'
language.Language(currentdir, package, currentLanguage) language.Language(currentdir, package, currentLanguage)
print(_('Removing openplotter-maiana-read services...')) print(_('Removing openplotter-maiana-read service...'))
try: try:
subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read']) subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read'])
subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read']) subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read'])

35
openplotterMaiana/openplotterMaiana.py
View File

@ -147,6 +147,7 @@ class MyFrame(wx.Frame):
self.logger.Clear() self.logger.Clear()
self.logger2.Clear() self.logger2.Clear()
self.device = self.conf.get('MAIANA', 'device') self.device = self.conf.get('MAIANA', 'device')
self.toolbar1.EnableTool(105,False)
self.toolbar2.EnableTool(202,False) self.toolbar2.EnableTool(202,False)
self.toolbar3.EnableTool(302,False) self.toolbar3.EnableTool(302,False)
self.toolbar3.EnableTool(303,False) self.toolbar3.EnableTool(303,False)
@ -156,6 +157,25 @@ class MyFrame(wx.Frame):
availableIDs = [] availableIDs = []
selected = '' selected = ''
self.tx = False self.tx = False
skConnections = connections.Connections('MAIANA')
result = skConnections.checkConnection()
if result[0] == 'pending':
self.toolbar1.EnableTool(105,True)
self.ShowStatusBarYELLOW(result[1]+_(' Press "Approve" and then "Refresh".'))
return
elif result[0] == 'error':
self.ShowStatusBarRED(result[1])
return
elif result[0] == 'repeat':
self.ShowStatusBarYELLOW(result[1]+_(' Press "Refresh".'))
return
elif result[0] == 'permissions':
self.ShowStatusBarYELLOW(result[1]+_(' Press "Allowed".'))
return
elif result[0] == 'approved':
self.ShowStatusBarGREEN(result[1])
try: try:
setting_file = self.platform.skDir+'/settings.json' setting_file = self.platform.skDir+'/settings.json'
with open(setting_file) as data_file: with open(setting_file) as data_file:
@ -368,21 +388,6 @@ class MyFrame(wx.Frame):
if 'bowOffset' in data['station']: self.bowOffset.SetValue(str(data['station']['bowOffset']['value'])) if 'bowOffset' in data['station']: self.bowOffset.SetValue(str(data['station']['bowOffset']['value']))
if 'portOffset' in data['station']: self.portOffset.SetValue(str(data['station']['portOffset']['value'])) if 'portOffset' in data['station']: self.portOffset.SetValue(str(data['station']['portOffset']['value']))
self.toolbar1.EnableTool(105,False)
skConnections = connections.Connections('MAIANA')
result = skConnections.checkConnection()
if result[0] == 'pending':
self.toolbar1.EnableTool(105,True)
self.ShowStatusBarYELLOW(result[1]+_(' Press "Approve" and then "Refresh".'))
elif result[0] == 'error':
self.ShowStatusBarRED(result[1])
elif result[0] == 'repeat':
self.ShowStatusBarYELLOW(result[1]+_(' Press "Refresh".'))
elif result[0] == 'permissions':
self.ShowStatusBarYELLOW(result[1]+_(' Press "Allowed".'))
elif result[0] == 'approved':
self.ShowStatusBarGREEN(result[1])
if deviceOld != self.device: if deviceOld != self.device:
if self.device: if self.device:
subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart']) subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart'])