Merge branch 'v3.x.x'

README.md

@@ -14,7 +14,7 @@ Install MAIANA AIS transponder from openplotter-settings app.
 
 Install openplotter-maiana dependencies:
 
-`sudo apt install `
+`sudo apt install openplotter-signalk-installer python3-serial`
 
 Clone the repository:
 
@@ -34,11 +34,15 @@ cd ..
 sudo dpkg -i openplotter-maiana_x.x.x-xxx_all.deb
 ```
 
+Run post-installation script:
+
+`sudo maianaPostInstall`
+
 Run:
 
 `openplotter-maiana`
 
-Make your changes and repeat package and installation to test. Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://launchpad.net/~openplotter/+archive/ubuntu/openplotter).
+Pull request your changes to github and we will check and add them to the next version of the [Debian package](https://cloudsmith.io/~openplotter/repos/openplotter/packages/).
 
 ### Documentation
 

debian/changelog

@@ -1,3 +1,19 @@
+openplotter-maiana (3.1.4-stable) bullseye; urgency=medium
+
+  * Remove service and make daemon to be run by openplotter startup process
+  * Add actions for openplotter-notifications
+  * Improve firmware update process
+  * Fix errors
+  * Update translations
+
+ -- Sailoog <info@sailoog.com>  Sat, 02 Jul 2022 20:36:02 +0200
+
+openplotter-maiana (3.1.3-beta) bullseye; urgency=medium
+
+  * Beta
+
+ -- Sailoog <info@sailoog.com>  Thu, 21 Apr 2022 20:50:36 +0200
+
 openplotter-maiana (2.1.2-stable) bionic; urgency=medium
 
   * stable version

debian/control

@@ -10,6 +10,6 @@ X-Python3-Version: >= 3.2
 Package: openplotter-maiana
 Architecture: all
 Multi-Arch: foreign
-Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings (>=2.8.0), openplotter-signalk-installer (>=2.4.2), python3-serial
+Depends: ${misc:Depends}, ${python3:Depends}, openplotter-settings (>=3.2.1), openplotter-signalk-installer (>=2.4.2), python3-serial
 Description: OpenPlotter integration of the MAIANA open source AIS transponder
  OpenPlotter integration of the MAIANA open source AIS transponder

debian/copyright

@@ -3,7 +3,7 @@ Upstream-Name: openplotter-maiana
 Source: https://github.com/openplotter/openplotter-maiana
 
 Files: *
-Copyright: 2021 Sailoog <info@sailoog.com>
+Copyright: 2022 Sailoog <info@sailoog.com>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ License: GPL-2+
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
 
 Files: debian/*
-Copyright: 2021 Sailoog <info@sailoog.com>
+Copyright: 2022 Sailoog <info@sailoog.com>
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by

openplotterMaiana/actions.py

@@ -0,0 +1,39 @@
+#!/usr/bin/env python3
+
+# This file is part of OpenPlotter.
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+#
+# Openplotter is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 2 of the License, or
+# any later version.
+# Openplotter is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with Openplotter. If not, see <http://www.gnu.org/licenses/>.
+
+import os, subprocess, serial
+from openplotterSettings import language
+
+class Actions:
+	def __init__(self,conf,currentLanguage):
+		self.conf = conf
+		currentdir = os.path.dirname(os.path.abspath(__file__))
+		language.Language(currentdir,'openplotter-maiana',currentLanguage)
+		if self.conf.get('GENERAL', 'debug') == 'yes': self.debug = True
+		else: self.debug = False
+		self.available = []
+		self.available.append({'ID':'txOn','name':_('Turn MAIANA TX on'),"module": "openplotterMaiana",'data':False,'default':'','help':''})
+		self.available.append({'ID':'txOff','name':_('Turn MAIANA TX off'),"module": "openplotterMaiana",'data':False,'default':'','help':''})
+
+	def run(self,action,data):
+		try:
+			device = self.conf.get('MAIANA', 'device')
+			ser = serial.Serial(device, 38400)
+			if action == 'txOn': ser.write('tx on\r\n'.encode("utf-8"))
+			elif action == 'txOff': ser.write('tx off\r\n'.encode("utf-8"))
+		except Exception as e: 
+			if self.debug: print('Error processing openplotter-maiana actions: '+str(e))

openplotterMaiana/locale/ca/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:35+0200\n"
 "Last-Translator: \n"
 "Language-Team: Catalan\n"
 "Language: ca\n"

openplotterMaiana/locale/cs/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:35+0200\n"
 "Last-Translator: \n"
 "Language-Team: Czech\n"
 "Language: cs\n"
@@ -92,7 +92,7 @@ msgstr "Nastavuji verzi..."
 
 #: maianaPreUninstall.py:29
 msgid "Removing openplotter-maiana-read service..."
-msgstr ""
+msgstr "Odstraňuji službu openplotter-maiana-read..."
 
 #: maianaPreUninstall.py:38
 msgid "Removing version..."
@@ -104,39 +104,39 @@ msgstr "MAIANA AIS vysílač"
 
 #: openplotterMaiana.py:47
 msgid "Help"
-msgstr ""
+msgstr "Nápověda"
 
 #: openplotterMaiana.py:50 openplotterMaiana.py:69
 msgid "Settings"
-msgstr ""
+msgstr "Nastavení"
 
 #: openplotterMaiana.py:53
 msgid "Approve"
-msgstr ""
+msgstr "Schválit"
 
 #: openplotterMaiana.py:55
 msgid "Allowed"
-msgstr ""
+msgstr "Povoleno"
 
 #: openplotterMaiana.py:58
 msgid "MAIANA Signal K connection"
-msgstr ""
+msgstr "MAIANA připojení k Signal K"
 
 #: openplotterMaiana.py:62
 msgid "Connections"
-msgstr ""
+msgstr "Připojení"
 
 #: openplotterMaiana.py:70
 msgid "Firmware"
-msgstr ""
+msgstr "Firmware"
 
 #: openplotterMaiana.py:138
 msgid "Reading MAIANA device settings..."
-msgstr ""
+msgstr "Čtení nastavení MAIANA zařízení..."
 
 #: openplotterMaiana.py:195
 msgid "Select the Signal K connection for the MAIANA device"
-msgstr ""
+msgstr "Vyberte připojení Signal K pro zařízení MAIANA"
 
 #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244
 msgid "Cannot connect with the device, try again"
@@ -152,151 +152,151 @@ msgstr "Verze firmwaru vašeho zařízení MAIANA je příliš stará"
 
 #: openplotterMaiana.py:246
 msgid "Done"
-msgstr ""
+msgstr "Hotovo"
 
 #: openplotterMaiana.py:249
 msgid "Hardware revision"
-msgstr ""
+msgstr "Verze hardware"
 
 #: openplotterMaiana.py:252
 msgid "Firmware revision"
-msgstr ""
+msgstr "Verze firmware"
 
 #: openplotterMaiana.py:255
 msgid "Type of MCU"
-msgstr ""
+msgstr "Typ MCU"
 
 #: openplotterMaiana.py:258
 msgid "Serial number"
-msgstr ""
+msgstr "Sériové číslo"
 
 #: openplotterMaiana.py:263
 msgid "Transmitter hardware module"
-msgstr ""
+msgstr "Hardwarový modul vysílače"
 
 #: openplotterMaiana.py:268
 msgid "present"
-msgstr ""
+msgstr "přítomný"
 
 #: openplotterMaiana.py:271
 msgid "not present"
-msgstr ""
+msgstr "není k dispozici"
 
 #: openplotterMaiana.py:274
 msgid "Hardware TX switch"
-msgstr ""
+msgstr "Hardwarový přepínač TX"
 
 #: openplotterMaiana.py:279 openplotterMaiana.py:291
 msgid "ON"
-msgstr ""
+msgstr "ZAP"
 
 #: openplotterMaiana.py:282 openplotterMaiana.py:296
 msgid "OFF"
-msgstr ""
+msgstr "VYP"
 
 #: openplotterMaiana.py:285 openplotterMaiana.py:461
 msgid "Software TX switch"
-msgstr ""
+msgstr "Softwarový přepínač TX"
 
 #: openplotterMaiana.py:300
 msgid "Station data"
-msgstr ""
+msgstr "Data stanice"
 
 #: openplotterMaiana.py:305
 msgid "provided"
-msgstr ""
+msgstr "nastavena"
 
 #: openplotterMaiana.py:308
 msgid "not provided"
-msgstr ""
+msgstr "nenastavena"
 
 #: openplotterMaiana.py:311
 msgid "Status"
-msgstr ""
+msgstr "Stav"
 
 #: openplotterMaiana.py:316
 msgid "transmitting"
-msgstr ""
+msgstr "vysílá"
 
 #: openplotterMaiana.py:319
 msgid "not transmitting"
-msgstr ""
+msgstr "nevysílá"
 
 #: openplotterMaiana.py:322
 msgid "Channel A latest transmitted message"
-msgstr ""
+msgstr "Nejnovější zpráva kanálu A"
 
 #: openplotterMaiana.py:328 openplotterMaiana.py:341
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: openplotterMaiana.py:332 openplotterMaiana.py:344
 msgid "Time"
-msgstr ""
+msgstr "Čas"
 
 #: openplotterMaiana.py:335
 msgid "Channel B latest transmitted message"
-msgstr ""
+msgstr "Nejnovější zpráva kanálu B"
 
 #: openplotterMaiana.py:347
 msgid "Channel A noise floor"
-msgstr ""
+msgstr "Kanál A úroveň šumu"
 
 #: openplotterMaiana.py:352
 msgid "Channel B noise floor"
-msgstr ""
+msgstr "Kanál B úroveň šumu"
 
 #: openplotterMaiana.py:376
 msgid " Press \"Approve\" and then \"Refresh\"."
-msgstr ""
+msgstr " Stiskněte \"Schválit\" a pak \"Obnovit\"."
 
 #: openplotterMaiana.py:380
 msgid " Press \"Refresh\"."
-msgstr ""
+msgstr " Stiskněte Aktualizovat."
 
 #: openplotterMaiana.py:382
 msgid " Press \"Allowed\"."
-msgstr ""
+msgstr " Stiskněte \"Povoleno\"."
 
 #: openplotterMaiana.py:439
 msgid "MMSI"
-msgstr ""
+msgstr "MMSI"
 
 #: openplotterMaiana.py:441
 msgid "Vessel name"
-msgstr ""
+msgstr "Název plavidla"
 
 #: openplotterMaiana.py:443
 msgid "Call sign"
-msgstr ""
+msgstr "Volací značka"
 
 #: openplotterMaiana.py:445
 msgid "Vessel type"
-msgstr ""
+msgstr "Druh plavidla"
 
 #: openplotterMaiana.py:447
 msgid "LOA"
-msgstr ""
+msgstr "LOA"
 
 #: openplotterMaiana.py:449
 msgid "Beam"
-msgstr ""
+msgstr "Šířka"
 
 #: openplotterMaiana.py:451
 msgid "Port Offset"
-msgstr ""
+msgstr "GPS offset zleva"
 
 #: openplotterMaiana.py:453
 msgid "Bow Offset"
-msgstr ""
+msgstr "GPS offset zepředu"
 
 #: openplotterMaiana.py:455
 msgid "Units: meters"
-msgstr ""
+msgstr "Jednotky: metry"
 
 #: openplotterMaiana.py:458 openplotterMaiana.py:575
 msgid "Refresh"
-msgstr ""
+msgstr "Aktualizovat"
 
 #: openplotterMaiana.py:464
 msgid "Detect noise"
@@ -304,39 +304,39 @@ msgstr "Detekovat šum"
 
 #: openplotterMaiana.py:467
 msgid "Save station data"
-msgstr ""
+msgstr "Uložit data stanice"
 
 #: openplotterMaiana.py:514
 msgid "Invalid MMSI"
-msgstr ""
+msgstr "Neplatné MMSI"
 
 #: openplotterMaiana.py:520
 msgid "Invalid vessel name"
-msgstr ""
+msgstr "Neplatné jméno plavidla"
 
 #: openplotterMaiana.py:525
 msgid "Invalid call sign"
-msgstr ""
+msgstr "Neplatná volací značka"
 
 #: openplotterMaiana.py:534
 msgid "Invalid vessel type"
-msgstr ""
+msgstr "Neplatný typ plavidla"
 
 #: openplotterMaiana.py:539
 msgid "Invalid LOA"
-msgstr ""
+msgstr "Neplatné LOA"
 
 #: openplotterMaiana.py:544
 msgid "Invalid Beam"
-msgstr ""
+msgstr "Neplatná šířka"
 
 #: openplotterMaiana.py:549
 msgid "Invalid bow offset"
-msgstr ""
+msgstr "Neplatný GPS offset zepředu"
 
 #: openplotterMaiana.py:554
 msgid "Invalid port offset"
-msgstr ""
+msgstr "Neplatný GPS offset zleva"
 
 #: openplotterMaiana.py:578
 msgid "Update firmware"
@@ -386,24 +386,24 @@ msgstr "V blízkosti antény AIS může docházet k elektromagnetickému rušen
 
 #: startup.py:43
 msgid "Checking MAIANA transponder..."
-msgstr ""
+msgstr "Kontrola MAIANA odpovídače..."
 
 #: startup.py:53
 msgid "There is no MAIANA device defined"
-msgstr ""
+msgstr "Není definováno žádné MAIANA zařízení"
 
 #: startup.py:57
 msgid "MAIANA device"
-msgstr ""
+msgstr "MAIANA zařízení"
 
 #: startup.py:68
 msgid "Access to Signal K server validated"
-msgstr ""
+msgstr "Přístup k serveru Signal K byl ověřen"
 
 #: startup.py:76 startup.py:86
 msgid "OpenPlotter MAIANA service is running"
-msgstr ""
+msgstr "OpenPlotter MAIANA služba je spuštěna"
 
 #: startup.py:80 startup.py:90
 msgid "OpenPlotter MAIANA service is not running"
-msgstr ""
+msgstr "Služba OpenPlotter MAIANA není spuštěna"

openplotterMaiana/locale/da/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:35+0200\n"
 "Last-Translator: \n"
 "Language-Team: Danish\n"
 "Language: da\n"

openplotterMaiana/locale/de/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: German\n"
 "Language: de\n"

openplotterMaiana/locale/el/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Greek\n"
 "Language: el\n"

openplotterMaiana/locale/en/LC_MESSAGES/openplotter-maiana.po

@@ -1,8 +1,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: openplotter-maiana\n"
-"POT-Creation-Date: 2021-11-25 17:49+0100\n"
+"POT-Creation-Date: 2022-05-21 21:09+0200\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: \n"
 "Language: en\n"
@@ -15,6 +15,14 @@ msgstr ""
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-SearchPath-0: .\n"
 
+#: actions.py:29
+msgid "Turn MAIANA TX on"
+msgstr ""
+
+#: actions.py:30
+msgid "Turn MAIANA TX off"
+msgstr ""
+
 #: data/openplotter-maiana.desktop:3
 msgid "MAIANA AIS"
 msgstr ""
@@ -63,33 +71,33 @@ msgstr ""
 msgid "Starting transfer"
 msgstr ""
 
-#: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46
+#: fwupdate.py:136 maianaPostInstall.py:34 maianaPostInstall.py:43
-#: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42
+#: maianaPostInstall.py:49 maianaPreUninstall.py:33 maianaPreUninstall.py:39
 msgid "FAILED: "
 msgstr ""
 
 #: maianaPostInstall.py:30
-msgid "Checking access to Signal K server..."
+msgid "Installing python packages..."
 msgstr ""
 
-#: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51
+#: maianaPostInstall.py:33 maianaPostInstall.py:42 maianaPostInstall.py:48
-#: maianaPreUninstall.py:35 maianaPreUninstall.py:41
+#: maianaPreUninstall.py:32 maianaPreUninstall.py:38
 msgid "DONE"
 msgstr ""
 
-#: maianaPostInstall.py:39
+#: maianaPostInstall.py:36
-msgid "Adding openplotter-maiana-read service..."
+msgid "Checking access to Signal K server..."
 msgstr ""
 
-#: maianaPostInstall.py:48
+#: maianaPostInstall.py:45
 msgid "Setting version..."
 msgstr ""
 
 #: maianaPreUninstall.py:29
-msgid "Removing openplotter-maiana-read service..."
+msgid "Stopping OpenPlotter MAIANA service..."
 msgstr ""
 
-#: maianaPreUninstall.py:38
+#: maianaPreUninstall.py:35
 msgid "Removing version..."
 msgstr ""
 
@@ -125,231 +133,247 @@ msgstr ""
 msgid "Firmware"
 msgstr ""
 
-#: openplotterMaiana.py:138
+#: openplotterMaiana.py:143
 msgid "Reading MAIANA device settings..."
 msgstr ""
 
-#: openplotterMaiana.py:195
+#: openplotterMaiana.py:170
-msgid "Select the Signal K connection for the MAIANA device"
-msgstr ""
-
-#: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244
-msgid "Cannot connect with the device, try again"
-msgstr ""
-
-#: openplotterMaiana.py:219 openplotterMaiana.py:222
-msgid "The hardware version of your MAIANA device is too old"
-msgstr ""
-
-#: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233
-msgid "The firmware version of your MAIANA device is too old"
-msgstr ""
-
-#: openplotterMaiana.py:246
-msgid "Done"
-msgstr ""
-
-#: openplotterMaiana.py:249
-msgid "Hardware revision"
-msgstr ""
-
-#: openplotterMaiana.py:252
-msgid "Firmware revision"
-msgstr ""
-
-#: openplotterMaiana.py:255
-msgid "Type of MCU"
-msgstr ""
-
-#: openplotterMaiana.py:258
-msgid "Serial number"
-msgstr ""
-
-#: openplotterMaiana.py:263
-msgid "Transmitter hardware module"
-msgstr ""
-
-#: openplotterMaiana.py:268
-msgid "present"
-msgstr ""
-
-#: openplotterMaiana.py:271
-msgid "not present"
-msgstr ""
-
-#: openplotterMaiana.py:274
-msgid "Hardware TX switch"
-msgstr ""
-
-#: openplotterMaiana.py:279 openplotterMaiana.py:291
-msgid "ON"
-msgstr ""
-
-#: openplotterMaiana.py:282 openplotterMaiana.py:296
-msgid "OFF"
-msgstr ""
-
-#: openplotterMaiana.py:285 openplotterMaiana.py:461
-msgid "Software TX switch"
-msgstr ""
-
-#: openplotterMaiana.py:300
-msgid "Station data"
-msgstr ""
-
-#: openplotterMaiana.py:305
-msgid "provided"
-msgstr ""
-
-#: openplotterMaiana.py:308
-msgid "not provided"
-msgstr ""
-
-#: openplotterMaiana.py:311
-msgid "Status"
-msgstr ""
-
-#: openplotterMaiana.py:316
-msgid "transmitting"
-msgstr ""
-
-#: openplotterMaiana.py:319
-msgid "not transmitting"
-msgstr ""
-
-#: openplotterMaiana.py:322
-msgid "Channel A latest transmitted message"
-msgstr ""
-
-#: openplotterMaiana.py:328 openplotterMaiana.py:341
-msgid "Type"
-msgstr ""
-
-#: openplotterMaiana.py:332 openplotterMaiana.py:344
-msgid "Time"
-msgstr ""
-
-#: openplotterMaiana.py:335
-msgid "Channel B latest transmitted message"
-msgstr ""
-
-#: openplotterMaiana.py:347
-msgid "Channel A noise floor"
-msgstr ""
-
-#: openplotterMaiana.py:352
-msgid "Channel B noise floor"
-msgstr ""
-
-#: openplotterMaiana.py:376
 msgid " Press \"Approve\" and then \"Refresh\"."
 msgstr ""
 
-#: openplotterMaiana.py:380
+#: openplotterMaiana.py:176
 msgid " Press \"Refresh\"."
 msgstr ""
 
-#: openplotterMaiana.py:382
+#: openplotterMaiana.py:179
 msgid " Press \"Allowed\"."
 msgstr ""
 
-#: openplotterMaiana.py:439
+#: openplotterMaiana.py:222
-msgid "MMSI"
+msgid "Select the Signal K connection for the MAIANA device"
 msgstr ""
 
-#: openplotterMaiana.py:441
+#: openplotterMaiana.py:250 openplotterMaiana.py:278 openplotterMaiana.py:281
-msgid "Vessel name"
+msgid "Cannot connect with the device, try again"
 msgstr ""
 
-#: openplotterMaiana.py:443
+#: openplotterMaiana.py:256 openplotterMaiana.py:259
-msgid "Call sign"
+msgid "The hardware version of your MAIANA device is too old"
 msgstr ""
 
-#: openplotterMaiana.py:445
+#: openplotterMaiana.py:264 openplotterMaiana.py:267 openplotterMaiana.py:270
-msgid "Vessel type"
+msgid "The firmware version of your MAIANA device is too old"
 msgstr ""
 
-#: openplotterMaiana.py:447
+#: openplotterMaiana.py:283
-msgid "LOA"
+msgid "Done"
 msgstr ""
 
-#: openplotterMaiana.py:449
+#: openplotterMaiana.py:286
-msgid "Beam"
+msgid "Hardware revision"
+msgstr ""
+
+#: openplotterMaiana.py:291
+msgid "Firmware revision"
+msgstr ""
+
+#: openplotterMaiana.py:295
+msgid "Type of MCU"
+msgstr ""
+
+#: openplotterMaiana.py:300
+msgid "Serial number"
+msgstr ""
+
+#: openplotterMaiana.py:305
+msgid "Transmitter hardware module"
+msgstr ""
+
+#: openplotterMaiana.py:310
+msgid "present"
+msgstr ""
+
+#: openplotterMaiana.py:313
+msgid "not present"
+msgstr ""
+
+#: openplotterMaiana.py:316
+msgid "Hardware TX switch"
+msgstr ""
+
+#: openplotterMaiana.py:321 openplotterMaiana.py:333
+msgid "ON"
+msgstr ""
+
+#: openplotterMaiana.py:324 openplotterMaiana.py:338
+msgid "OFF"
+msgstr ""
+
+#: openplotterMaiana.py:327 openplotterMaiana.py:473
+msgid "Software TX switch"
+msgstr ""
+
+#: openplotterMaiana.py:342
+msgid "Station data"
+msgstr ""
+
+#: openplotterMaiana.py:347
+msgid "provided"
+msgstr ""
+
+#: openplotterMaiana.py:350
+msgid "not provided"
+msgstr ""
+
+#: openplotterMaiana.py:353
+msgid "Status"
+msgstr ""
+
+#: openplotterMaiana.py:358
+msgid "transmitting"
+msgstr ""
+
+#: openplotterMaiana.py:361
+msgid "not transmitting"
+msgstr ""
+
+#: openplotterMaiana.py:364
+msgid "Channel A latest transmitted message"
+msgstr ""
+
+#: openplotterMaiana.py:370 openplotterMaiana.py:383
+msgid "Type"
+msgstr ""
+
+#: openplotterMaiana.py:374 openplotterMaiana.py:386
+msgid "Time"
+msgstr ""
+
+#: openplotterMaiana.py:377
+msgid "Channel B latest transmitted message"
+msgstr ""
+
+#: openplotterMaiana.py:389
+msgid "Channel A noise floor"
+msgstr ""
+
+#: openplotterMaiana.py:394
+msgid "Channel B noise floor"
 msgstr ""
 
 #: openplotterMaiana.py:451
-msgid "Port Offset"
+msgid "MMSI"
 msgstr ""
 
 #: openplotterMaiana.py:453
-msgid "Bow Offset"
+msgid "Vessel name"
 msgstr ""
 
 #: openplotterMaiana.py:455
-msgid "Units: meters"
+msgid "Call sign"
 msgstr ""
 
-#: openplotterMaiana.py:458 openplotterMaiana.py:575
+#: openplotterMaiana.py:457
-msgid "Refresh"
+msgid "Vessel type"
 msgstr ""
 
-#: openplotterMaiana.py:464
+#: openplotterMaiana.py:459
-msgid "Detect noise"
+msgid "LOA"
+msgstr ""
+
+#: openplotterMaiana.py:461
+msgid "Beam"
+msgstr ""
+
+#: openplotterMaiana.py:463
+msgid "Port Offset"
+msgstr ""
+
+#: openplotterMaiana.py:465
+msgid "Bow Offset"
 msgstr ""
 
 #: openplotterMaiana.py:467
+msgid "Units: meters"
+msgstr ""
+
+#: openplotterMaiana.py:470 openplotterMaiana.py:587
+msgid "Refresh"
+msgstr ""
+
+#: openplotterMaiana.py:476
+msgid "Detect noise"
+msgstr ""
+
+#: openplotterMaiana.py:479
 msgid "Save station data"
 msgstr ""
 
-#: openplotterMaiana.py:514
+#: openplotterMaiana.py:526
 msgid "Invalid MMSI"
 msgstr ""
 
-#: openplotterMaiana.py:520
+#: openplotterMaiana.py:532
 msgid "Invalid vessel name"
 msgstr ""
 
-#: openplotterMaiana.py:525
+#: openplotterMaiana.py:537
 msgid "Invalid call sign"
 msgstr ""
 
-#: openplotterMaiana.py:534
+#: openplotterMaiana.py:546
 msgid "Invalid vessel type"
 msgstr ""
 
-#: openplotterMaiana.py:539
+#: openplotterMaiana.py:551
 msgid "Invalid LOA"
 msgstr ""
 
-#: openplotterMaiana.py:544
+#: openplotterMaiana.py:556
 msgid "Invalid Beam"
 msgstr ""
 
-#: openplotterMaiana.py:549
+#: openplotterMaiana.py:561
 msgid "Invalid bow offset"
 msgstr ""
 
-#: openplotterMaiana.py:554
+#: openplotterMaiana.py:566
 msgid "Invalid port offset"
 msgstr ""
 
-#: openplotterMaiana.py:578
+#: openplotterMaiana.py:591
+msgid "Download firmware"
+msgstr ""
+
+#: openplotterMaiana.py:594
 msgid "Update firmware"
 msgstr ""
 
-#: openplotterMaiana.py:591
+#: openplotterMaiana.py:611
 msgid "Choose a file"
 msgstr ""
 
-#: openplotterMaiana.py:591
+#: openplotterMaiana.py:611
 msgid "bin files"
 msgstr ""
 
-#: openplotterMaiana.py:591
+#: openplotterMaiana.py:611
 msgid "All files"
 msgstr ""
 
-#: openplotterMaiana.py:597
+#: openplotterMaiana.py:622
+msgid "MCU type mismatch: "
+msgstr ""
+
+#: openplotterMaiana.py:629
+msgid "Hardware revision mismatch: "
+msgstr ""
+
+#: openplotterMaiana.py:632
+msgid "Error processing file: "
+msgstr ""
+
+#: openplotterMaiana.py:636
 msgid ""
 "Your MAIANA device firmware will be updated, please do not disconnect or "
 "tamper with it during the update.\n"
@@ -357,19 +381,19 @@ msgid ""
 "Do you want to go ahead?"
 msgstr ""
 
-#: openplotterMaiana.py:598
+#: openplotterMaiana.py:637
 msgid "Question"
 msgstr ""
 
-#: openplotterMaiana.py:601
+#: openplotterMaiana.py:640
 msgid "Stopping Signal K server"
 msgstr ""
 
-#: openplotterMaiana.py:608
+#: openplotterMaiana.py:647
 msgid "Updating firmware, please wait... "
 msgstr ""
 
-#: openplotterMaiana.py:610
+#: openplotterMaiana.py:649
 msgid "Starting Signal K server"
 msgstr ""
 
@@ -377,26 +401,44 @@ msgstr ""
 msgid "There may be electromagnetic interference near the MAIANA AIS antenna"
 msgstr ""
 
-#: startup.py:43
+#: startup.py:29
+msgid "Starting MAIANA transponder..."
+msgstr ""
+
+#: startup.py:49
 msgid "Checking MAIANA transponder..."
 msgstr ""
 
-#: startup.py:53
+#: startup.py:59
 msgid "There is no MAIANA device defined"
 msgstr ""
 
-#: startup.py:57
+#: startup.py:63
 msgid "MAIANA device"
 msgstr ""
 
-#: startup.py:68
+#: startup.py:95
+msgid "device settings OK"
+msgstr ""
+
+#: startup.py:99
+msgid "check device settings"
+msgstr ""
+
+#: startup.py:108
+msgid ""
+"NMEA 0183 over TCP (10110) interface is disabled. Check Signal K server "
+"settings"
+msgstr ""
+
+#: startup.py:119
 msgid "Access to Signal K server validated"
 msgstr ""
 
-#: startup.py:76 startup.py:86
+#: startup.py:127 startup.py:136
-msgid "OpenPlotter MAIANA service is running"
+msgid "running"
 msgstr ""
 
-#: startup.py:80 startup.py:90
+#: startup.py:131 startup.py:140
-msgid "OpenPlotter MAIANA service is not running"
+msgid "not running"
 msgstr ""

openplotterMaiana/locale/es/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Spanish\n"
 "Language: es\n"

openplotterMaiana/locale/fi/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:44+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Finnish\n"
 "Language: fi\n"

openplotterMaiana/locale/fr/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: French\n"
 "Language: fr\n"

openplotterMaiana/locale/it/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Italian\n"
 "Language: it\n"

openplotterMaiana/locale/nb/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Norwegian Bokmal\n"
 "Language: nb_NO\n"
@@ -22,337 +22,337 @@ msgstr ""
 
 #: data/openplotter-maiana.desktop:3
 msgid "MAIANA AIS"
-msgstr ""
+msgstr "MAIANA AIS"
 
 #: data/openplotter-maiana.desktop:5
 msgid "openplotter-maiana"
-msgstr ""
+msgstr "openplotter-maiana"
 
 #: fwupdate.py:26
 msgid "Checking if unit is running"
-msgstr ""
+msgstr "Kontrollerer om enheten kjører"
 
 #: fwupdate.py:42
 msgid "Unit is running, switching to DFU mode"
-msgstr ""
+msgstr "Enheten kjører, bytter til DFU-modus"
 
 #: fwupdate.py:70
 msgid "Usage:"
-msgstr ""
+msgstr "Bruk:"
 
 #: fwupdate.py:82
 msgid "Unable to open serial port"
-msgstr ""
+msgstr "Kan ikke åpne seriell port"
 
 #: fwupdate.py:91
 msgid "Unable to open file"
-msgstr ""
+msgstr "Kan ikke åpne fil"
 
 #: fwupdate.py:101
 msgid "File size:"
-msgstr ""
+msgstr "Filstørrelse:"
 
 #: fwupdate.py:105
 msgid "Could not get unit into DFU mode"
-msgstr ""
+msgstr "Kunne ikke sette enhet i DFU-modus"
 
 #: fwupdate.py:109
 msgid "Unit is in DFU mode"
-msgstr ""
+msgstr "Enheten er i DFU-modus"
 
 #: fwupdate.py:113
 msgid "Unable to begin transfer, restart the unit and retry"
-msgstr ""
+msgstr "Kan ikke starte overføringen, start enheten på nytt og prøv igjen"
 
 #: fwupdate.py:117
 msgid "Starting transfer"
-msgstr ""
+msgstr "Starter overføring"
 
 #: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46
 #: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42
 msgid "FAILED: "
-msgstr ""
+msgstr "FEILET: "
 
 #: maianaPostInstall.py:30
 msgid "Checking access to Signal K server..."
-msgstr ""
+msgstr "Sjekker tilgang til Signal K-server..."
 
 #: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51
 #: maianaPreUninstall.py:35 maianaPreUninstall.py:41
 msgid "DONE"
-msgstr ""
+msgstr "FERDIG"
 
 #: maianaPostInstall.py:39
 msgid "Adding openplotter-maiana-read service..."
-msgstr ""
+msgstr "Legger til openplotter-maiana-lese-tjeneste..."
 
 #: maianaPostInstall.py:48
 msgid "Setting version..."
-msgstr ""
+msgstr "Angir versjon..."
 
 #: maianaPreUninstall.py:29
 msgid "Removing openplotter-maiana-read service..."
-msgstr ""
+msgstr "Fjerner openplotter-maiana-lese-tjenesten..."
 
 #: maianaPreUninstall.py:38
 msgid "Removing version..."
-msgstr ""
+msgstr "Fjerner versjonen..."
 
 #: openplotterMaiana.py:37
 msgid "MAIANA AIS transponder"
-msgstr ""
+msgstr "MAIANA AIS transponder"
 
 #: openplotterMaiana.py:47
 msgid "Help"
-msgstr ""
+msgstr "Hjelp"
 
 #: openplotterMaiana.py:50 openplotterMaiana.py:69
 msgid "Settings"
-msgstr ""
+msgstr "Innstillinger"
 
 #: openplotterMaiana.py:53
 msgid "Approve"
-msgstr ""
+msgstr "Godta"
 
 #: openplotterMaiana.py:55
 msgid "Allowed"
-msgstr ""
+msgstr "Tillatt"
 
 #: openplotterMaiana.py:58
 msgid "MAIANA Signal K connection"
-msgstr ""
+msgstr "MAIANA Signal K-tilkobling"
 
 #: openplotterMaiana.py:62
 msgid "Connections"
-msgstr ""
+msgstr "Tilkoblinger"
 
 #: openplotterMaiana.py:70
 msgid "Firmware"
-msgstr ""
+msgstr "Fastvare"
 
 #: openplotterMaiana.py:138
 msgid "Reading MAIANA device settings..."
-msgstr ""
+msgstr "Leser MAIANA-enhetens innstillinger..."
 
 #: openplotterMaiana.py:195
 msgid "Select the Signal K connection for the MAIANA device"
-msgstr ""
+msgstr "Velg Signal K-tilkobling til MAIANA-enheten"
 
 #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244
 msgid "Cannot connect with the device, try again"
-msgstr ""
+msgstr "Kan ikke koble til enheten, prøv igjen"
 
 #: openplotterMaiana.py:219 openplotterMaiana.py:222
 msgid "The hardware version of your MAIANA device is too old"
-msgstr ""
+msgstr "MAIANA enheten er for gammel"
 
 #: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233
 msgid "The firmware version of your MAIANA device is too old"
-msgstr ""
+msgstr "Fastvareversjonen på MAIANA-enheten er for gammel"
 
 #: openplotterMaiana.py:246
 msgid "Done"
-msgstr ""
+msgstr "Ferdig"
 
 #: openplotterMaiana.py:249
 msgid "Hardware revision"
-msgstr ""
+msgstr "Revisjon av maskinvare"
 
 #: openplotterMaiana.py:252
 msgid "Firmware revision"
-msgstr ""
+msgstr "Fastvarerevisjon"
 
 #: openplotterMaiana.py:255
 msgid "Type of MCU"
-msgstr ""
+msgstr "Type MCU"
 
 #: openplotterMaiana.py:258
 msgid "Serial number"
-msgstr ""
+msgstr "Serienummer"
 
 #: openplotterMaiana.py:263
 msgid "Transmitter hardware module"
-msgstr ""
+msgstr "Senderens maskinvaremodul"
 
 #: openplotterMaiana.py:268
 msgid "present"
-msgstr ""
+msgstr "til stede"
 
 #: openplotterMaiana.py:271
 msgid "not present"
-msgstr ""
+msgstr "ikke til stede"
 
 #: openplotterMaiana.py:274
 msgid "Hardware TX switch"
-msgstr ""
+msgstr "Maskinvare TX-bryter"
 
 #: openplotterMaiana.py:279 openplotterMaiana.py:291
 msgid "ON"
-msgstr ""
+msgstr "PÅ"
 
 #: openplotterMaiana.py:282 openplotterMaiana.py:296
 msgid "OFF"
-msgstr ""
+msgstr "AV"
 
 #: openplotterMaiana.py:285 openplotterMaiana.py:461
 msgid "Software TX switch"
-msgstr ""
+msgstr "Programvare TX-bryter"
 
 #: openplotterMaiana.py:300
 msgid "Station data"
-msgstr ""
+msgstr "Stasjonsdata"
 
 #: openplotterMaiana.py:305
 msgid "provided"
-msgstr ""
+msgstr "oppgitt"
 
 #: openplotterMaiana.py:308
 msgid "not provided"
-msgstr ""
+msgstr "ikke oppgitt"
 
 #: openplotterMaiana.py:311
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: openplotterMaiana.py:316
 msgid "transmitting"
-msgstr ""
+msgstr "overfører"
 
 #: openplotterMaiana.py:319
 msgid "not transmitting"
-msgstr ""
+msgstr "sender ikke"
 
 #: openplotterMaiana.py:322
 msgid "Channel A latest transmitted message"
-msgstr ""
+msgstr "Siste overførte melding på kanal A"
 
 #: openplotterMaiana.py:328 openplotterMaiana.py:341
 msgid "Type"
-msgstr ""
+msgstr "Type"
 
 #: openplotterMaiana.py:332 openplotterMaiana.py:344
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #: openplotterMaiana.py:335
 msgid "Channel B latest transmitted message"
-msgstr ""
+msgstr "Siste overførte melding på kanal B"
 
 #: openplotterMaiana.py:347
 msgid "Channel A noise floor"
-msgstr ""
+msgstr "Støyterskel kanal A"
 
 #: openplotterMaiana.py:352
 msgid "Channel B noise floor"
-msgstr ""
+msgstr "Støyterskel kanal B"
 
 #: openplotterMaiana.py:376
 msgid " Press \"Approve\" and then \"Refresh\"."
-msgstr ""
+msgstr " Trykk \"Godkjenn\" og deretter \"Oppdater\"."
 
 #: openplotterMaiana.py:380
 msgid " Press \"Refresh\"."
-msgstr ""
+msgstr " Trykk på \"Oppdater\"."
 
 #: openplotterMaiana.py:382
 msgid " Press \"Allowed\"."
-msgstr ""
+msgstr " Trykk \"Tillatt\"."
 
 #: openplotterMaiana.py:439
 msgid "MMSI"
-msgstr ""
+msgstr "MMSI"
 
 #: openplotterMaiana.py:441
 msgid "Vessel name"
-msgstr ""
+msgstr "Navn på fartøy"
 
 #: openplotterMaiana.py:443
 msgid "Call sign"
-msgstr ""
+msgstr "Kallesignal"
 
 #: openplotterMaiana.py:445
 msgid "Vessel type"
-msgstr ""
+msgstr "Type fartøy"
 
 #: openplotterMaiana.py:447
 msgid "LOA"
-msgstr ""
+msgstr "LOA"
 
 #: openplotterMaiana.py:449
 msgid "Beam"
-msgstr ""
+msgstr "Bredde"
 
 #: openplotterMaiana.py:451
 msgid "Port Offset"
-msgstr ""
+msgstr "Babord forskyvning"
 
 #: openplotterMaiana.py:453
 msgid "Bow Offset"
-msgstr ""
+msgstr "Baug-forskyvning"
 
 #: openplotterMaiana.py:455
 msgid "Units: meters"
-msgstr ""
+msgstr "Enheter: meter"
 
 #: openplotterMaiana.py:458 openplotterMaiana.py:575
 msgid "Refresh"
-msgstr ""
+msgstr "Oppdater"
 
 #: openplotterMaiana.py:464
 msgid "Detect noise"
-msgstr ""
+msgstr "Oppdag støy"
 
 #: openplotterMaiana.py:467
 msgid "Save station data"
-msgstr ""
+msgstr "Lagre stasjonsdata"
 
 #: openplotterMaiana.py:514
 msgid "Invalid MMSI"
-msgstr ""
+msgstr "Ugyldig MMSI"
 
 #: openplotterMaiana.py:520
 msgid "Invalid vessel name"
-msgstr ""
+msgstr "Ugyldig fartøynavn"
 
 #: openplotterMaiana.py:525
 msgid "Invalid call sign"
-msgstr ""
+msgstr "Ugyldig kallesignal"
 
 #: openplotterMaiana.py:534
 msgid "Invalid vessel type"
-msgstr ""
+msgstr "Ugyldig fartøystype"
 
 #: openplotterMaiana.py:539
 msgid "Invalid LOA"
-msgstr ""
+msgstr "Ugyldig LOA"
 
 #: openplotterMaiana.py:544
 msgid "Invalid Beam"
-msgstr ""
+msgstr "Ugyldig bredde"
 
 #: openplotterMaiana.py:549
 msgid "Invalid bow offset"
-msgstr ""
+msgstr "Ugyldig baug-forskyvning"
 
 #: openplotterMaiana.py:554
 msgid "Invalid port offset"
-msgstr ""
+msgstr "Ugyldig babord-forskyvning"
 
 #: openplotterMaiana.py:578
 msgid "Update firmware"
-msgstr ""
+msgstr "Oppdater fastvare"
 
 #: openplotterMaiana.py:591
 msgid "Choose a file"
-msgstr ""
+msgstr "Velg en fil"
 
 #: openplotterMaiana.py:591
 msgid "bin files"
-msgstr ""
+msgstr "binærfiler"
 
 #: openplotterMaiana.py:591
 msgid "All files"
-msgstr ""
+msgstr "Alle filer"
 
 #: openplotterMaiana.py:597
 msgid ""
@@ -360,47 +360,50 @@ msgid ""
 "\n"
 "Do you want to go ahead?"
 msgstr ""
+"Din MAIANA-enhet fastvare vil bli oppdatert, vennligst ikke koble fra eller rør den under oppdateringen.\n"
+"\n"
+"Vil du fortsette i gang?"
 
 #: openplotterMaiana.py:598
 msgid "Question"
-msgstr ""
+msgstr "Spørsmål"
 
 #: openplotterMaiana.py:601
 msgid "Stopping Signal K server"
-msgstr ""
+msgstr "Stopper Signal K server"
 
 #: openplotterMaiana.py:608
 msgid "Updating firmware, please wait... "
-msgstr ""
+msgstr "Oppdaterer fastvare, vennligst vent... "
 
 #: openplotterMaiana.py:610
 msgid "Starting Signal K server"
-msgstr ""
+msgstr "Starter Signal K server på nytt"
 
 #: openplotterMaianaRead.py:74
 msgid "There may be electromagnetic interference near the MAIANA AIS antenna"
-msgstr ""
+msgstr "Det kan være elektromagnetisk interferens i nærheten av MAIANA AIS-antennen"
 
 #: startup.py:43
 msgid "Checking MAIANA transponder..."
-msgstr ""
+msgstr "Sjekker MAIANA transponder..."
 
 #: startup.py:53
 msgid "There is no MAIANA device defined"
-msgstr ""
+msgstr "Det finnes ingen MAIANA-enhet definert"
 
 #: startup.py:57
 msgid "MAIANA device"
-msgstr ""
+msgstr "MAIANA-enhet"
 
 #: startup.py:68
 msgid "Access to Signal K server validated"
-msgstr ""
+msgstr "Tilgang til Signal K-server validert"
 
 #: startup.py:76 startup.py:86
 msgid "OpenPlotter MAIANA service is running"
-msgstr ""
+msgstr "OpenPlotter MAIANA-tjenesten kjører"
 
 #: startup.py:80 startup.py:90
 msgid "OpenPlotter MAIANA service is not running"
-msgstr ""
+msgstr "OpenPlotter MAIANA-tjenesten kjører ikke"

openplotterMaiana/locale/nl/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Dutch\n"
 "Language: nl\n"

openplotterMaiana/locale/pl/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Polish\n"
 "Language: pl\n"
@@ -204,11 +204,11 @@ msgstr "Dane stacji"
 
 #: openplotterMaiana.py:305
 msgid "provided"
-msgstr ""
+msgstr "dostarczone"
 
 #: openplotterMaiana.py:308
 msgid "not provided"
-msgstr ""
+msgstr "niedostarczone"
 
 #: openplotterMaiana.py:311
 msgid "Status"
@@ -300,7 +300,7 @@ msgstr "Odśwież"
 
 #: openplotterMaiana.py:464
 msgid "Detect noise"
-msgstr ""
+msgstr "Wykrywanie szumu"
 
 #: openplotterMaiana.py:467
 msgid "Save station data"

openplotterMaiana/locale/sv/LC_MESSAGES/openplotter-maiana.po

@@ -2,7 +2,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: openplotter\n"
 "POT-Creation-Date: 2021-11-25 17:49+0100\n"
-"PO-Revision-Date: 2021-12-10 13:43+0100\n"
+"PO-Revision-Date: 2022-07-02 20:34+0200\n"
 "Last-Translator: \n"
 "Language-Team: Swedish\n"
 "Language: sv\n"
@@ -22,337 +22,337 @@ msgstr ""
 
 #: data/openplotter-maiana.desktop:3
 msgid "MAIANA AIS"
-msgstr ""
+msgstr "MAIANA AIS"
 
 #: data/openplotter-maiana.desktop:5
 msgid "openplotter-maiana"
-msgstr ""
+msgstr "openplotter-maiana"
 
 #: fwupdate.py:26
 msgid "Checking if unit is running"
-msgstr ""
+msgstr "Kontrollerar om enheten körs"
 
 #: fwupdate.py:42
 msgid "Unit is running, switching to DFU mode"
-msgstr ""
+msgstr "Enheten körs, växlar till DFU-läge"
 
 #: fwupdate.py:70
 msgid "Usage:"
-msgstr ""
+msgstr "Användning:"
 
 #: fwupdate.py:82
 msgid "Unable to open serial port"
-msgstr ""
+msgstr "Det går inte att öppna serieporten"
 
 #: fwupdate.py:91
 msgid "Unable to open file"
-msgstr ""
+msgstr "Det gick inte öppna filen"
 
 #: fwupdate.py:101
 msgid "File size:"
-msgstr ""
+msgstr "Filstorlek:"
 
 #: fwupdate.py:105
 msgid "Could not get unit into DFU mode"
-msgstr ""
+msgstr "Kunde inte skifta enheten till DFU-läge"
 
 #: fwupdate.py:109
 msgid "Unit is in DFU mode"
-msgstr ""
+msgstr "Enheten är i DFU-läge"
 
 #: fwupdate.py:113
 msgid "Unable to begin transfer, restart the unit and retry"
-msgstr ""
+msgstr "Det går inte att starta överföringen, starta om enheten och försök igen"
 
 #: fwupdate.py:117
 msgid "Starting transfer"
-msgstr ""
+msgstr "Startar överföring"
 
 #: fwupdate.py:136 maianaPostInstall.py:37 maianaPostInstall.py:46
 #: maianaPostInstall.py:52 maianaPreUninstall.py:36 maianaPreUninstall.py:42
 msgid "FAILED: "
-msgstr ""
+msgstr "MISSLYCKADES: "
 
 #: maianaPostInstall.py:30
 msgid "Checking access to Signal K server..."
-msgstr ""
+msgstr "Kontrollerar åtkomst till Signal K-server..."
 
 #: maianaPostInstall.py:36 maianaPostInstall.py:45 maianaPostInstall.py:51
 #: maianaPreUninstall.py:35 maianaPreUninstall.py:41
 msgid "DONE"
-msgstr ""
+msgstr "KLAR"
 
 #: maianaPostInstall.py:39
 msgid "Adding openplotter-maiana-read service..."
-msgstr ""
+msgstr "Lägger till openplotter-maiana-read service..."
 
 #: maianaPostInstall.py:48
 msgid "Setting version..."
-msgstr ""
+msgstr "Ställer in version..."
 
 #: maianaPreUninstall.py:29
 msgid "Removing openplotter-maiana-read service..."
-msgstr ""
+msgstr "Tar bort openplotter-maiana-read service..."
 
 #: maianaPreUninstall.py:38
 msgid "Removing version..."
-msgstr ""
+msgstr "Tar bort version..."
 
 #: openplotterMaiana.py:37
 msgid "MAIANA AIS transponder"
-msgstr ""
+msgstr "MAIANA AIS transponder"
 
 #: openplotterMaiana.py:47
 msgid "Help"
-msgstr ""
+msgstr "Hjälp"
 
 #: openplotterMaiana.py:50 openplotterMaiana.py:69
 msgid "Settings"
-msgstr ""
+msgstr "Inställningar"
 
 #: openplotterMaiana.py:53
 msgid "Approve"
-msgstr ""
+msgstr "Godkänn"
 
 #: openplotterMaiana.py:55
 msgid "Allowed"
-msgstr ""
+msgstr "Tillåten"
 
 #: openplotterMaiana.py:58
 msgid "MAIANA Signal K connection"
-msgstr ""
+msgstr "MAIANA Signal K anslutning"
 
 #: openplotterMaiana.py:62
 msgid "Connections"
-msgstr ""
+msgstr "Anslutningar"
 
 #: openplotterMaiana.py:70
 msgid "Firmware"
-msgstr ""
+msgstr "Firmware"
 
 #: openplotterMaiana.py:138
 msgid "Reading MAIANA device settings..."
-msgstr ""
+msgstr "Läser MAIANA enhetsinställningar..."
 
 #: openplotterMaiana.py:195
 msgid "Select the Signal K connection for the MAIANA device"
-msgstr ""
+msgstr "Välj Signal K anslutningen för MAIANA-enheten"
 
 #: openplotterMaiana.py:214 openplotterMaiana.py:241 openplotterMaiana.py:244
 msgid "Cannot connect with the device, try again"
-msgstr ""
+msgstr "Kan inte ansluta till enheten, försök igen"
 
 #: openplotterMaiana.py:219 openplotterMaiana.py:222
 msgid "The hardware version of your MAIANA device is too old"
-msgstr ""
+msgstr "Hårdvaruversionen av din MAIANA-enhet är för gammal"
 
 #: openplotterMaiana.py:227 openplotterMaiana.py:230 openplotterMaiana.py:233
 msgid "The firmware version of your MAIANA device is too old"
-msgstr ""
+msgstr "Programversionen till din MAIANA-enhet är för gammal"
 
 #: openplotterMaiana.py:246
 msgid "Done"
-msgstr ""
+msgstr "Klar"
 
 #: openplotterMaiana.py:249
 msgid "Hardware revision"
-msgstr ""
+msgstr "Hårdvarurevision"
 
 #: openplotterMaiana.py:252
 msgid "Firmware revision"
-msgstr ""
+msgstr "Firmware revision"
 
 #: openplotterMaiana.py:255
 msgid "Type of MCU"
-msgstr ""
+msgstr "Typ av MCU"
 
 #: openplotterMaiana.py:258
 msgid "Serial number"
-msgstr ""
+msgstr "Serienummer"
 
 #: openplotterMaiana.py:263
 msgid "Transmitter hardware module"
-msgstr ""
+msgstr "Sändare hårdvarumodul"
 
 #: openplotterMaiana.py:268
 msgid "present"
-msgstr ""
+msgstr "tillgänglig"
 
 #: openplotterMaiana.py:271
 msgid "not present"
-msgstr ""
+msgstr "inte tillgänglig"
 
 #: openplotterMaiana.py:274
 msgid "Hardware TX switch"
-msgstr ""
+msgstr "Hårdvara TX brytare"
 
 #: openplotterMaiana.py:279 openplotterMaiana.py:291
 msgid "ON"
-msgstr ""
+msgstr "PÅ"
 
 #: openplotterMaiana.py:282 openplotterMaiana.py:296
 msgid "OFF"
-msgstr ""
+msgstr "AV"
 
 #: openplotterMaiana.py:285 openplotterMaiana.py:461
 msgid "Software TX switch"
-msgstr ""
+msgstr "Mjukvara TX brytare"
 
 #: openplotterMaiana.py:300
 msgid "Station data"
-msgstr ""
+msgstr "Stationsdata"
 
 #: openplotterMaiana.py:305
 msgid "provided"
-msgstr ""
+msgstr "angiven"
 
 #: openplotterMaiana.py:308
 msgid "not provided"
-msgstr ""
+msgstr "inte angiven"
 
 #: openplotterMaiana.py:311
 msgid "Status"
-msgstr ""
+msgstr "Status"
 
 #: openplotterMaiana.py:316
 msgid "transmitting"
-msgstr ""
+msgstr "sänder"
 
 #: openplotterMaiana.py:319
 msgid "not transmitting"
-msgstr ""
+msgstr "sänder inte"
 
 #: openplotterMaiana.py:322
 msgid "Channel A latest transmitted message"
-msgstr ""
+msgstr "Kanal A senast överförda meddelande"
 
 #: openplotterMaiana.py:328 openplotterMaiana.py:341
 msgid "Type"
-msgstr ""
+msgstr "Typ"
 
 #: openplotterMaiana.py:332 openplotterMaiana.py:344
 msgid "Time"
-msgstr ""
+msgstr "Tid"
 
 #: openplotterMaiana.py:335
 msgid "Channel B latest transmitted message"
-msgstr ""
+msgstr "Kanal B senast överförda meddelande"
 
 #: openplotterMaiana.py:347
 msgid "Channel A noise floor"
-msgstr ""
+msgstr "Kanal A ljudnivå"
 
 #: openplotterMaiana.py:352
 msgid "Channel B noise floor"
-msgstr ""
+msgstr "Kanal B ljudnivå"
 
 #: openplotterMaiana.py:376
 msgid " Press \"Approve\" and then \"Refresh\"."
-msgstr ""
+msgstr " Tryck på \"Godkänn\" och sedan \"Uppdatera\"."
 
 #: openplotterMaiana.py:380
 msgid " Press \"Refresh\"."
-msgstr ""
+msgstr " Tryck på \"Uppdatera\"."
 
 #: openplotterMaiana.py:382
 msgid " Press \"Allowed\"."
-msgstr ""
+msgstr " Tryck på \"Tillåten\"."
 
 #: openplotterMaiana.py:439
 msgid "MMSI"
-msgstr ""
+msgstr "MMSI"
 
 #: openplotterMaiana.py:441
 msgid "Vessel name"
-msgstr ""
+msgstr "Fartygets namn"
 
 #: openplotterMaiana.py:443
 msgid "Call sign"
-msgstr ""
+msgstr "Anropssignal"
 
 #: openplotterMaiana.py:445
 msgid "Vessel type"
-msgstr ""
+msgstr "Fartygstyp"
 
 #: openplotterMaiana.py:447
 msgid "LOA"
-msgstr ""
+msgstr "LÖA"
 
 #: openplotterMaiana.py:449
 msgid "Beam"
-msgstr ""
+msgstr "Bredd"
 
 #: openplotterMaiana.py:451
 msgid "Port Offset"
-msgstr ""
+msgstr "Förskjutning Babord"
 
 #: openplotterMaiana.py:453
 msgid "Bow Offset"
-msgstr ""
+msgstr "Förskjutning För"
 
 #: openplotterMaiana.py:455
 msgid "Units: meters"
-msgstr ""
+msgstr "Enhet: meter"
 
 #: openplotterMaiana.py:458 openplotterMaiana.py:575
 msgid "Refresh"
-msgstr ""
+msgstr "Uppdatera"
 
 #: openplotterMaiana.py:464
 msgid "Detect noise"
-msgstr ""
+msgstr "Identifiera störningar"
 
 #: openplotterMaiana.py:467
 msgid "Save station data"
-msgstr ""
+msgstr "Spara stationsdata"
 
 #: openplotterMaiana.py:514
 msgid "Invalid MMSI"
-msgstr ""
+msgstr "Ogiltig MMSI"
 
 #: openplotterMaiana.py:520
 msgid "Invalid vessel name"
-msgstr ""
+msgstr "Ogiltigt fartygsnamn"
 
 #: openplotterMaiana.py:525
 msgid "Invalid call sign"
-msgstr ""
+msgstr "Ogiltig anropssignal"
 
 #: openplotterMaiana.py:534
 msgid "Invalid vessel type"
-msgstr ""
+msgstr "Ogiltig fartygstyp"
 
 #: openplotterMaiana.py:539
 msgid "Invalid LOA"
-msgstr ""
+msgstr "Ogiltig LÖA"
 
 #: openplotterMaiana.py:544
 msgid "Invalid Beam"
-msgstr ""
+msgstr "Ogiltig Bredd"
 
 #: openplotterMaiana.py:549
 msgid "Invalid bow offset"
-msgstr ""
+msgstr "Ogiltig förskjutning i babordsled"
 
 #: openplotterMaiana.py:554
 msgid "Invalid port offset"
-msgstr ""
+msgstr "Ogiltig förskjutning i förhållande till fören"
 
 #: openplotterMaiana.py:578
 msgid "Update firmware"
-msgstr ""
+msgstr "Uppdatera firmware"
 
 #: openplotterMaiana.py:591
 msgid "Choose a file"
-msgstr ""
+msgstr "Välj en fil"
 
 #: openplotterMaiana.py:591
 msgid "bin files"
-msgstr ""
+msgstr "binära filer"
 
 #: openplotterMaiana.py:591
 msgid "All files"
-msgstr ""
+msgstr "Alla filer"
 
 #: openplotterMaiana.py:597
 msgid ""
@@ -360,47 +360,50 @@ msgid ""
 "\n"
 "Do you want to go ahead?"
 msgstr ""
+"Din MAIANA enhets firmware kommer att uppdateras, vänligen koppla inte från eller mixtra med den under uppdateringen.\n"
+"\n"
+"Vill du gå vidare?"
 
 #: openplotterMaiana.py:598
 msgid "Question"
-msgstr ""
+msgstr "Fråga"
 
 #: openplotterMaiana.py:601
 msgid "Stopping Signal K server"
-msgstr ""
+msgstr "Stoppar Signal K servern"
 
 #: openplotterMaiana.py:608
 msgid "Updating firmware, please wait... "
-msgstr ""
+msgstr "Uppdaterar firmware, vänligen vänta... "
 
 #: openplotterMaiana.py:610
 msgid "Starting Signal K server"
-msgstr ""
+msgstr "Startar Signal K server"
 
 #: openplotterMaianaRead.py:74
 msgid "There may be electromagnetic interference near the MAIANA AIS antenna"
-msgstr ""
+msgstr "Det kan finnas elektromagnetiska störningar nära MAIANA AIS antennen"
 
 #: startup.py:43
 msgid "Checking MAIANA transponder..."
-msgstr ""
+msgstr "Kontrollerar MAIANA transponder..."
 
 #: startup.py:53
 msgid "There is no MAIANA device defined"
-msgstr ""
+msgstr "Det finns ingen MAIANA enhet definierad"
 
 #: startup.py:57
 msgid "MAIANA device"
-msgstr ""
+msgstr "MAIANA enhet"
 
 #: startup.py:68
 msgid "Access to Signal K server validated"
-msgstr ""
+msgstr "Åtkomst till Signal K servern validerad"
 
 #: startup.py:76 startup.py:86
 msgid "OpenPlotter MAIANA service is running"
-msgstr ""
+msgstr "OpenPlotter MAIANA tjänsten körs"
 
 #: startup.py:80 startup.py:90
 msgid "OpenPlotter MAIANA service is not running"
-msgstr ""
+msgstr "OpenPlotter MAIANA tjänsten körs inte"

openplotterMaiana/maianaPostInstall.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -27,6 +27,12 @@ def main():
 	package = 'openplotter-maiana'
 	language.Language(currentdir, package, currentLanguage)
 
+	print(_('Installing python packages...'))
+	try:
+		subprocess.call(['pip3', 'install', 'websocket-client', '-U'])
+		print(_('DONE'))
+	except Exception as e: print(_('FAILED: ')+str(e))
+
 	print(_('Checking access to Signal K server...'))
 	try:
 		from openplotterSignalkInstaller import connections
@@ -36,15 +42,6 @@ def main():
 		else: print(_('DONE'))
 	except Exception as e: print(_('FAILED: ')+str(e))
 
-	print(_('Adding openplotter-maiana-read service...'))
-	try:
-		fo = open('/etc/systemd/system/openplotter-maiana-read.service', "w")
-		fo.write( '[Service]\nExecStart=openplotter-maiana-read\nStandardOutput=syslog\nStandardError=syslog\nUser='+conf2.user+'\nRestart=always\nRestartSec=5\n\n[Install]\nWantedBy=multi-user.target')
-		fo.close()
-		subprocess.call(['systemctl', 'daemon-reload'])
-		print(_('DONE'))
-	except Exception as e: print(_('FAILED: ')+str(e))
-
 	print(_('Setting version...'))
 	try:
 		conf2.set('APPS', 'maiana', version)

openplotterMaiana/maianaPreUninstall.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -26,12 +26,9 @@ def main():
 	package = 'openplotter-maiana'
 	language.Language(currentdir, package, currentLanguage)
 
-	print(_('Removing openplotter-maiana-read service...'))
+	print(_('Stopping OpenPlotter MAIANA service...'))
 	try:
-		subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read'])
+		subprocess.call(['pkill','-f','openplotter-maiana-read'])
-		subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read'])
-		subprocess.call(['rm', '-f', '/etc/systemd/system/openplotter-maiana-read.service'])
-		subprocess.call(['systemctl', 'daemon-reload'])
 		print(_('DONE'))
 	except Exception as e: print(_('FAILED: ')+str(e))
 

openplotterMaiana/openplotterMaiana.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,7 +15,7 @@
 # You should have received a copy of the GNU General Public License
 # along with Openplotter. If not, see <http://www.gnu.org/licenses/>.
 
-import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re
+import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re, sys
 import wx.richtext as rt
 from openplotterSettings import conf
 from openplotterSettings import language
@@ -134,6 +134,11 @@ class MyFrame(wx.Frame):
 			url = self.platform.http+'localhost:'+self.platform.skPort+'/admin/#/serverConfiguration/connections/-'
 			webbrowser.open(url, new=2)
 
+	def restartRead(self):
+		subprocess.call(['pkill','-f','openplotter-maiana-read'])
+		subprocess.Popen('openplotter-maiana-read')
+		time.sleep(1)
+
 	def onRead(self):
 		self.ShowStatusBarYELLOW(_('Reading MAIANA device settings...'))
 		self.mmsi.SetValue('')
@@ -191,6 +196,7 @@ class MyFrame(wx.Frame):
 			device = ''
 			baudrate = ''
 			connectionType = ''
+			suppress0183event = False
 			try:
 				enabled = i['enabled']
 				skID = i['id']
@@ -199,7 +205,8 @@ class MyFrame(wx.Frame):
 				device = dataSubOptions['device']
 				baudrate = dataSubOptions['baudrate']
 				connectionType = dataSubOptions['type']
-				if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183':
+				if 'suppress0183event' in dataSubOptions: suppress0183event = dataSubOptions['suppress0183event']
+				if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183' and not suppress0183event:
 					availableIDs.append(skID)
 					if device == self.device: selected = skID
 			except: pass
@@ -214,6 +221,15 @@ class MyFrame(wx.Frame):
 			self.SKconn.SetValue(self.connInit)
 			self.ShowStatusBarRED(_('Select the Signal K connection for the MAIANA device'))
 
+		if deviceOld != self.device:
+			if self.device: self.restartRead()
+			else: subprocess.call(['pkill','-f','openplotter-maiana-read'])
+		else:
+			if self.device:
+				test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding)
+				if not 'openplotter-maiana-read' in test: self.restartRead()
+			else: subprocess.call(['pkill','-f','openplotter-maiana-read'])
+
 		if self.device:
 			ser = serial.Serial(self.device, 38400)
 			ser.write('sys?\r\n'.encode("utf-8"))
@@ -232,6 +248,7 @@ class MyFrame(wx.Frame):
 					ts2 = time.mktime(datetime.datetime.strptime(timestamp, "%Y-%m-%dT%H:%M:%S.%fZ").timetuple())
 					if ts - ts2 > 3: 
 						self.ShowStatusBarRED(_('Cannot connect with the device, try again'))
+						print('#############################')
 						return
 					hardwareRevision = data['hardwareRevision']['value']
 					hardwareRevision = hardwareRevision.split('.')
@@ -267,13 +284,18 @@ class MyFrame(wx.Frame):
 
 			self.logger.BeginFontSize(10)
 			self.logger.WriteText(_('Hardware revision'))
-			if 'hardwareRevision' in data: self.logger.WriteText(': '+data['hardwareRevision']['value'])
+			if 'hardwareRevision' in data: 
+				self.logger.WriteText(': '+data['hardwareRevision']['value'])
+				self.hardwareRevision = data['hardwareRevision']['value']
 			self.logger.Newline()
 			self.logger.WriteText(_('Firmware revision'))
-			if 'firmwareRevision' in data: self.logger.WriteText(': '+data['firmwareRevision']['value'])
+			if 'firmwareRevision' in data: 
+				self.logger.WriteText(': '+data['firmwareRevision']['value'])
 			self.logger.Newline()
 			self.logger.WriteText(_('Type of MCU'))
-			if 'MCUtype' in data: self.logger.WriteText(': '+data['MCUtype']['value'])
+			if 'MCUtype' in data: 
+				self.logger.WriteText(': '+data['MCUtype']['value'])
+				self.MCUtype = data['MCUtype']['value']
 			self.logger.Newline()
 			self.logger.WriteText(_('Serial number'))
 			if 'serialNumber' in data: self.logger.WriteText(': '+data['serialNumber']['value'])
@@ -388,17 +410,6 @@ class MyFrame(wx.Frame):
 				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 deviceOld != self.device:
-			if self.device:
-				subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart'])
-			else:
-				subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'stop'])
-		else:
-			if self.device:
-				try:
-					subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding)
-				except:
-					subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart'])
 
 	def onSKconn(self, event):
 		deviceOld = self.conf.get('MAIANA', 'device')
@@ -423,18 +434,14 @@ class MyFrame(wx.Frame):
 					self.conf.set('MAIANA', 'device', self.device)
 			except: pass
 		if deviceOld != self.device:
-			if self.device:
+			if self.device: self.restartRead()
-				subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart'])
+			else: subprocess.call(['pkill','-f','openplotter-maiana-read'])
-				time.sleep(1)
-			else:
-				subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'stop'])
 		else:
 			if self.device:
-				try:
+				test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding)
-					subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding)
+				if not 'openplotter-maiana-read' in test: self.restartRead()
-				except:
+			else: subprocess.call(['pkill','-f','openplotter-maiana-read'])
-					subprocess.Popen([self.platform.admin, 'python3', self.currentdir+'/service.py', 'openplotter-maiana-read', 'restart'])
+
-					time.sleep(1)
 		self.onRead()
 
 	def pageSettings(self):
@@ -521,7 +528,7 @@ class MyFrame(wx.Frame):
 
 		vesselName = self.vesselName.GetValue()
 		vesselName = vesselName.upper()
-		if not re.match('^[0-9A-Z]{1,20}$', vesselName):
+		if not re.match('^[0-9A-Z ]{1,20}$', vesselName):
 			self.ShowStatusBarRED(_('Invalid vessel name'))
 			return
 
@@ -580,6 +587,10 @@ class MyFrame(wx.Frame):
 		toolRefresh = self.toolbar2.AddTool(201, _('Refresh'), wx.Bitmap(self.currentdir+"/data/refresh.png"))
 		self.Bind(wx.EVT_TOOL, self.OnToolRefresh, toolRefresh)
 		self.toolbar2.AddSeparator()
+
+		toolDownload= self.toolbar2.AddTool(203, _('Download firmware'), wx.Bitmap(self.currentdir+"/data/download.png"))
+		self.Bind(wx.EVT_TOOL, self.OnToolDownload, toolDownload)
+
 		toolFile= self.toolbar2.AddTool(202, _('Update firmware'), wx.Bitmap(self.currentdir+"/data/file.png"))
 		self.Bind(wx.EVT_TOOL, self.OnToolFile, toolFile)
 		self.logger = rt.RichTextCtrl(self.firmware, style=wx.TE_MULTILINE|wx.TE_READONLY|wx.TE_DONTWRAP|wx.LC_SORT_ASCENDING)
@@ -591,6 +602,10 @@ class MyFrame(wx.Frame):
 
 		self.firmware.SetSizer(vbox)
 
+	def OnToolDownload(self,e):
+		url = "https://github.com/peterantypas/maiana/tree/master/latest/Firmware/Transponder/Binaries"
+		webbrowser.open(url, new=2)
+
 	def OnToolFile(self,e):
 		file_path = False
 		dlg = wx.FileDialog(self, message=_('Choose a file'), defaultDir='~', defaultFile='', wildcard=_('bin files') + ' (*.bin)|*.bin|' + _('All files') + ' (*.*)|*.*', style=wx.FD_OPEN | wx.FD_CHANGE_DIR)
@@ -598,6 +613,25 @@ class MyFrame(wx.Frame):
 			file_path = dlg.GetPath()
 		dlg.Destroy()
 		if file_path:
+			try:
+				fileName = file_path.split('/')
+				fileName = fileName[-1]
+				fileName = fileName.split('-')
+				MCUtype = fileName[1].upper()
+				if MCUtype != self.MCUtype:
+					self.ShowStatusBarRED(_('MCU type mismatch: ')+MCUtype)
+					return
+				hardwareRevision = fileName[2].replace('hw','')
+				hardwareRevision2 = self.hardwareRevision.split('.')
+				del hardwareRevision2[-1]
+				hardwareRevision2 = '.'.join(hardwareRevision2)
+				if hardwareRevision != hardwareRevision2:
+					self.ShowStatusBarRED(_('Hardware revision mismatch: ')+hardwareRevision)
+					return
+			except Exception as e:
+				self.ShowStatusBarRED(_('Error processing file: ')+str(e))
+				return
+			self.SetStatusText('')
 			dlg = wx.MessageDialog(None, _(
 				'Your MAIANA device firmware will be updated, please do not disconnect or tamper with it during the update.\n\nDo you want to go ahead?'),
 				_('Question'), wx.YES_NO | wx.NO_DEFAULT | wx.ICON_QUESTION)

openplotterMaiana/openplotterMaianaRead.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by

openplotterMaiana/service.py

@@ -1,29 +0,0 @@
-#!/usr/bin/env python3
-
-# This file is part of Openplotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
-#                     
-# Openplotter is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 2 of the License, or
-# any later version.
-# Openplotter is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with Openplotter. If not, see <http://www.gnu.org/licenses/>.
-
-import sys, subprocess
-
-if sys.argv[1]=='openplotter-maiana-read':
-	if sys.argv[2]=='start':
-		subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read'])
-		subprocess.call(['systemctl', 'start', 'openplotter-maiana-read'])
-	if sys.argv[2]=='stop':
-		subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read'])
-		subprocess.call(['systemctl', 'stop', 'openplotter-maiana-read'])
-	if sys.argv[2]=='restart':
-		subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read'])
-		subprocess.call(['systemctl', 'restart', 'openplotter-maiana-read'])

openplotterMaiana/startup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #                     
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -15,8 +15,9 @@
 # You should have received a copy of the GNU General Public License
 # along with Openplotter. If not, see <http://www.gnu.org/licenses/>.
 
-import time, os, subprocess, sys
+import time, os, subprocess, sys, ujson
 from openplotterSettings import language
+from openplotterSettings import platform
 from openplotterSignalkInstaller import connections
 
 class Start(): 
@@ -25,18 +26,23 @@ class Start():
 		currentdir = os.path.dirname(os.path.abspath(__file__))
 		language.Language(currentdir,'openplotter-maiana',currentLanguage)
 		
-		self.initialMessage = ''
+		self.initialMessage = _('Starting MAIANA transponder...')
 
 	def start(self): 
 		green = '' 
 		black = '' 
 		red = '' 
 
+		subprocess.call(['pkill', '-f', 'openplotter-maiana-read'])
+		subprocess.Popen('openplotter-maiana-read')
+		time.sleep(1)
+
 		return {'green': green,'black': black,'red': red}
 
 class Check():
 	def __init__(self, conf, currentLanguage):
 		self.conf = conf
+		self.platform = platform.Platform()
 		currentdir = os.path.dirname(os.path.abspath(__file__))
 		language.Language(currentdir,'openplotter-maiana',currentLanguage)
 		
@@ -55,8 +61,53 @@ class Check():
 			else: red+= '\n    '+msg
 		else:
 			msg = _('MAIANA device')+': '+device
-			if not green: green = msg
+			if not black: black = msg
-			else: green+= ' | '+msg
+			else: black+= ' | '+msg
+
+		#check devie¡ce and server settings
+		if device:
+			settingsOK = False
+			nmeaOK = True
+			try:
+				setting_file = self.platform.skDir+'/settings.json'
+				with open(setting_file) as data_file:
+					data = ujson.load(data_file)
+			except: data = {}
+			if 'pipedProviders' in data: data2 = data['pipedProviders']
+			else: data2 = []
+			for i in data2:
+				enabled = ''
+				dataType = ''
+				baudrate = ''
+				connectionType = ''
+				suppress0183event = False
+				try:
+					dataSubOptions = i['pipeElements'][0]['options']['subOptions']
+					if device in dataSubOptions['device']:
+						enabled = i['enabled']
+						dataType = i['pipeElements'][0]['options']['type']
+						baudrate = dataSubOptions['baudrate']
+						connectionType = dataSubOptions['type']
+						if 'suppress0183event' in dataSubOptions: suppress0183event = dataSubOptions['suppress0183event']
+						if enabled and connectionType == 'serial' and baudrate == 38400 and dataType == 'NMEA0183' and not suppress0183event: settingsOK = True
+				except: pass			
+				if settingsOK:
+					msg = _('device settings OK')
+					if not black: black = msg
+					else: black+= ' | '+msg
+				else:
+					msg = _('check device settings')
+					if not red: red = msg
+					else: red+= '\n    '+msg
+
+			if 'interfaces' in data: data2 = data['interfaces']
+			else: data2 = []
+			if 'nmea-tcp' in data2:
+				if not data2['nmea-tcp']: nmeaOK = False
+			if not nmeaOK:
+				msg = _('NMEA 0183 over TCP (10110) interface is disabled. Check Signal K server settings')
+				if not red: red = msg
+				else: red+= '\n    '+msg
 
 		#access
 		skConnections = connections.Connections('MAIANA')
@@ -66,30 +117,29 @@ class Check():
 			else: red+= '\n    '+result[1]
 		if result[0] == 'approved' or result[0] == 'validated':
 			msg = _('Access to Signal K server validated')
-			if not green: green = msg
+			if not black: black = msg
-			else: green+= ' | '+msg
+			else: black+= ' | '+msg
 
-		#service
+		# check service
+		test = subprocess.check_output(['ps','aux']).decode(sys.stdin.encoding)
 		if device and (result[0] == 'approved' or result[0] == 'validated'):
-			try:
+			if 'openplotter-maiana-read' in test: 
-				subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding)
+				msg = _('running')
-				msg = _('OpenPlotter MAIANA service is running')
 				if not green: green = msg
 				else: green+= ' | '+msg
-			except:			
+			else:
-				msg = _('OpenPlotter MAIANA service is not running')
+				msg = _('not running')
-				if not red: red = msg
+				if red: red += '\n   '+msg
-				else: red+= '\n    '+msg
+				else: red = msg
 		else:
-			try:
+			if 'openplotter-maiana-read' in test: 
-				subprocess.check_output(['systemctl', 'is-active', 'openplotter-maiana-read']).decode(sys.stdin.encoding)
+				msg = _('running')
-				msg = _('OpenPlotter MAIANA service is running')
+				if red: red += '\n   '+msg
-				if not red: red = msg
+				else: red = msg
-				else: red+= '\n    '+msg
+			else:
-			except:			
+				msg = _('not running')
-				msg = _('OpenPlotter MAIANA service is not running')
+				if not black: black = msg
-				if not green: green = msg
+				else: black+= ' | '+msg
-				else: green+= ' | '+msg
 
 		return {'green': green,'black': black,'red': red}
 

openplotterMaiana/version.py

@@ -1,3 +1,3 @@
-version = '2.1.2'
+version = '3.1.4'
-codeName = 'Open Arms'
+codeName = 'STOPmaremortum'
 state = 'stable'

setup.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python3
 
-# This file is part of Openplotter.
+# This file is part of OpenPlotter.
-# Copyright (C) 2021 by Sailoog <https://github.com/openplotter/openplotter-maiana>
+# Copyright (C) 2022 by Sailoog <https://github.com/openplotter/openplotter-maiana>
 #                  
 # Openplotter is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by