version 3.0.0 beta

This commit is contained in:
sailoog 2022-04-21 21:14:46 +02:00
parent 9c6c2e94e2
commit c9b3e94e29
12 changed files with 42 additions and 20 deletions

View File

@ -14,7 +14,7 @@ Install MAIANA AIS transponder from openplotter-settings app.
Install openplotter-maiana dependencies: Install openplotter-maiana dependencies:
`sudo apt install ` `sudo apt install openplotter-signalk-installer python3-serial`
Clone the repository: Clone the repository:
@ -34,11 +34,15 @@ cd ..
sudo dpkg -i openplotter-maiana_x.x.x-xxx_all.deb sudo dpkg -i openplotter-maiana_x.x.x-xxx_all.deb
``` ```
Run post-installation script:
`sudo maianaPostInstall`
Run: Run:
`openplotter-maiana` `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 ### Documentation

6
debian/changelog vendored
View File

@ -1,3 +1,9 @@
openplotter-maiana (3.0.0-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 openplotter-maiana (2.1.2-stable) bionic; urgency=medium
* stable version * stable version

2
debian/control vendored
View File

@ -10,6 +10,6 @@ X-Python3-Version: >= 3.2
Package: openplotter-maiana Package: openplotter-maiana
Architecture: all Architecture: all
Multi-Arch: foreign 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 Description: OpenPlotter integration of the MAIANA open source AIS transponder
OpenPlotter integration of the MAIANA open source AIS transponder OpenPlotter integration of the MAIANA open source AIS transponder

4
debian/copyright vendored
View File

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

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -36,6 +36,7 @@ def main():
else: print(_('DONE')) else: print(_('DONE'))
except Exception as e: print(_('FAILED: ')+str(e)) except Exception as e: print(_('FAILED: ')+str(e))
#TODO switch from service to startup
print(_('Adding openplotter-maiana-read service...')) print(_('Adding openplotter-maiana-read service...'))
try: try:
fo = open('/etc/systemd/system/openplotter-maiana-read.service', "w") fo = open('/etc/systemd/system/openplotter-maiana-read.service', "w")

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -26,6 +26,7 @@ def main():
package = 'openplotter-maiana' package = 'openplotter-maiana'
language.Language(currentdir, package, currentLanguage) language.Language(currentdir, package, currentLanguage)
#TODO switch from service to startup
print(_('Removing openplotter-maiana-read service...')) print(_('Removing openplotter-maiana-read service...'))
try: try:
subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read']) subprocess.call(['systemctl', 'disable', 'openplotter-maiana-read'])

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -15,6 +15,9 @@
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Openplotter. If not, see <http://www.gnu.org/licenses/>. # along with Openplotter. If not, see <http://www.gnu.org/licenses/>.
#TODO add tx action
#TODO parse bin file
import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re import wx, os, webbrowser, subprocess, time, datetime, ujson, serial, requests, re
import wx.richtext as rt import wx.richtext as rt
from openplotterSettings import conf from openplotterSettings import conf

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -37,6 +37,7 @@ def main():
sock = False sock = False
while True: while True:
try: try:
#TODO switch from service to startup
sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM) sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
server_address = ('localhost', 10110) server_address = ('localhost', 10110)
sock.connect(server_address) sock.connect(server_address)

View File

@ -17,6 +17,8 @@
import sys, subprocess import sys, subprocess
#TODO remove
if sys.argv[1]=='openplotter-maiana-read': if sys.argv[1]=='openplotter-maiana-read':
if sys.argv[2]=='start': if sys.argv[2]=='start':
subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read']) subprocess.call(['systemctl', 'enable', 'openplotter-maiana-read'])

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by
@ -27,6 +27,8 @@ class Start():
self.initialMessage = '' self.initialMessage = ''
#TODO run read from here
def start(self): def start(self):
green = '' green = ''
black = '' black = ''
@ -47,6 +49,8 @@ class Check():
black = '' black = ''
red = '' red = ''
#TODO check localhost 10110 and "Suppress nmea0183 event" in sk connection
#device #device
device = self.conf.get('MAIANA', 'device') device = self.conf.get('MAIANA', 'device')
if not device: if not device:

View File

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

View File

@ -1,7 +1,7 @@
#!/usr/bin/env python3 #!/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 # Openplotter is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by # it under the terms of the GNU General Public License as published by