Merge pull request #8 from sailoog/new_layout

New layout

Author: sailoog

locale/ca/LC_MESSAGES/openplotter.mo

@@ -1,23 +1,25 @@
 [GENERAL]
-version = 1.0.0
+version = 0.2.0
 lang = en
 
 [AIS-SDR]
 gain = 49.6
-ppm = 45
+ppm = 35
 enable = 0
+channel = a
+gsm_channel = 
 
 [STARTUP]
 opencpn = 0
 opencpn_no_opengl = 0
-opencpn_fullscreen = 0
+opencpn_fullscreen = 1
 kplex = 1
-x11vnc = 0
+x11vnc = 1
 gps_time = 1
 iivbw = 0
 
 [WIFI]
 enable = 0
-device = wlan0
-password = 12345678
+device = 
+password = 
 

locale/ca/LC_MESSAGES/openplotter.po

@@ -34,6 +34,7 @@
 enable=data_conf.get('AIS-SDR', 'enable')
 gain=data_conf.get('AIS-SDR', 'gain')
 ppm=data_conf.get('AIS-SDR', 'ppm')
+channel=data_conf.get('AIS-SDR', 'channel')
 
 wifi_server=data_conf.get('WIFI', 'enable')
 wlan=data_conf.get('WIFI', 'device')
@@ -53,7 +54,9 @@
 if opencpn=='1' and len(opencpn_commands)==1: subprocess.Popen('opencpn')
 
 if enable=='1':
-	rtl_fm=subprocess.Popen(['rtl_fm', '-f', '161975000', '-g', gain, '-p', ppm, '-s', '48k'], stdout = subprocess.PIPE)
+	frecuency='161975000'
+	if channel=='b': frecuency='162025000'
+	rtl_fm=subprocess.Popen(['rtl_fm', '-f', frecuency, '-g', gain, '-p', ppm, '-s', '48k'], stdout = subprocess.PIPE)
 	aisdecoder=subprocess.Popen(['aisdecoder', '-h', '127.0.0.1', '-p', '10110', '-a', 'file', '-c', 'mono', '-d', '-f', '/dev/stdin'], stdin = rtl_fm.stdout)         
 else: 
 	subprocess.call(['pkill', '-9', 'aisdecoder'])

locale/en/LC_MESSAGES/openplotter.mo

@@ -166,16 +166,20 @@ def start(self):
 
 def main():
 
-    ppm=sys.argv[1]
+    gin=sys.argv[1]
+    ppm=sys.argv[2]
+    chn=sys.argv[3]
     if ppm=='0': ppm='1'
+    if chn=='a': frc=161.975e6
+    if chn=='b': frc=162.025e6
 
     sdr = RtlSdr()
     wf = Waterfall(sdr)
 
     # some defaults
     sdr.rs = 1e6
-    sdr.fc = 161.975e6
-    sdr.gain = 40
+    sdr.fc = frc
+    sdr.gain = float(gin)
     sdr.freq_correction = int(ppm)
 
     wf.start()