From 118b0d87ffeb338c3e2e57aa27670297d9c2cdc7 Mon Sep 17 00:00:00 2001 From: Thomas Hooge Date: Tue, 24 Dec 2024 13:23:55 +0100 Subject: [PATCH] =?UTF-8?q?Einige=20kleine=20Fixes=20und=20Erg=C3=A4nzunge?= =?UTF-8?q?n?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- TODO | 13 +++++++++++++ images/unknown.png | Bin 0 -> 5544 bytes nmea2000/hbuffer.py | 2 +- obp60.py | 2 +- obp60_48x48.png | Bin 0 -> 1803 bytes pages/barograph.py | 4 ++-- pages/clock.py | 37 +++++++++++++++++++++++++++++-------- 7 files changed, 46 insertions(+), 12 deletions(-) create mode 100644 TODO create mode 100644 images/unknown.png create mode 100644 obp60_48x48.png diff --git a/TODO b/TODO new file mode 100644 index 0000000..a949def --- /dev/null +++ b/TODO @@ -0,0 +1,13 @@ +Aufgaben- und Planungs- und Ideenliste + +- Barograph + +- Ankeralarm + Kreis um Position, Liste letzter Positionen + Tasten: Set/Clear, Radius+, Radius- + +- Satellitenübersicht / SkyView + Kreis mit Sats + Rechtecke mit SNR (Signal/Noise) + +- Sea wave recorder (siehe Steamrock) diff --git a/images/unknown.png b/images/unknown.png new file mode 100644 index 0000000000000000000000000000000000000000..8653563c4474a664e84ab409104fa49ca04e37e0 GIT binary patch literal 5544 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 literal 0 HcmV?d00001 diff --git a/nmea2000/hbuffer.py b/nmea2000/hbuffer.py index 8198f0d..24f66aa 100644 --- a/nmea2000/hbuffer.py +++ b/nmea2000/hbuffer.py @@ -163,7 +163,7 @@ class HistoryBuffer(): ixnext = index + 1 if ixnext > self.size - 1: ixnext = 0 - return round((self.buf[ix] + self.buf[ixprev] + self.buf[ixnext]) / 3) + return round((self.buf[index] + self.buf[ixprev] + self.buf[ixnext]) / 3) def setname(self, newname): """ diff --git a/obp60.py b/obp60.py index 2385255..e5c66af 100755 --- a/obp60.py +++ b/obp60.py @@ -318,7 +318,7 @@ class Frontend(Gtk.Window): GLib.timeout_add_seconds(2, self.on_timer) self.show_all() Gtk.main() - + def on_timer(self): # Boatdata validator boatdata.updateValid(5) diff --git a/obp60_48x48.png b/obp60_48x48.png new file mode 100644 index 0000000000000000000000000000000000000000..9157015fc7f93f80cb82a6ba49b2e00743a8eb1f GIT binary patch literal 1803 zcmV+m2lV)fP)EX>4Tx04R}tkv&MmKpe$iQ^le!4t5Z62w0u$;0NMZt5AdrrB-Ow!Q|2}Xws0R zxHt-~1qVMCs}3&Cx;nTDg5U>;vxAeOib`7 zkz)Z>sE`~#_#gc4)+|g-x=Fz}(EVcDAEQ9eF3_yo_V=-EH%|cnGjOG~{nZ9A`$>Ae ztwoN2{%zpmx~<83z~v4w_@qmQpV2qvfPq_}cg^jswU5&WAVXaxZ-9eC zV5~^l>mKh8boTb|nO1*4zfp35!l8HomAoC7W~ zjxkQK*N!*)GFKe2-~tLSr@KVjr<_^MKEIjgKeO5q0Q2+ncMQY04QLzaem{Z%_i-3`%oD@dGaLDX!QF4Ha0dW zl}Zu-p%4tEum{cm6<}^|PJ9jE;0Q?&;_xQzJDj=f?lg{84FKG{d6Pn+AP$4cyLa!( z9|nj?`-j4$5Q53c$sYp{LLh`Vnh}b{V&rl;bX~`B9300%O8K9el2T&ZHm>WE zNF>PRa^L*D_|+B2=kw(A`Qh|imW5?mIF7^4&JMP1<2VkzUJuuGu`G+hU?2yB0gmHf z+cp4>;~<1UQ51v_1cO0TRYliz!r`#cGz~>jh(@CX0s(YgN7FQd!63S>6AT7_z6L&5 zC=?G14hFC+i-!*%VwxtZs#34lab1^d*RJ8ZF3ZcyR4Nq!E?&II%*+gm zqTo0V&z?Qw&6_uzIB|l@moEMHGan^UJwasK>y6h*=FJXTg#D3{Co#(Vno zDJv^0sH)1_w{KZnTjSQPTl-?QuZWw?Cf#nAk&zKjpFWMIX{@fU0#L11sZ=V&<8k8g zIF(9;YPAYLsZ?Tld6`c?`o~Yio;Et99@$bnMu%VNABSx7pp@C7aCx@bTkE zq?BYb84SZfO3C*2Hd0E8#UkNwn6qckl1`^-G#a$qZQAWNjYb2*FgSDO47#pUEEb33 z0gQ}{kj-X?-A_f8tA%Cp-=$8FbsqcY;0_> zzP^qSV%U~SrLZiEZnsOn-yatL-uBn;_c2Wq$8p%Z`AMhK0K9wmj(WY05Q0o51Hkp` z*HILOdc97s*JEmGiexgm4?qF9apT5qUDt(G9z9wR0Q2+nzh$%8 z-(#^@=zC7zy+iGv&vv_ATCEn5NCd+$zUbTB+{83ZGMNnVc>Ie#&-4C{L*U>~Gtcwr zcDuWqo12S^i;D}NI|$}-xrw>CxryV)kDt+XJs%7P&#J0ArYK4_5{Z1*3w~9u>(cM{ zab5R=<2Y|T&wFj#_PS}BFWv>+& tG|f%hwp-