Merge pull request #675 from DJ2LS/dev-fix-modem-port

support different server ports

gui/src/components/main_startup_check.vue

@@ -126,6 +126,7 @@ function testHamlib() {
                       max="65534"
                       min="1025"
                       v-model="settings.local.port"
+                      @change="onChange"
                     />
                   </div>
 
@@ -137,6 +138,7 @@ function testHamlib() {
                       placeholder="modem host (default 127.0.0.1)"
                       id="modem_port"
                       v-model="settings.local.host"
+                      @change="onChange"
                     />
                   </div>
                 </div>

modem/config.ini.example

@@ -1,4 +1,5 @@
 [NETWORK]
+modemaddress = 127.0.0.1
 modemport = 5000
 
 [STATION]

modem/config.py

@@ -10,6 +10,7 @@ class CONFIG:
 
     config_types = {
         'NETWORK': {
+            'modemaddress': str,
             'modemport': int,
         },
         'STATION': {

modem/server.py

@@ -345,4 +345,13 @@ if __name__ == "__main__":
     # initialize database default values
     DatabaseManager(app.event_manager).initialize_default_values()
     wsm.startThreads(app)
-    app.run()
+
+    conf = app.config_manager.read()
+    modemaddress = conf['NETWORK']['modemaddress']
+    modemport = conf['NETWORK']['modemport']
+
+    if not modemaddress:
+        modemaddress = '127.0.0.1'
+    if not modemport:
+        modemport = 5000
+    app.run(modemaddress, modemport)