diff --git a/configure.py b/configure.py index 106b2aa..59a3d0b 100644 --- a/configure.py +++ b/configure.py @@ -15,18 +15,20 @@ import configparser from libs3 import gstt import ast import numpy as np +import updateUI config = configparser.ConfigParser() config.read(gstt.ConfigName) qList = [ - {"q":"The server IP address","c":"General","k":"ljayserverip"}, - {"q":"How many lasers to use","c":"General","k":"lasernumber"}, - {"q":"Laser 0 IP address","c":"laser0","k":"ip"}, - {"q":"Laser 1 IP address","c":"laser1","k":"ip"}, - {"q":"Laser 2 IP address","c":"laser2","k":"ip"}, - {"q":"Laser 3 IP address","c":"laser3","k":"ip"} + {"q":"The server IP address ","c":"General","k":"ljayserverip"}, + {"q":"The IP address or domain for webui","c":"General","k":"wwwip"}, + {"q":"How many lasers to use ","c":"General","k":"lasernumber"}, + {"q":"Laser 0 IP address ","c":"laser0","k":"ip"}, + {"q":"Laser 1 IP address ","c":"laser1","k":"ip"}, + {"q":"Laser 2 IP address ","c":"laser2","k":"ip"}, + {"q":"Laser 3 IP address ","c":"laser3","k":"ip"} ] stop = False while stop == False : @@ -52,4 +54,7 @@ while stop == False : new_value = input("Please enter the new value:") config.set(choice["c"],choice["k"],new_value) config.write(open(gstt.ConfigName,'w')) + print(choice["c"],choice["k"]) + if choice["k"] == "wwwip": + updateUI.www(new_value) diff --git a/libs3/settings.py b/libs3/settings.py index 5f122b3..714d6b7 100644 --- a/libs3/settings.py +++ b/libs3/settings.py @@ -2,7 +2,7 @@ # -*- coding: utf-8 -*- # -*- mode: Python -*- ''' -LJay/LJ +LJ v0.7.0 Settings Handler diff --git a/www/LJ.js b/www/LJ.js index 3f00fc1..6d6dee4 100644 --- a/www/LJ.js +++ b/www/LJ.js @@ -4,7 +4,7 @@ // LJ websocket address. IP will be updated at LJ startup according to LJ.conf wwwIP - var LJ = 'ws://192.168.1.48:9001/' + var LJ = 'ws://192.168.2.43:9001/' // diff --git a/www/align.html b/www/align.html index 1d5ee3d..416380b 100644 --- a/www/align.html +++ b/www/align.html @@ -604,7 +604,7 @@