From ee81c2259c009fdf9df9dc7de7d071f99abbda25 Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sat, 24 Sep 2022 22:35:30 +0000 Subject: [PATCH 1/2] Squashed commit of the following: commit be9e240e581d746df03e879ea30b20ee327c11f6 Author: Hansi, dl9rdz Date: Sun Sep 18 00:17:22 2022 +0000 prepare for habhub going down commit 9761f9cee14f403aae5020a6a50429bf5b59ff77 Author: Hansi, dl9rdz Date: Tue May 31 07:46:43 2022 +0000 re-added lost commits of cixio commit 496cef2edb9ba1d81f7197167e45f80e80601ae8 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Wed Apr 27 21:07:12 2022 +0200 Bugfix: zoom levels, removed debug outputs (#299) - it was not possible to zoom in deeply on the satellite image commit 090920d3cb061aacf77d402805bbfbdab25b5f64 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Tue Apr 26 22:09:14 2022 +0200 LiveMap updates (#298) * LiveMap updates - Update to Leaflet 1.8.0 - Added Topo-Map - Bugfix: Map only changed after the second click - better darkmode handling - changed order of maps: (dark if darkmode enabled) -> white -> topo -> sat -> dark * Open any MapsApp with geo:// - Link commit 872392da2c9e658955a5e2e296d01fc6a3673c11 Author: sgtwilko Date: Sun May 29 11:31:49 2022 +0100 Add GPS status to scanner screen, aids checking GPS status without an active RX. (#286) commit affcde4f26f7b7ebb5faf5ef577e24593dcc202e Author: Hansi, dl9rdz Date: Sun May 29 10:28:33 2022 +0000 saving code space :) commit b35f265b6f569d4b40e40f635c08bf72318628df Author: Hansi, dl9rdz Date: Sun May 29 10:28:33 2022 +0000 some code reorg commit 26c7be76df99e41eb55a80cd203ed871f16af68e Author: Hansi, dl9rdz Date: Sun May 29 10:28:33 2022 +0000 added ST7789 driver commit 293e8a73139865ebff51570fd7843cabed67336d Author: Hansi, dl9rdz Date: Sun May 29 10:28:33 2022 +0000 better DFM name change handling commit 8b59a0d1c951525e37a24b13b7196484013d93f1 Author: Hansi, dl9rdz Date: Sun May 29 10:28:33 2022 +0000 display: set OLED contrast (config option); oled screen saver: also hide RSSI/stat commit 6dad96d44fe89cac28c0b20388ba748fc02a3ed2 Author: eben80 Date: Fri Apr 22 11:07:33 2022 +0200 Selectable livemap themes (#258) commit a68cd577e2da977485ffc7623ed11fe578e3a50a Author: Hansi, dl9rdz Date: Mon Apr 18 22:49:02 2022 +0200 experimental: display screen saver (auto-off) commit 3808b0892f1d4b56eaf4e9eda6230c1120f294d2 Author: Hansi, dl9rdz Date: Mon Apr 18 00:07:36 2022 +0200 updated documentation in qrg.txt commit 06f118c2c7f574a740699f1c6998736846235459 Author: Hansi, dl9rdz Date: Thu Apr 14 15:04:04 2022 +0000 json fix commit 339e00928566d2a30dc39a3323c86679a941be9f Author: Hans P. Reiser Date: Fri Apr 8 00:01:09 2022 +0000 version update commit 551744aa29068a3e80f7129cab959957c441f120 Author: Hans P. Reiser Date: Fri Apr 8 00:00:41 2022 +0000 json reorg, part 3 commit cad5bd16cd611eccdb7078516590a9a5c9918c75 Author: Hans P. Reiser Date: Thu Apr 7 23:46:59 2022 +0000 json reorg part 2 commit b605e156fd7ac42d1ba61096c2c7b6a9b7d862b6 Author: Hans P. Reiser Date: Thu Apr 7 23:34:15 2022 +0000 json reorg, initial part commit 9be6251ed8d501120c55b39b9218d1486b2550a6 Author: Hans P. Reiser Date: Thu Apr 7 22:08:24 2022 +0000 update ftp server for RS92 eph commit 11f41883a368e25d5b483ca4c859b54297ce130f Author: Hans P. Reiser Date: Thu Apr 7 22:03:55 2022 +0000 versio update commit aea08a9b32b002ee02f3963883d83bf07fc77fd1 Author: Hans P. Reiser Date: Thu Apr 7 22:03:23 2022 +0000 force old version, as long as no new released of fixed new version available for GFX library commit d8ad83c4b57a9c9586bf805a3217b16c98261f77 Author: Hans P. Reiser Date: Thu Apr 7 20:59:35 2022 +0000 (simplified previous commit) commit 764d29c012ac87af6b5d6f909968876a8073fce0 Author: Hans P. Reiser Date: Thu Apr 7 20:56:10 2022 +0000 update to M20 IDs (correct new -3- IDs) commit c041b4999fa69a3a5d854c8a040ec4b9743eed58 Author: Hans P. Reiser Date: Wed Mar 23 00:19:20 2022 +0000 test. untested. library update compatibility commit 18dab7be330d91ae00e6e8e9b6f6f57803e5ed7d Author: Hansi, dl9rdz Date: Sun Jan 23 23:57:08 2022 +0000 check M20 crc first, before decoding serial number commit b0c28d6774a7d798bc9b7615efcd300122901970 Merge: 925f066 c03683e Author: Hansi, dl9rdz Date: Sun Jan 23 23:37:43 2022 +0000 Merge branch 'master' into devel commit 925f06609304e689b6179224ea9a945ca818a0f6 Author: Hansi, dl9rdz Date: Sun Jan 23 23:30:59 2022 +0000 sticking to 3.3.2 for now, as 3.4 causes some issues commit f08bb2a03203d49b6b7c7dfb8e8d65c91e3707b3 Merge: 9140b52 d2e8631 Author: Hansi, dl9rdz Date: Fri Jan 21 13:15:26 2022 +0000 Merge remote-tracking branch 'refs/remotes/origin/devel' into devel commit 9140b52b43877a6e1aa4b903ec7a9eac75836645 Author: Hansi, dl9rdz Date: Fri Jan 21 13:15:07 2022 +0000 reset DFM id after 30 minutes or >.25 lat/lon change commit f7dc810f9410522d20bb2270a678e9bcbef0f895 Author: Hansi, dl9rdz Date: Fri Jan 21 11:59:39 2022 +0000 RS41: send real type if available commit d2e8631696d7295fa4318ae4701ece7df537ac90 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jan 11 23:05:55 2022 +1100 Remove RS92-NGP Support Note (#266) commit 8d4ddd2fa4b8356caf4c1ff223bd16950df78da4 Author: Luclu7 Date: Sat Dec 11 01:24:01 2021 +0100 simply typo (#249) commit 8ddf8fa595991aac687dad434d42b70f70c60966 Author: Hansi, dl9rdz Date: Mon Nov 1 17:31:27 2021 +0100 sh import last interval as double (for <1h) commit e4df63e2645e177e6546d77fb32518c2668b49a4 Author: Hansi, dl9rdz Date: Mon Nov 1 14:22:49 2021 +0100 fix sh import commit 07859d7f70d2a93110ccaed4a7b735e4e7a1fa78 Author: Hansi, dl9rdz Date: Sat Oct 30 23:37:44 2021 +0200 remove updated Setup.mp, better instructions are now in the wiki commit f7b87b6ba56093f8f6da4320515537f03ce896a1 Author: Hansi, dl9rdz Date: Sat Oct 30 23:27:28 2021 +0200 scan display for ILI934x commit cf612659e179874dde92f634726376fedbc81e9a Author: Hansi, dl9rdz Date: Sat Oct 30 23:27:07 2021 +0200 don't charge the battery using the battery :) commit af32d576d6aaec032021a21dbec8044bec672feb Author: Hansi, dl9rdz Date: Sat Oct 30 18:13:07 2021 +0200 back to normal beacon frequency commit 42798753586fb245f09a294932b8ef5b6af20f38 Author: Hansi, dl9rdz Date: Sat Oct 30 17:45:52 2021 +0200 simplification commit baec8fb8ea688ee0d739d23215336933898618ef Author: Hansi, dl9rdz Date: Sat Oct 30 17:36:48 2021 +0200 some better APRS for wettersonde.net support commit 327bbca6e6f9106583ef7d9b90c54d15b087b18f Author: Hansi, dl9rdz Date: Sat Oct 30 17:14:42 2021 +0200 some APRS for wettersonde.net support commit beea3a7047412d04e354064a2a59fe60aba99df0 Author: Hansi, dl9rdz Date: Sat Oct 30 13:50:32 2021 +0200 test commit 8a0c37e79244b58cf113d4652da51356cde5ba20 Author: Hansi, dl9rdz Date: Sat Oct 30 12:02:51 2021 +0200 version update commit 87ea4651235dfd20dc012d7e0e6eb2ed1b907b3a Author: Hansi, dl9rdz Date: Sat Oct 30 12:02:29 2021 +0200 unused code lines removal commit 0556b5ab1de1fc1612da011c09c4533ad82d674c Author: Hansi, dl9rdz Date: Sat Oct 30 11:59:33 2021 +0200 arduino ide autoformat commit a3b24a885d68faca79cfc8d473ec58bbb9cdf09d Author: Hansi, dl9rdz Date: Sat Oct 30 11:58:40 2021 +0200 bugfix commit c932c909102851c989f8bc8663e3d79e209edefc Author: Hansi, dl9rdz Date: Sat Oct 30 11:57:18 2021 +0200 remove no longer used idformat config commit 949ac6f75f06fc79fc10c79685408b8e95545ad1 Author: Hansi, dl9rdz Date: Sat Oct 30 11:51:12 2021 +0200 ax25 aprs beacon; irq-less pmu button for m5stack commit 7eb4291408d91a7fd7d1a6cf1f86de298081372e Author: Hansi, dl9rdz Date: Sat Oct 30 11:26:19 2021 +0200 make use of tx_frequency (issue #238) commit c90381791d252dc34295a1f4d1d85a14c00a4a93 Author: Hansi, dl9rdz Date: Sun Oct 24 21:09:16 2021 +0200 typo fix commit ad96dd6023a8d68f415b6dcc70e665f62e77b720 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Oct 24 08:32:33 2021 +1100 Support dark mode fully in live map (#225) * Update style.css * dark mode map Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> commit 391135ba9d8ca8970528483033f16d2304a55ece Author: Hansi, dl9rdz Date: Sat Oct 23 23:27:56 2021 +0200 update screens5.txt commit b5cbe1b6764176ef25904e7a6fce491988aad053 Author: Hansi, dl9rdz Date: Sat Oct 16 16:52:46 2021 +0200 fix #224 commit ff5f4bfa246030a2a36e301def7b3a66fea18a17 Author: Hansi, dl9rdz Date: Wed Oct 13 19:20:34 2021 +0200 no sh location report without enabling sh reporting commit 4e773944b1d1cdf007ed15d25c93ef360a8ec856 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Mon Oct 11 07:00:34 2021 +1100 Few more changes (#217) commit e6a764b65097ca1c366d5826d6b4e844d5cd79dc Author: Hansi, dl9rdz Date: Sun Oct 10 21:39:21 2021 +0200 correct launchsite display on oled commit b4c0179ee659b5b51ea7add763771c3ce08fb5e2 Author: Hansi, dl9rdz Date: Sun Oct 10 12:02:07 2021 +0200 fix correct M20 id (missing terminator) commit 97b3abc38fb2f9987028790f6ff0526f2ff60ad6 Author: Hansi, dl9rdz Date: Sat Oct 9 10:11:03 2021 +0200 version update for dark mode enhancements commit 6661da7f72498dd7b7f854c957bff9020bd6c3f9 Merge: 4036214 04b95ef Author: Hansi, dl9rdz Date: Sat Oct 9 10:10:43 2021 +0200 Merge branch 'LukePrior-patch-7' into devel commit 04b95effba5cbf5ae7b2bd8dadf34e8f9e68afc9 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sat Oct 9 19:07:15 2021 +1100 CSS Dark Mode Improvements commit 4036214ecda363123aeba32027770af5fd992d76 Merge: 1dc548d 1a148b6 Author: Hansi, dl9rdz Date: Thu Oct 7 21:53:07 2021 +0200 Merge branch 'master' into devel commit 1dc548d6f1e68e954884806553e15d3cbeb32404 Merge: 63f303f 033175f Author: Hansi, dl9rdz Date: Thu Oct 7 21:48:41 2021 +0200 Merge branch 'eben80-darkmode' into devel commit 033175f873caff8ce70beefa427a55c864a15d7e Author: Eben van Ellewee Date: Wed Oct 6 14:10:12 2021 +0200 Dark mode CSS commit d6f65d7d01814224626f6fa314dc49399037a82f Merge: af39088 68bf924 Author: eben80 Date: Wed Oct 6 11:38:04 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 68bf9246a2248e62936fbb0debe5cfd419601ff4 Author: eben80 Date: Tue Oct 5 21:50:39 2021 +0200 Update README.md (#211) Small fix commit 63f303f226206d5dd7a51d490d1d43a0df85945f Author: Hansi, dl9rdz Date: Tue Oct 5 21:50:12 2021 +0200 version update commit ab474e9816cc406adafbb4335970b64d770ac289 Author: Hansi, dl9rdz Date: Tue Oct 5 21:47:13 2021 +0200 more consistent names in json commit 864f1a92b0932f1b524099875fa0de5040031c68 Merge: 6e2c1c7 0a77291 Author: Hansi, dl9rdz Date: Tue Oct 5 21:42:45 2021 +0200 Merge branch 'mycarda-devel' into devel commit 0a77291a50925230c782557b2ebd83131d18c502 Merge: 6e2c1c7 0b6b383 Author: Hansi, dl9rdz Date: Tue Oct 5 21:42:34 2021 +0200 Merge branch 'devel' of https://github.com/mycarda/rdz_ttgo_sonde into mycarda-devel commit 6e2c1c74c9e67903123a1cff29c2de2b7ff37508 Merge: 4f63242 c2cb1e5 Author: Hansi, dl9rdz Date: Tue Oct 5 21:41:59 2021 +0200 Merge branch 'LukePrior-patch-6' into devel commit c2cb1e55af4d190ace95beb5d3fefca4593e24d1 Merge: 4f63242 5cf8266 Author: Hansi, dl9rdz Date: Tue Oct 5 21:41:44 2021 +0200 Merge branch 'patch-6' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-6 commit 4f63242afccd6e79786ff84ecb7422b0854d71b8 Author: Hansi, dl9rdz Date: Tue Oct 5 21:41:21 2021 +0200 screens minor update, add large tft portrait commit 0b6b383c3ab1d2233b45650ee51c1051f8239006 Merge: 9ae8b79 5a07290 Author: michael carter Date: Mon Oct 4 07:04:59 2021 +0100 Merge branch 'devel' of github.com:mycarda/rdz_ttgo_sonde into devel commit 9ae8b790f0b2ba156e210b13f3f77f838d6c5fa1 Author: michael carter Date: Mon Oct 4 07:04:51 2021 +0100 add values to mqtt commit af390881f7ad5c575af4e6c7688e2e9f3200f9d6 Merge: ba4d0c4 97716f7 Author: eben80 Date: Sun Oct 3 19:12:13 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 5a0729068b141d18943941804e46671d41692f9f Merge: 70ee641 97716f7 Author: Michael Carter Date: Sun Oct 3 11:25:53 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 97716f7d79ded0b8c36bf180cfd4773837571c03 Author: Hansi, dl9rdz Date: Sun Oct 3 10:23:39 2021 +0200 mqtt clientid done right (+no space in id) commit 1d4f406dbb2e017778a11c9fa4df2b499738a491 Author: Hansi, dl9rdz Date: Sun Oct 3 10:03:41 2021 +0200 mqtt clientid done right commit 5cf8266f404fcb55c1cd7a12226876f59daf82e5 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Oct 3 11:43:00 2021 +1100 Update Compatibility Table commit 23fa620aa67287613ce0448adeb8ebb84fb1c1bd Author: Hansi, dl9rdz Date: Sun Oct 3 01:07:41 2021 +0200 some code cleanup commit 00899dba2a220fbf397b34f287c66070babd1c53 Author: Hansi, dl9rdz Date: Sat Oct 2 22:03:06 2021 +0200 issue #206 commit 11cd76a0b11b96858a263e3c49389c696d93a07f Author: Hansi, dl9rdz Date: Sat Oct 2 20:19:11 2021 +0200 M10 batt,rh as in autorx commit ba4d0c40fb2f5104d7864ca358ef64e479067a95 Merge: 2924da7 e427c34 Author: eben80 Date: Fri Oct 1 09:40:59 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 70ee641ec1e165ac7ed0fd205e090e58b5dad14e Merge: d48b777 e427c34 Author: Michael Carter Date: Fri Oct 1 06:30:26 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit e427c34969a0512ed0cf969c84eb44e6972dfdfd Author: Hansi, dl9rdz Date: Thu Sep 30 21:51:49 2021 +0200 README update commit b6a2c9e7d24408575dffe97bfb1c4517633a6a81 Author: Hansi, dl9rdz Date: Thu Sep 30 21:39:53 2021 +0200 increase upper bound on distance in sondehub import commit 2924da784f43c126e031d52ebfb9ccc066d215a4 Merge: 27b8766 542c9c7 Author: eben80 Date: Thu Sep 30 19:05:15 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 542c9c73ef1642a856e6fa4bc736b55dcd9ed812 Author: Hansi, dl9rdz Date: Thu Sep 30 19:04:57 2021 +0200 ; dfm +temp, +bat commit fdf5132fa64625f8b9789d3ab77ecff80a81dd7b Author: Hansi, dl9rdz Date: Thu Sep 30 17:53:57 2021 +0200 ; DFM enhancements commit ef9ae86969f2d0ee9345d8bc20cf14734e7f05de Author: Hansi, dl9rdz Date: Thu Sep 30 14:37:18 2021 +0200 DFM: check for bit errors commit d48b777c9332785aea93a70a68c60b12189d245a Merge: 78dec8d 4c24c8c Author: Michael Carter Date: Wed Sep 29 18:58:22 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 27b8766bf9ab6a93ed0cbb7ec94fd839d2344c6e Merge: 15e61ca 4c24c8c Author: eben80 Date: Wed Sep 29 13:15:30 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 4c24c8c385fe2437cd917434db2d114082267348 Author: Hansi, dl9rdz Date: Tue Sep 28 17:27:18 2021 +0200 less confusing M10/M20 commit 5166e7d950ab3989b85888a99942f75f15aab5f4 Author: Hansi, dl9rdz Date: Tue Sep 28 11:03:48 2021 +0200 show configured M10/M20 type as long as no signal has been recevied commit c3213c6f419b83a9631c9aa9403ff2b7433d7535 Author: Hansi, dl9rdz Date: Mon Sep 27 22:02:43 2021 +0200 official to-call APRRDZ commit 224aa2fac9a5ce187e5029d81bcd21c534b0de9f Author: Hansi, dl9rdz Date: Sun Sep 26 20:09:57 2021 +0200 spurious IRQ workaround. probably related to ESP32 errata 3.14 https://www.espressif.com/sites/default/files/documentation/eco_and_workarounds_for_bugs_in_esp32_en.pdf commit 78dec8d3dbb6bd769352af24ed5560357cb62d90 Merge: 8672261 438be9a Author: Michael Carter Date: Tue Sep 28 12:44:55 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 15e61ca7fe50edf1fe879a5fdfd8703eb6d1e798 Merge: 5704b07 438be9a Author: eben80 Date: Tue Sep 28 11:51:45 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 438be9aa8a38a3a6f17df714b6b069c8c6e5ba20 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Mon Sep 27 21:50:10 2021 +1000 Fix Support Matrix (#193) commit 86722612a29306f080f5ccea29f161514865e92f Merge: d174b19 85be031 Author: Michael Carter Date: Sun Sep 26 22:06:52 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 5704b075d74ad2d1a03a52fcc318bc2547331a24 Merge: 4651b27 85be031 Author: eben80 Date: Sun Sep 26 17:32:39 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 85be031a6baa9b426284a70f8f0a616fb82ca1d1 Author: Hansi, dl9rdz Date: Sun Sep 26 15:05:22 2021 +0200 RS41-SGP hum calc with real pressure. now correct. commit c6a7255d0596eba1beff1a4656b41cf8ec69876d Author: Hansi, dl9rdz Date: Sun Sep 26 14:42:21 2021 +0200 missing mod. show dist/dir to fixed rxpos if not gps commit 2186482fb8789abd6da8aef7b02b59ef590a762f Author: Hansi, dl9rdz Date: Sun Sep 26 13:52:28 2021 +0200 RS41-SGP hum calc with real pressure commit 0379cedd7b648bfaf260ce3576134f5f714856e9 Author: Hansi, dl9rdz Date: Sun Sep 26 13:15:28 2021 +0200 now utf8 commit d069433024f016c2f009237fd1f8dae22f9b1335 Author: Hansi, dl9rdz Date: Sun Sep 26 13:11:29 2021 +0200 some font enhancements, better utf8 handling, most things not yet active in main build commit 4651b278101dba177d0c073c50dd3a8e767b7b1a Merge: 3d80c17 f30c9b6 Author: eben80 Date: Sun Sep 26 12:05:18 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit d174b198bd47b5ed10361eef4c1db4457bc9cfd6 Merge: 485d742 f30c9b6 Author: Michael Carter Date: Sun Sep 26 09:19:15 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit f30c9b6d89662f1aa5bd623eea7432a91d60596c Author: Hansi, dl9rdz Date: Sat Sep 25 10:51:04 2021 +0200 exception workaround commit 3d80c1740ea313badb63c6bec6665394a5684f06 Merge: 1ddc1eb 49bff43 Author: eben80 Date: Fri Sep 24 18:58:20 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 49bff43090a00ca1efedc27c2f070337a2c3a57d Author: Hansi, dl9rdz Date: Fri Sep 24 18:09:19 2021 +0200 +Display telemetry - some enhancements commit a39479dda7e528ca37fd86bb503f161abd1b5f12 Merge: 320d621 aba060d Author: Hansi, dl9rdz Date: Fri Sep 24 16:47:43 2021 +0200 Merge branch 'eben80-patch-1' into devel commit aba060d2e075cd2db07bb616021f532fee52d613 Merge: 93628c9 5be57a0 Author: Hansi, dl9rdz Date: Fri Sep 24 16:47:34 2021 +0200 Merge branch 'patch-1' of https://github.com/eben80/rdz_ttgo_sonde into eben80-patch-1 commit 93628c9d4faac60205c0969dc57a95a1c30ee43c Author: Hansi, dl9rdz Date: Fri Sep 24 16:47:27 2021 +0200 update readme commit 320d621cbcf1a141a71b9cd7cd772641994fe824 Author: Hansi, dl9rdz Date: Fri Sep 24 15:21:24 2021 +0200 m10 temp, done right :) commit 5be57a02b5d784de943bf6ef3eeff0bb2982136b Author: eben80 Date: Fri Sep 24 14:55:53 2021 +0200 Make telemetry values available on device display This is probably not the cleanest coding so apologies in advance. Tested on TTGO. commit 1ddc1eb88f508696548ac676f9a28231cfc5ce0f Merge: f74d402 8d24d2f Author: eben80 Date: Fri Sep 24 14:48:54 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 8d24d2fe78363e5dcef921ead2933080dd379861 Author: Hansi, dl9rdz Date: Fri Sep 24 12:59:15 2021 +0200 workaround for app commit 8bc4eda63c312ac77a0c44ff139c57ee0bbf7b86 Author: Hansi, dl9rdz Date: Fri Sep 24 12:09:32 2021 +0200 use correct M10/M20 type everywhere commit a7f6d6bb7bba0d1b4fccacbdb15e13211d2b67b5 Author: Hansi, dl9rdz Date: Fri Sep 24 10:31:58 2021 +0200 meteo in aprs frames commit 485d74237251f678d46d5897131c6c94db80e795 Merge: abf46b7 e8fdd5d Author: Michael Carter Date: Thu Sep 23 22:12:32 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit f74d40209f7481aa930dcf297baeba2da8677a67 Merge: 006ee09 e8fdd5d Author: eben80 Date: Thu Sep 23 19:57:51 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit e8fdd5dee7a627639edd7380cbc915d92edbbb84 Author: Hansi, dl9rdz Date: Thu Sep 23 18:22:10 2021 +0200 async client test commit 006ee09f27611e43eb9bf14637be8980e304f691 Merge: 9102207 c64651f Author: eben80 Date: Thu Sep 23 14:12:03 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit c64651f36b2ca998db5b0b7e26e2fc0b5578be06 Author: Hansi, dl9rdz Date: Thu Sep 23 13:42:32 2021 +0200 typo-- commit 69062ac85601d32736e01f832ca292e3b094cae7 Author: Hansi, dl9rdz Date: Thu Sep 23 13:41:01 2021 +0200 initialize pressure with NAN commit 03968f6ab4b78547b6ca008bb252d7a8aefb6221 Author: Hansi, dl9rdz Date: Thu Sep 23 13:30:56 2021 +0200 clear all data also on SH import commit 9fdfc02cafd64eb80cd69fafb70fda493f46a6ac Author: Hansi, dl9rdz Date: Thu Sep 23 12:49:56 2021 +0200 station update also if disconected commit 4622f6f99a825c5b96ef7ffaacbbb8932abe7385 Author: dl9rdz Date: Thu Sep 23 12:41:29 2021 +0200 Update README.md commit 910220775af50ef09806d5276d864796ca301fcb Merge: 7173fd1 8408f3b Author: eben80 Date: Thu Sep 23 12:40:32 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 7173fd101acead47fd57080bdb40f325d51322fe Merge: 01bde16 469d64a Author: eben80 Date: Thu Sep 23 12:22:11 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 8408f3b78520a9688c73a8e10416c264a44f7ec9 Author: Hansi, dl9rdz Date: Thu Sep 23 12:22:05 2021 +0200 (nits) commit 469d64ab01e6afb845e688073a1fe239ea91b319 Author: Hansi, dl9rdz Date: Thu Sep 23 12:16:06 2021 +0200 update default config for RS92 eph commit 280dd6cef19f77cc2d652d7557d37dce94d1da51 Author: Hansi, dl9rdz Date: Thu Sep 23 12:11:25 2021 +0200 +version update commit 8d0d897c3bd0273a99b7a77049dc51f4ca7f59d9 Author: Hansi, dl9rdz Date: Thu Sep 23 12:10:58 2021 +0200 RS41 P to sondehub commit 971a2e6d652f855fdd02e3e754dd84d777acea49 Author: Hansi, dl9rdz Date: Thu Sep 23 12:07:54 2021 +0200 +RS41 P data commit 01bde1672d3565ce54e38b2a952dd141ad87b453 Merge: fdf45f4 d0c9e10 Author: eben80 Date: Thu Sep 23 09:30:56 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit d0c9e10a9d364894eb755d77edb59e3828bd93bd Author: Hansi, dl9rdz Date: Thu Sep 23 09:20:07 2021 +0200 chasemapper position accuracy fixed commit abf46b7b7e067f2475dd3387bea3ccecfd1fc3b1 Merge: 8aefe13 4cc12f3 Author: Michael Carter Date: Wed Sep 22 21:12:44 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit fdf45f44a96c895b1b7a2a1163511dab2784a5b6 Merge: 9e347a4 4cc12f3 Author: eben80 Date: Wed Sep 22 21:59:16 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit ff301ee458a49c60419c5a38f2270d64ab36624a Author: Hansi, dl9rdz Date: Wed Sep 22 21:41:47 2021 +0200 stricter crc and validity check for RS41 commit 4cc12f3f7429f02499ae8505d812a1a857be9533 Author: Hansi, dl9rdz Date: Wed Sep 22 21:27:29 2021 +0200 don't send NaN in LiveMap JSON commit 9e347a48e620dc36f01ab6ba8e7f90e34b5bb96f Merge: 0291c96 0d03b2a Author: eben80 Date: Wed Sep 22 18:59:45 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 8aefe13bbc25433d69aafd7299378b118ffa6e48 Merge: e851933 0d03b2a Author: Michael Carter Date: Wed Sep 22 15:52:56 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 0d03b2abae2cf9f38507b96c0cf8d6d55b00965e Author: Hansi, dl9rdz Date: Wed Sep 22 16:46:15 2021 +0200 Enhanced network handling for sondehub commit fab83de8880b928ddc0d859643674e84544935d8 Author: Hansi, dl9rdz Date: Wed Sep 22 16:35:04 2021 +0200 don't send nan temp to chasemapper commit 89ffef6c24ccf0240a0682f39c4c5d5da0e3a26a Author: Hansi, dl9rdz Date: Wed Sep 22 16:16:32 2021 +0200 Arduino IDE autoformat commit d4de05e29bdf3c1d0ed8e4aeb688720cb6a79869 Author: Hansi, dl9rdz Date: Wed Sep 22 16:16:15 2021 +0200 get read of delays caused by readUntil from network commit cb5b3584d0563e086b09fa5f37ce64f034ce3df7 Author: Hansi, dl9rdz Date: Wed Sep 22 13:50:18 2021 +0200 fix temp/hum empty check in sync with recent updates commit e8519339b362f8da99e192eb5bc7bc5dafe00f52 Merge: ab1da6e b297a9a Author: Michael Carter Date: Wed Sep 22 12:26:29 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 0291c96f504258c0715aad257d1ae420c3b89def Merge: 5071cde b297a9a Author: eben80 Date: Wed Sep 22 11:58:29 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit b297a9a7c7addd27d8d366acec60bd72e28e9306 Author: Hansi, dl9rdz Date: Wed Sep 22 11:28:29 2021 +0200 some internal reorg that should not break anything but make it easier later to decouple decoding from updating global data, solving part of issue 186 commit ab1da6ea9aacc4a507f31aeec816c9d043a8b590 Merge: 8a62085 5384d36 Author: Michael Carter Date: Wed Sep 22 09:43:48 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit ac05c9edbddd66dd404d277e5e0854d91674bd0e Author: Hansi, dl9rdz Date: Wed Sep 22 10:39:34 2021 +0200 never remove currentSonde by ShImport commit 8ffaa8be63b305c3712a59eaab4ee963793dadbe Author: Hansi, dl9rdz Date: Wed Sep 22 10:03:22 2021 +0200 temp, hum with 1 decimal digit for sondehub commit 032d8452c658240ac5a921842fbe6898683b196c Author: Hansi, dl9rdz Date: Wed Sep 22 10:02:40 2021 +0200 clear all decoded data on ID change, don't leave anything old behind commit 5071cde442bc2adaad7212ea8bf73de96a4f7bf7 Merge: 02eb47b 5384d36 Author: eben80 Date: Wed Sep 22 07:15:30 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 5384d361518e7d382e8b28566e5b885e0e017d96 Merge: 33856db e4ded3b Author: Hansi, dl9rdz Date: Tue Sep 21 23:50:57 2021 +0200 Merge branch 'eben80-patch-1' into devel commit 33856db2e1824746327cfbcacca902c69c155578 Author: Hansi, dl9rdz Date: Tue Sep 21 23:50:54 2021 +0200 cfg: add links to wiki commit e4ded3be7f318e1faacc3bac1e0c5fb16fb75d93 Author: eben80 Date: Tue Sep 21 19:21:46 2021 +0200 Small fix to ensure that sonde_id field. This makes sure that sonde_id doesn't go back to the Launch Site name if there is something in data.id when status is blinking yellow. commit 8a62085f4f362a009a041abf6b52fc14756c2f0d Merge: 3b51a90 49c0d00 Author: Michael Carter Date: Tue Sep 21 16:36:26 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 02eb47bb77c87714e470bb33955a109dc0d11ba5 Merge: 35cb3be 49c0d00 Author: eben80 Date: Tue Sep 21 14:37:51 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 49c0d0092702d0a5e3187875b2b486669fb9430d Author: Hansi, dl9rdz Date: Tue Sep 21 14:17:48 2021 +0200 send batt to sondehub; count down (burst_timer) only if fresh commit 3b51a903d66954b0d37fd960306bde794249ac0d Merge: de41088 2dad197 Author: Michael Carter Date: Tue Sep 21 12:55:10 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 35cb3be7937b24e8f2a4b84a41559bd6453fa934 Merge: 9825442 2dad197 Author: eben80 Date: Tue Sep 21 13:46:46 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 2dad197a9c9b1f1b60f662b5f4f4a253bf92d8d7 Author: Michael Carter Date: Tue Sep 21 12:36:04 2021 +0100 Add battery voltage (#183) commit de41088270d5058ce16b331364dc70ce41f4e07c Merge: 5e0a985 86566c0 Author: michael carter Date: Tue Sep 21 12:24:44 2021 +0100 Merge branch 'devel' of github.com:mycarda/rdz_ttgo_sonde into devel commit 5e0a98512b3b80833aaeddef952f6d526f837603 Author: michael carter Date: Tue Sep 21 12:24:01 2021 +0100 Add battery voltage commit 98254422725ca538f7d5fbba49b654ddc0e8e866 Merge: 6247f25 e32ea8e Author: eben80 Date: Tue Sep 21 11:13:21 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit e32ea8e432d3dcd85897fdf475db51b3118bb703 Author: eben80 Date: Tue Sep 21 11:04:44 2021 +0200 LiveMap updates to include last received datetime, heading and rssi (#182) * Add direction, UTC datetime and rssi to livemap * Further fixes Co-authored-by: dl9rdz commit 56d6e357821ee61a842ca676107acb73e50e7ac4 Author: dl9rdz Date: Tue Sep 21 10:43:46 2021 +0200 Update README.md commit afbfde07dd40e97aeacee55fa4f6e4db6c0de505 Author: Hansi, dl9rdz Date: Tue Sep 21 10:40:21 2021 +0200 +Chasemapper udp support commit 13134b32f7b119f353969f5968d2d24aeb21e437 Author: Hansi, dl9rdz Date: Tue Sep 21 09:44:01 2021 +0200 (good for now) commit 6247f259f17b012677e5f1f500c8460cb9cfb846 Merge: ff14518 6e14848 Author: eben80 Date: Tue Sep 21 09:32:54 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 6e148489f35a193cd1db2638df06f809b171874f Author: Hansi, dl9rdz Date: Tue Sep 21 08:29:53 2021 +0200 keep data on livemap - restore old behaviour commit ff145180f2ed6ed134ea9ef9eac7b8220ed26954 Merge: 3d6d953 86566c0 Author: eben80 Date: Mon Sep 20 19:22:03 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 86566c042710f4062fa20a2912925d85cb2591d6 Author: Hansi, dl9rdz Date: Mon Sep 20 18:18:09 2021 +0200 sync sh import / sh telemetry commit f5281e523cbde86a311bd1d972ef59ba4eff9623 Author: Hansi, dl9rdz Date: Mon Sep 20 16:57:37 2021 +0200 really fix RS41 subtype commit 2dcbcc31419de773e4c25425276c1aad29187c32 Author: Hansi, dl9rdz Date: Mon Sep 20 16:20:53 2021 +0200 fix RS41 subtype commit 3d6d9532d6a08280e711421b10af318fa4497087 Merge: 6df02c1 71c42c9 Author: eben80 Date: Mon Sep 20 12:05:20 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 71c42c938b7a4790f1a3e33bdd8cefbcd548ffc8 Author: Hansi, dl9rdz Date: Mon Sep 20 11:53:50 2021 +0200 don't use u8g2 2.31.1 due to https://github.com/olikraus/u8g2/issues/1594 commit 6df02c1fd043c5126bc78a4d5cb670c27f0051cd Merge: 0266d2f d366a3d Author: eben80 Date: Mon Sep 20 11:37:25 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit d366a3d1efdf41d4791ef8920bca9fa552910de5 Author: Hansi, dl9rdz Date: Mon Sep 20 11:23:46 2021 +0200 don't use u8g2 2.31.1 due to https://github.com/olikraus/u8g2/issues/1594 commit 3cd22dc8c22222f0e713b334ba4a4749ae3e6f34 Merge: 99ccf58 f9316d9 Author: Hansi, dl9rdz Date: Mon Sep 20 11:10:06 2021 +0200 Merge branch 'LukePrior-patch-4' into devel commit f9316d94be57c1dd0b147496c26689d5206af29e Merge: 99ccf58 775b7ff Author: Hansi, dl9rdz Date: Mon Sep 20 11:09:56 2021 +0200 Merge branch 'patch-4' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-4 commit 99ccf581e45706236b5bc2cc1275ae067604d3b4 Author: Hansi, dl9rdz Date: Mon Sep 20 11:09:33 2021 +0200 add dbg msg commit 0266d2fe334d04e9fac9e8a337732f4a82fd3d37 Merge: 838c16c 3591884 Author: eben80 Date: Mon Sep 20 10:17:03 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 775b7ff3e058cfdd81d64e55b5c1102fc28d43e5 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Mon Sep 20 17:27:11 2021 +1000 Update RX_FSK.ino commit 9a60db96d631cae4b19c932bfb43e54810fea191 Author: Hansi, dl9rdz Date: Sun Sep 19 22:46:56 2021 +0200 typo-- commit b6dbbe73ba491892b0ab22a13aeab3fefd067cad Author: Hansi, dl9rdz Date: Sun Sep 19 22:46:27 2021 +0200 typo-- commit 359188436c5d0140744820cd4a60e23b60493601 Author: Hansi, dl9rdz Date: Sun Sep 19 22:21:45 2021 +0200 fixed pos used for live map if no gps pos available commit 1a922aab5210a94932993a6d3b674bd769a09d27 Author: Hansi, dl9rdz Date: Sun Sep 19 20:39:24 2021 +0200 larger buffer for sh messages commit 838c16c5c6b94cffaca0b7736e8abdbab0f37140 Merge: cafcdb2 7ace621 Author: eben80 Date: Sun Sep 19 20:06:59 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 7ace621cf5f04a603ee57c20c3c3da409aa36b85 Author: Hansi, dl9rdz Date: Sun Sep 19 19:56:19 2021 +0200 version update commit 49faf07af556eb4d675bd892dcbdb33d52e7815e Merge: eb769e6 c50a2d1 Author: Hansi, dl9rdz Date: Sun Sep 19 19:55:30 2021 +0200 Merge branch 'LukePrior-patch-3' into devel commit c50a2d1138a99ac2588c0a352ae8182d6b70307b Merge: eb769e6 387d3c0 Author: Hansi, dl9rdz Date: Sun Sep 19 19:55:20 2021 +0200 Merge branch 'patch-3' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-3 commit eb769e6d12320917df017e272b0eff959318b852 Author: Hansi, dl9rdz Date: Sun Sep 19 19:54:06 2021 +0200 RS41 subtype for sondehub commit 387d3c059d75a4445e3c4bba66090239218893b4 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Sep 19 20:25:58 2021 +1000 Update RX_FSK.ino commit b5456d84d1c4faa4cc18c9ccf4cc98c1ba85e94d Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Sep 19 20:17:22 2021 +1000 Always send for RS41 commit e4e89a29d0a50faf98c1408631462580d78cf6d2 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Sep 19 12:23:22 2021 +1000 tidy up SH commit a4b299129e946fd22e079032486531ff90d857af Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Sep 19 12:19:35 2021 +1000 Include burst timer not tested commit a30f51e5a04442859bbeed3ede70ec7eb4988357 Author: Hansi, dl9rdz Date: Sat Sep 18 23:00:18 2021 +0200 fix #165 commit e00d70b385adb43b405dceb92722f675525a848c Author: Hansi, dl9rdz Date: Sat Sep 18 22:36:22 2021 +0200 fix issue #172 with negative lat on livemap commit fe50159157b4b2ac435a920de4ebadadbd189995 Author: Hansi, dl9rdz Date: Sat Sep 18 20:56:47 2021 +0200 minor sh enhancements commit 494380a43d2214194c8b31295de9bf986e816d47 Merge: 22d4927 1fb66cd Author: Hansi, dl9rdz Date: Sat Sep 18 20:30:14 2021 +0200 Merge branch 'LukePrior-patch-2' into devel commit 1fb66cdb0b806d4dad51867647fce81bfa125282 Merge: 22d4927 ae13b78 Author: Hansi, dl9rdz Date: Sat Sep 18 20:30:04 2021 +0200 Merge branch 'patch-2' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-2 commit 22d492711a4fa9bbc941dc2487dffa833f0176da Author: Hansi, dl9rdz Date: Sat Sep 18 20:29:14 2021 +0200 bugfix sh import commit ae1e9e7c489689a72b226a1be999d424e025a9bd Author: Hansi, dl9rdz Date: Sat Sep 18 19:52:42 2021 +0200 cleanup new config interface commit 79f5b199aeb7b64073d9e72a42b02d3d1d93482a Author: Hansi, dl9rdz Date: Sat Sep 18 19:52:22 2021 +0200 cleanup new config interface commit 5c5bfa07251b68c0e9798a6e24716d8a1651168d Author: Hansi, dl9rdz Date: Sat Sep 18 16:51:03 2021 +0200 js-based config form, using less memory. +some cleanup commit ae13b7853a2cddbb52f1be8f66bd9ac77b86690d Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sat Sep 18 13:12:32 2021 +1000 Split temp & humidity SondeHub updates commit cafcdb2c80085eea84b9ffa80af09ed70e3e887a Merge: 6676222 7254558 Author: eben80 Date: Fri Sep 17 14:42:49 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 7254558c4494491c23c0eaf715a219338e88d416 Author: Hansi, dl9rdz Date: Fri Sep 17 13:04:14 2021 +0200 clear subframebuffer if RS41 changes, + minor cleanup commit 6676222cbc2f8630142d237ac57ef8d9a7cdb652 Merge: e75e307 e14915f Author: eben80 Date: Fri Sep 17 12:59:53 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 4897d7634e936095c9fc472e5b94894edd823a2b Merge: ef90bc3 3aeeef0 Author: Hansi, dl9rdz Date: Fri Sep 17 12:55:28 2021 +0200 Merge branch 'mycarda-devel' into devel commit 3aeeef0aab9e8882326850439c392fdfb194ad43 Merge: 35493aa e14915f Author: Michael Carter Date: Fri Sep 17 11:20:27 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 35493aaffd4ad582d2c68b8ce646f2b8f25527d1 Author: michael carter Date: Fri Sep 17 11:11:25 2021 +0100 Updated relative humidity calculation to include pressure commit e14915fbcc0d0d860646f33bad2e159994cdf5c7 Author: eben80 Date: Fri Sep 17 11:47:14 2021 +0200 Fix padding on menu icon (#168) This is to fix alignment issues. commit e75e30768cc937194c441b10887f7fd835d94439 Merge: 62eb246 ef90bc3 Author: eben80 Date: Thu Sep 16 22:46:54 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 3db2160116f4f553477c19f09f9e245ceb4b82b8 Merge: ac1b4af ef90bc3 Author: Michael Carter Date: Thu Sep 16 20:42:25 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit ef90bc3f34d34e280a853c415f8750af4ef86293 Author: Hansi, dl9rdz Date: Thu Sep 16 20:38:35 2021 +0200 OTA also for files (www/js/css) commit ac1b4af475359d88aec8193ccefb7d3592c4851c Merge: cadfc9d debaf57 Author: Michael Carter Date: Thu Sep 16 17:41:18 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit debaf57f88e3f7585683d512e858307e09ad3e33 Author: Hansi, dl9rdz Date: Thu Sep 16 18:33:46 2021 +0200 (travis test for fs ota) commit 374f84115b47693a75ab0170f86cb1ee7b24befd Author: Hansi, dl9rdz Date: Thu Sep 16 17:48:11 2021 +0200 fix #164 commit 29bdcc8f5b451123cc78d7f1ab524217d75ba825 Author: Hansi, dl9rdz Date: Thu Sep 16 17:00:28 2021 +0200 SondeHub frequency import commit cadfc9dd97caa533e2ab6eb55b4a2f7eb64bc0b0 Merge: df62fc0 c766e60 Author: Michael Carter Date: Thu Sep 16 10:36:53 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit df62fc0d7952af2cbe3b1e6e09acd5507218e522 Author: mycarda Date: Thu Sep 16 10:23:01 2021 +0100 testing updates commit 62eb2469594c4060ab27a9f1ad82e5b526070dc7 Merge: 71452e9 c766e60 Author: eben80 Date: Wed Sep 15 08:34:00 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit c766e608195ca3acfdb2f825a49d77e1f0a353ca Author: eben80 Date: Wed Sep 15 01:45:11 2021 +0200 Responsive menu for web interface (#161) * Responsive Web Interface menu. * Add active page indicator * Update style.css * Update index.html commit 71452e97e60224691bd748b4ff6fed3876d7cf10 Merge: c7bd7a7 c01a72c Author: eben80 Date: Wed Sep 15 00:57:56 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit c01a72cf914ee817e3014372a6640a9bd3a7d846 Author: Hansi, dl9rdz Date: Wed Sep 15 00:07:46 2021 +0200 OTA display output fix for TFT commit c7bd7a73ec3102e8f729c791f64979bf692ff8a9 Merge: 0272018 51ad95e Author: eben80 Date: Tue Sep 14 23:59:19 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 33c5ccc905075707b17708648f38ae27c1b2fd73 Author: Hansi, dl9rdz Date: Tue Sep 14 23:35:20 2021 +0200 some code cleanup commit 51ad95e93cab6169280392f654b40904316bce0f Merge: 4118a76 146fbb6 Author: Hansi, dl9rdz Date: Tue Sep 14 22:46:38 2021 +0200 Merge branch 'LukePrior-patch-1' into devel commit 146fbb6f62e3ac424f150df351c58b368c91879b Merge: 4118a76 3078a59 Author: Hansi, dl9rdz Date: Tue Sep 14 22:46:05 2021 +0200 Merge branch 'patch-1' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-1 commit 4118a76a16f33e741383f9b958167278207e30ff Merge: 7324461 6043fc4 Author: Hansi, dl9rdz Date: Tue Sep 14 22:43:59 2021 +0200 Merge branch 'eben80-patch-1' into devel commit 6043fc4fff4ed238acc2213e6a8f116996eec5ed Merge: 7324461 84ed082 Author: Hansi, dl9rdz Date: Tue Sep 14 22:43:48 2021 +0200 Merge branch 'patch-1' of https://github.com/eben80/rdz_ttgo_sonde into eben80-patch-1 commit 73244615a82098f9d9ed4f6ce5477e13077f89ee Author: Hansi, dl9rdz Date: Tue Sep 14 22:43:01 2021 +0200 avoid rs92 decode stack overflow, remove unused code commit 3078a59474350fe9c52d68680d5c68e8c93cf232 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Sep 14 17:49:50 2021 +1000 Update RX_FSK.ino commit a8bf1ed7d34ca611d276c1b1150611264d9bdc13 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Sep 14 12:07:09 2021 +1000 fix str set check sondehub commit 027201838f80150318c899282f22e74105405671 Merge: 56970e8 a97b4e9 Author: eben80 Date: Mon Sep 13 15:51:53 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 84ed0823a08b17c31d98fd8ba7eae0c3e0eecdfc Author: eben80 Date: Mon Sep 13 15:44:20 2021 +0200 Include altitudemode in KML By specifying the altitudemode tag, the kml displays the correct altitude on Google Earth. commit a97b4e9e76cae5749ffd54f647764598c2024d25 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Mon Sep 13 21:37:48 2021 +1000 Missed Sondehub improvements (#157) * fixes * fix Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> commit 56970e8e147d943d5a1ea09377fb44929e98beaf Merge: baf351c 56df804 Author: eben80 Date: Mon Sep 13 12:37:05 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 56df804a6a9f77a39875ff32d6a1dc158f5f3bd3 Merge: 1dd9d29 19e55fb Author: Hansi, dl9rdz Date: Mon Sep 13 11:48:48 2021 +0200 Merge branch 'LukePrior-devel' into devel commit 19e55fb5325b1f4632a37c86f6c663d0cc258634 Merge: 1dd9d29 a61f518 Author: Hansi, dl9rdz Date: Mon Sep 13 11:48:34 2021 +0200 Merge branch 'devel' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-devel commit a61f518c5c31b321a307252345bad4e564112f56 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Sep 13 18:51:41 2021 +1000 another fix commit 86089a349ee94aa9818b7f33aa49c4c4fea4dc57 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Sep 13 18:35:09 2021 +1000 fix bug commit baf351c909be07b67194af8f849ebbe64c6d0a27 Merge: 0d07ad7 1dd9d29 Author: eben80 Date: Mon Sep 13 10:08:35 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 1dd9d297476cc418da5d3123802630486d48385a Author: Hansi, dl9rdz Date: Mon Sep 13 09:57:12 2021 +0200 version update commit 233f06c84fea4d580cace2b7eade13c7c6898fa3 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Sep 13 17:39:58 2021 +1000 change precision commit 3c803f2ed7ca4de8fb746047c562de937cb68d62 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Sep 13 17:28:24 2021 +1000 Sondehub position tidy commit 7980a9c8eef7539d12fa9eb516914ea40b9f0a1e Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Sep 13 16:44:55 2021 +1000 Merge branch 'devel' of https://github.com/LukePrior/rdz_ttgo_sonde into devel commit 3f2947bb0f82d013feb5a53c0f83122309e802fd Author: Hansi, dl9rdz Date: Sun Sep 12 16:34:54 2021 +0200 code reorg and cleanup, no new features commit d35836366acb1fd3da380418e18af15a87f8c7d3 Author: Hansi, dl9rdz Date: Fri Sep 10 15:58:31 2021 +0200 pio build: use v1.1.5 of Arduino_GFX commit 7441a17db599942e745d4b69899726bc76ff1d83 Author: Hansi, dl9rdz Date: Fri Sep 10 15:44:50 2021 +0200 back to arduino esp23 1.0.6. version 2.0.0 has only 60k instead of 130k RAM left, too little for reliable web server operation commit d2cee32a628fc6021aa72211c5e2a25f07a2d677 Author: Hansi, dl9rdz Date: Fri Sep 10 15:25:26 2021 +0200 back to arduino esp23 1.0.6. version 2.0.0 has only 60k instead of 130k RAM left, too little for reliable web server operation commit 4c3a91e3668ac2e0cf8ae3884e984b2682867923 Author: Hansi, dl9rdz Date: Fri Sep 10 13:58:06 2021 +0200 arduino esp32 2.0 w/ updated espressif board mamanger url commit 3be7c20881ffecd8ac9684aaaa3426b033decef2 Author: Hansi, dl9rdz Date: Fri Sep 10 13:30:42 2021 +0200 arduino esp32 2.0 w/ updated espressif board mamanger url commit b87dd34c8e21c923f3ac4201ed117542f4bea9a3 Author: Hansi, dl9rdz Date: Fri Sep 10 13:16:06 2021 +0200 testing Arduino upgrade on travis ci commit 0d07ad700e70de94b13cc5e72a5be513334fa8a8 Merge: 031a8a4 c42204a Author: eben80 Date: Fri Sep 10 09:36:39 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit c42204a5796f32f29766b73e6e7af560b104a4f2 Author: Hansi, dl9rdz Date: Thu Sep 9 23:25:15 2021 +0200 +configurable batt adc, revert screens1.txt commit aa315d545a6aec1f975748001905da4fa09fa6fd Author: Hansi, dl9rdz Date: Thu Sep 9 22:34:50 2021 +0200 revert screens to include all info commit 52e04f1d339b942ee03f86aefbfd80caf7445368 Merge: 4e6514c b783806 Author: Hansi, dl9rdz Date: Thu Sep 9 22:32:01 2021 +0200 Merge branch 'eben80-displayvolts' into devel commit b783806593010254ff1f016a0dad0673f6a0071b Merge: 4e6514c ec660be Author: Hansi, dl9rdz Date: Thu Sep 9 22:31:50 2021 +0200 Merge branch 'displayvolts' of https://github.com/eben80/rdz_ttgo_sonde into eben80-displayvolts commit 4e6514c2776ff575c9f3633cb1b1ec08aa6af288 Author: Hansi, dl9rdz Date: Thu Sep 9 16:26:44 2021 +0200 enhancements for large ILI9341 display commit ec660beeb17c47fee7cc01d5d4582e1fb849ba3e Merge: 519c656 17dbf6e Author: eben80 Date: Thu Sep 9 09:40:24 2021 +0200 Merge branch 'dl9rdz:devel' into displayvolts commit 031a8a48195d78bbcf6d6056b87f9140eaaee186 Merge: dfb042e 17dbf6e Author: eben80 Date: Tue Sep 7 14:42:19 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 17dbf6ec7afe54c4439ec17e9b41df6fa0376abf Author: Hansi, dl9rdz Date: Tue Sep 7 08:52:16 2021 +0200 update manufacturer strings, in sync with old dfm6/9 removal commit 2e65f3b0d67c24ca5b1bb1a4ac319b3ba02af0a8 Author: Hansi, dl9rdz Date: Mon Sep 6 23:26:45 2021 +0200 quite some reorg. virtual frame numbers now in decoders instead of RX_FSK. Better DFM support for sondehub. minor bugs removed, old DFM9 and DFM6 code removed, always use new DFM decoder commit dfb042eef47e174b961ddb6c4f4ef35337226a4e Merge: cd01f0d 085f01b Author: eben80 Date: Mon Sep 6 15:20:03 2021 +0200 Merge branch 'dl9rdz:devel' into devel commit 085f01ba5031240c308a0d13d8e901c1558ed6cc Author: cixio <5869764+cixio@users.noreply.github.com> Date: Sun Sep 5 17:18:19 2021 +0200 livemap: fix prediction for longituade < 0 (tawhiri api uses 0..360) (#148) * Check internet connection * livemap: nicer dots - removed old emoji dots * livemap: fix prediction for longituade < 0 (tawhiri api uses 0..360) commit 4755c0ffca36180fa22dbdc7cfb4a1a681b23daa Author: Hansi, dl9rdz Date: Sun Sep 5 17:10:18 2021 +0200 reset sonde info if configuration is changed (corrected), version update commit b807c512e369d2521d343304021ea609e4d637e7 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Thu Sep 2 02:05:59 2021 +0200 livemap: fix prediction for longituade < 0 (tawhiri api uses 0..360) commit a3ab8b4371397cffb62670426c46357a7d7dbe17 Author: Hansi, dl9rdz Date: Sun Sep 5 17:06:01 2021 +0200 reset sonde info if configuration is changed commit 7e5b04e56eef17590f39f0f41e18d6e92b56a2b2 Author: dl9rdz Date: Thu Sep 2 10:52:06 2021 +0200 Update README.md commit cd01f0db1c352c71ae60a3b5c891d86852a21539 Merge: cd3b34c 4656d2e Author: Eben van Ellewee Date: Wed Aug 25 16:42:50 2021 +0200 Merge branch 'devel' of https://github.com/dl9rdz/rdz_ttgo_sonde into devel commit 4656d2e641d38447ee9c626cbeb024b77c67027e Author: cixio <5869764+cixio@users.noreply.github.com> Date: Tue Aug 17 22:35:05 2021 +0200 livemap: internet connection check + nicer dots (#134) * Check internet connection * livemap: nicer dots - removed old emoji dots commit b69a726df74d257c2cc8d5353110976318661026 Author: Hansi, dl9rdz Date: Tue Aug 17 22:27:43 2021 +0200 probably fixing #97 commit 882d3c3a0f17c47995d97fa01647c3952fd2cecc Author: michael carter Date: Mon Aug 16 08:19:38 2021 +0100 wait for all humidity calibration frames commit c55b97c809b471fb6198ac8f45af8a3f6139553c Merge: 2404cf3 40c9164 Author: Michael Carter Date: Mon Aug 16 08:15:58 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 40c91646b93b142a1d80d9b88e6b37ff55af9459 Author: Hansi, dl9rdz Date: Sun Aug 15 10:27:02 2021 +0200 enable network in AP mode (wifi mode 2) commit 30c88df93aa02869c5d73714f825addd7f3ad19b Author: Hansi, dl9rdz Date: Sun Aug 15 10:20:00 2021 +0200 enable network in AP mode (wifi mode 2) commit 4dcbbc9eb3f8bf83cab4fd085b5769fe04b6dba6 Author: Hansi, dl9rdz Date: Sat Aug 14 00:30:51 2021 +0200 SPI locking and sx1278 configurability commit beab0fa9aab98f5ae20b587527eeb1cbb7e3c810 Author: Hansi, dl9rdz Date: Fri Aug 13 21:59:36 2021 +0200 partial frames are good enough for not running into timeout @ DFM commit eb25f9d5302323edf681df1d5dfa6842bd51fb67 Author: Hansi, dl9rdz Date: Fri Aug 13 00:33:23 2021 +0200 send real decoded type for M10/M20 to sondehub commit 649711b112de0c5e702d4fbdc0ba350592baeba1 Author: Hansi, dl9rdz Date: Thu Aug 12 22:24:04 2021 +0200 tentative better compatibility with older browsers not supporting Unicode 12 commit ce4e0d716234fabdc1f95c74148ce1f67494787a Author: Hansi, dl9rdz Date: Thu Aug 12 13:34:08 2021 +0200 added timeout for live.json request commit 2ef70eaab3eb8724cf910458f7bd2c77963f6111 Merge: aebe1d9 af9da6b Author: Hansi, dl9rdz Date: Thu Aug 12 13:27:09 2021 +0200 Merge branch 'cixio-devel2' into devel commit af9da6b2f0e1e9b7ae640557f7df898236627195 Merge: aebe1d9 f11e20d Author: Hansi, dl9rdz Date: Thu Aug 12 13:26:58 2021 +0200 Merge branch 'devel' of https://github.com/cixio/rdz_ttgo_sonde into cixio-devel2 commit aebe1d90bb0546814619294e3bf03968efb4de3f Author: Hansi, dl9rdz Date: Wed Aug 11 20:30:13 2021 +0200 use data only with valid CRC for M10 commit aeb3b1f33379316b6e513eba9ce990243b634c3d Author: Hansi, dl9rdz Date: Wed Aug 11 00:29:29 2021 +0200 automated fixed/chase mode for sondehub. also fix #130 commit f11e20dbabfdaa6d35ebdce5dd8c3a3f1673a5d3 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Tue Aug 10 15:53:32 2021 +0200 Settings for prediction commit 8dc3c7b504afd2805ddcb0ce21e13d1a863174d4 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Tue Aug 10 15:52:10 2021 +0200 back button to top left and new emoji commit d07ef52d227924205612246d52442f26e0fe1472 Merge: b27b070 6183bac Author: Hansi, dl9rdz Date: Mon Aug 9 22:29:34 2021 +0200 Merge branch 'LukePrior-patch-4' into devel commit 6183bacd80a2592211255348f0d876ec1622bfcd Merge: b27b070 8d52aa0 Author: Hansi, dl9rdz Date: Mon Aug 9 22:29:25 2021 +0200 Merge branch 'patch-4' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-4 commit b27b070980a9c02b15c17e23760ab3fe6c905b3e Author: Hansi, dl9rdz Date: Mon Aug 9 22:24:56 2021 +0200 version udpate commit d717ca16e0764ac2cdc893047f975153d26aeff1 Author: Hansi, dl9rdz Date: Mon Aug 9 22:03:22 2021 +0200 LiveMap: fix width of tab bar elements commit dd0d4b952160dbe4662ef5e653a6d9b7d2917ea2 Merge: 74eafe1 89e7fba Author: Hansi, dl9rdz Date: Mon Aug 9 21:55:55 2021 +0200 Merge branch 'cixio-devel' into devel commit 89e7fbab7f93d5df12d7394c8bd0469feaacdc81 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Mon Aug 9 21:04:52 2021 +0200 LiveMap commit 8d52aa08d5c0bcb0bc7f15cd0a01af7e9af938e2 Merge: 78187e6 74eafe1 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Aug 8 17:31:20 2021 +1000 Merge branch 'dl9rdz:devel' into patch-4 commit 74eafe1fd6082fd475e9559a9c4e124fc318b59c Author: Hansi, dl9rdz Date: Sat Aug 7 23:16:51 2021 +0200 maybe a first step for #122 commit e0eafbdfb48aaa22a4c59973b9203aed11ec8894 Author: Hansi, dl9rdz Date: Sat Aug 7 12:27:09 2021 +0200 fix #124 commit 78187e6d761e9d0342859ebf6b69aac5384eb5c5 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sat Aug 7 18:44:50 2021 +1000 Include details for SondeHub configuration settings in web interface commit 1cf4c7d874bf1682dc6591b17232e18f6cf5c5bc Author: Hansi, dl9rdz Date: Fri Aug 6 22:25:16 2021 +0200 +longer wifi wait time commit 8e3bb7f4e0b24ee1df70915066e7c8d69df60a43 Author: Hansi, dl9rdz Date: Fri Aug 6 22:11:46 2021 +0200 better support for ILI9341, and minor polishing commit 449c40b577a4f368566d1bcfb844a2e2483df8e8 Author: Hansi, dl9rdz Date: Fri Aug 6 20:26:15 2021 +0200 last qrg entry missing fix commit 4601fb6cb45c236ca141ba3e843420a2800f0b15 Author: Hansi, dl9rdz Date: Fri Aug 6 16:10:02 2021 +0200 ILI9351 support commit 2404cf3a43a4815a4813c19ba9f37c11517996e2 Merge: 30927f1 cf47a01 Author: Michael Carter Date: Fri Jul 30 08:32:43 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit cf47a01cb0589d4b497fa4fafb0ce66619b93a66 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Wed Jul 28 15:56:42 2021 +1000 Add the changes back & M20 fix (#115) * Add the changes back * Update version number * Only send sats field if not M20 Co-authored-by: dl9rdz commit 96d83e541daacc68dcf9a2ee278fc2561e32584e Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 21:12:48 2021 +1000 fix chase car (#113) Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> commit 2a3aba5c7037fa8bc982c56d7f4df8d789ae5f91 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 21:27:41 2021 +1000 Update precision of data sent (#114) commit 77181d9dadfd1c1d66c3e6e23a7db488148bedf9 Author: Hansi, dl9rdz Date: Tue Jul 27 16:50:46 2021 +0200 (fixed previous commit) commit 473d35b31291883ade7ec0e28f8a2a22c5263ef4 Author: Hansi, dl9rdz Date: Tue Jul 27 16:22:42 2021 +0200 collecting data in single API call for sondehub commit ea865860e604f8f88b5c1899b220d39b6587d65a Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 21:27:41 2021 +1000 Update precision of data sent (#114) commit e23d8338a6af585f67106e2be04ecff2bdbd7d0a Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 21:12:48 2021 +1000 fix chase car (#113) Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> commit 045b61bf23e7d253ea739b53acc8c7eccedffab3 Author: Hansi, dl9rdz Date: Tue Jul 27 13:11:44 2021 +0200 fix M10 dir and sondehub frame# commit 30927f15292889e0b6c2b4b21c4c64d5c0782050 Merge: 23ac400 7555eda Author: Michael Carter Date: Tue Jul 27 06:50:51 2021 +0100 Merge branch 'dl9rdz:devel' into devel commit 7555eda02403dfdd20cea5a8fa6727396bd36062 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 05:14:23 2021 +1000 lat,lon,alt improvements (#103) Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Co-authored-by: dl9rdz commit 5987c92fab269019971490ddbd99f9a01dfe6951 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Tue Jul 27 05:11:33 2021 +1000 SondeHub Fix Chase Cars (#104) * fix chase cars * update version ID * fix version Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Co-authored-by: dl9rdz commit 4dc3ea6974985754d1f8960f7ba99d1deeb7bbe8 Author: Michael Carter Date: Mon Jul 26 20:09:03 2021 +0100 add reboot to control buttons (#111) commit 7f2b9ef611adb4e5bca83e77bdab1aa7252d04b0 Author: Hansi, dl9rdz Date: Mon Jul 26 21:07:24 2021 +0200 M10: extract #sat; M20: upload to sondehub without #sat commit 23ac400ff6afd6c6152b099d45849268d3af90aa Merge: 13787e5 85930bc Author: michael carter Date: Mon Jul 26 17:34:59 2021 +0100 Merge branch 'devel' of https://github.com/mycarda/rdz_ttgo_sonde into devel commit 13787e553c36f001cbaf54cf5cf176d9a467e6e5 Author: michael carter Date: Mon Jul 26 17:34:09 2021 +0100 add reboot to control buttons commit 85930bc3f780d29599a008514701e134a94aa599 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Jul 25 00:53:59 2021 +1000 Fix SondeHub tracker link in web interface (#102) When we switched to the new interface the previous URL structure broke so I have updated it here commit 175d196393bdd861cfef374e701cec395eca800f Author: Hansi, dl9rdz Date: Wed Jun 30 14:44:41 2021 +0200 more robust GPS reset, using clear+load CFG commit a079161c6b1b27272706365bf22cc028e9e00af1 Merge: 2281e91 0e4710d Author: Hansi, dl9rdz Date: Wed Jun 30 13:47:04 2021 +0200 Merge branch 'LukePrior-patch-2' into devel commit 0e4710d17702af840e8ce4a7b94cfb9fcd9eb48f Merge: 2281e91 6e9e5b8 Author: Hansi, dl9rdz Date: Wed Jun 30 13:46:49 2021 +0200 Merge branch 'patch-2' of https://github.com/LukePrior/rdz_ttgo_sonde into LukePrior-patch-2 commit 2281e91921b3af9d9780233dc86b83ef38d63c90 Author: Hansi, dl9rdz Date: Sun Jun 27 18:58:11 2021 +0200 more ttgconfig script features: backup and restore commit 6e9e5b8a7949318e017de15a1600a9882221145b Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Jun 27 22:21:54 2021 +1000 Update RX_FSK.ino commit 6485be7cb2ced857abbdaad5c8919c8a11577669 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sun Jun 27 22:18:32 2021 +1000 Fix M10/M20 time We need to send UTC time for these. commit 19f3004a274c3eefe73e4e7a9b50e9d2de38228c Author: Hansi, dl9rdz Date: Sat Jun 19 08:51:53 2021 +0200 wetterson.de is gone commit 01b71bb5170f003d741fa71bb6ffe6569d5a904b Author: Hansi, dl9rdz Date: Sat Jun 19 08:50:03 2021 +0200 +version update commit 814319e050f4d24441782f405be00cba5734ac80 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sat Jun 19 16:49:51 2021 +1000 Show SondeHub map in web interface (#90) * sondehub * sondehub map in interface * fixes * include notice * more fixes * fix * fix * fix * Delete RX_FSK.ino.cpp * default to station position * tracker fix * fix check to be more robust * revert Co-authored-by: Uskompuf <22492406+Uskompuf@users.noreply.github.com> commit 68b69a2be94f84ca5c42e118bda65332b7b92b32 Author: Hansi, dl9rdz Date: Fri Jun 18 00:45:27 2021 +0200 M10: fix serial number: consistent with M20 (with dashes), consistent with autorx commit 890fef7f2964475573566df158148b179883c677 Author: Hansi, dl9rdz Date: Mon Jun 14 06:38:19 2021 +0200 minor polishing of pull request for sondehub chase mode commit 8861458421aa05b028a497cbbaf0f9dec2e17b1c Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon Jun 14 11:55:26 2021 +1000 GPS Support commit e5b340bd63a8990203d48aa0da9bba30c32ed68a Author: Hansi, dl9rdz Date: Tue Jun 1 01:50:42 2021 +0200 MP3-H1 extended data for SondeHub upload: #sats, timestamp (for frame#), rrsi; fix for wrong time check; filtering repeated frames commit ba680295dcfad3aa6767ef8d049ef3eec44f1a5f Author: Hansi, dl9rdz Date: Sun May 30 10:18:08 2021 +0200 SondeHub: DFM frame numbers using gps time+sec) as in autorx commit e368dd50dc182b9604a3a2a000e74d96592c2f91 Author: Hansi, dl9rdz Date: Sat May 29 14:03:28 2021 +0200 +time check for SondeHub commit faa9fc1630a408983a32bde10252b8ed2e5c5936 Author: Hansi, dl9rdz Date: Sat May 29 13:32:08 2021 +0200 ... ntp time sync merge, moving init the network start commit 35ed5af1a2d59010f6f56eb88b1188d72a4416bf Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 29 19:17:43 2021 +1000 get UTC time from NTP server commit acc71804ab525281e67e5988f65557efecf3dcc4 Author: Hansi, dl9rdz Date: Sat May 29 12:14:13 2021 +0200 DFM subtypes enhancement for SondeHub commit 08572f7cbc878a4d196800c85dfeeaba6370bad0 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 29 18:26:51 2021 +1000 send unix timestamp for DFM, Metomodem commit 45f947cc0bce32db029f0af5142c2fadf38d0abc Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 29 18:07:40 2021 +1000 fix commit 2e54b96396ce9687f8f3455a057bd71b7e04183e Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 29 18:06:43 2021 +1000 DFM subtype, no frame send M10/20/DFM commit 4b23a3a36e6686c99c276c5afda1f578e7f84033 Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Thu May 27 15:37:23 2021 +1000 Update readme with installation instructions commit d8edd44a962871eb99f42647bc03fe2396bdf4bb Author: Hansi, dl9rdz Date: Thu May 27 01:16:17 2021 +0200 + config upload/download tool: --ttgo= option commit a86c10ccbf5274b77bef5943252361437f37391f Author: Hansi, dl9rdz Date: Thu May 27 01:02:43 2021 +0200 + config upload/download tool commit c41808ec18156e59bfe2517356ddba4b8d6e246b Author: Hansi, dl9rdz Date: Mon May 24 21:21:25 2021 +0200 Compatible with newer version of APX library (consistent with platformio, make sure to upgrade your ArduinoIDE), and font enhancements for new ILI9225 libraray commit 3e094f047813a63a31f72019f5f6e7b5568c6454 Author: Hansi, dl9rdz Date: Mon May 24 16:15:17 2021 +0200 ...and minor screen enhancements commit 8d898052163161821d148e26c6bfb9af156f1f7b Author: Hansi, dl9rdz Date: Mon May 24 14:42:07 2021 +0200 ; font update commit e9e4b0eaa6aa4f10426a8a629e2881f1909c828e Author: Hansi, dl9rdz Date: Mon May 24 12:25:09 2021 +0200 README update and other minor things commit f28c464add07e27a5c7557b5c2b73ba271a8b0d7 Author: Hansi, dl9rdz Date: Mon May 24 02:29:58 2021 +0200 some font enhancements for new display driver (working better with some displays) commit b9129950264842422854c0e48c9dc0fe68293361 Author: Hansi, dl9rdz Date: Mon May 24 02:26:07 2021 +0200 sondehub integration: better background handling of reading response data commit c3ff3facea742354c27d47cec582acbcf8471362 Author: Hansi, dl9rdz Date: Sun May 23 19:27:18 2021 +0200 sondehub integration: minor update to README commit a87732d8f8443f529150316ed6cd106c91867b25 Author: Hansi, dl9rdz Date: Sun May 23 19:20:46 2021 +0200 more efficient type check commit 5fdb008a11eb2c460ea4dbb65f606622c188fcf3 Author: Hansi, dl9rdz Date: Sun May 23 16:07:50 2021 +0200 less code duplication, saving some 800 bytes in flash commit 6222cc2d5b4a727322ec7eacb822446555afd0ef Author: Hansi, dl9rdz Date: Sun May 23 12:33:43 2021 +0200 testing the sondehub merge; some conditional compile stuff; force arduino esp board to 1.0.6 for travis as 2.0.0alpha breaks wifi commit 6d5cb40b2d0da1122c40f683bdd9c8736b2568cc Author: Hansi, dl9rdz Date: Sun May 23 11:39:41 2021 +0200 minor mods to merge from oh3bsg; and RXFSK.ini in ArduinoIDE auto format style commit 664a8b35503139308a55e1d1ae4e53e99154a8cc Merge: 6df7694 75bb1a7 Author: Hansi, dl9rdz Date: Sun May 23 11:07:11 2021 +0200 Merge remote-tracking branch 'oh3bsg/sondehub' into sondehub commit 6df7694b99380e0702dc27ef1424e7e41493580f Merge: 80c9f25 92e5d5f Author: Hansi, dl9rdz Date: Sun May 23 10:57:11 2021 +0200 Merge branch 'LukePrior-devel' into devel commit 92e5d5ffc89b220a4439d07b0ab69217ab6e114d Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Sat May 1 09:51:17 2021 +1000 Include SondeHub Tracker Link in Webpage commit 75bb1a734f587a05fc08519289b1a2be980c4583 Merge: f58e265 5a1fc1c Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Sat May 22 11:36:44 2021 +0300 Merge branch 'master' into sondehub commit f58e265b751dd91fe6aa098e60d317db23239adf Merge: 81f8a49 7236626 Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Sat May 22 09:35:22 2021 +0300 Merge pull request #6 from LukePrior/sondehub Only add time for select sonde, prepare temp commit 7236626df8d66b2ebd2d24de4c49e5cfd465cd60 Merge: 939556b 81f8a49 Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Sat May 22 09:35:06 2021 +0300 Merge branch 'sondehub' into sondehub commit 939556b5f64675dfc822f684cd879eae8a86884b Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 22 10:33:08 2021 +1000 bump version commit e0cec31279f68e41b4d22d1d8c53ad83390fbf48 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 22 10:17:04 2021 +1000 upload temp commit dc4eb3afa3a6ad0dea76978276992c104fef9ae3 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Sat May 22 10:05:25 2021 +1000 fix lat lon uploading commit afbfc486061c4c32d8420b51390459833a6f3e8e Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Wed May 19 15:23:11 2021 +1000 check if temp value received, debugging commit c5bad7cf2eeefce9ca8301c9978184c121d73fff Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon May 17 20:05:45 2021 +1000 alt check, sats check commit 81f8a49118ca46003600b73a203d91235e4922cc Author: dl9rdz (via Travis CI) Date: Mon May 17 11:38:16 2021 +0300 check lat, lon and alt zero data commit 6f154f107b953d9fd0c6626170e12379bc9d48d7 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Mon May 17 15:57:21 2021 +1000 Merge branch 'sondehub' of https://github.com/LukePrior/bsg_ttgo into sondehub commit 97b0635dad33c14ec83b68e8c38f4fb7b584ed1f Author: dl9rdz (via Travis CI) Date: Sun May 16 21:54:11 2021 +0300 minor changes commit 10911e48df2a115ceb3cce10144f9d9ca4fb50c0 Author: dl9rdz (via Travis CI) Date: Sun May 16 11:02:41 2021 +0300 Add 18 s to datetime and fix RSSI value commit 0e7dd674a2dc969f4c4aba6ef91748216204973b Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Fri May 14 15:07:25 2021 +0300 Update version.h commit 62005ee3280358fe42f74877389225f54ab4348f Merge: f1ebaa0 7f436d5 Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Fri May 14 14:59:20 2021 +0300 Merge pull request #3 from LukePrior/sondehub Sondehub tracker link, precision updates commit 7f436d54dbb106d0e913a4808636371fb87a196f Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Fri May 14 19:59:40 2021 +1000 Stop crash if not enabled or in AP mode commit 87be88c19a88be2478ee7a42ac56bc2de9583ea1 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Fri May 14 19:38:31 2021 +1000 increase data size to 300 commit 14dbbfc8bb62ee72354b119eaaf74992a7f31279 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Fri May 14 18:57:43 2021 +1000 add email field support, null position default commit b56842c9dc5920cd169bbca3ccacadc0eefc801a Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Fri May 14 15:42:56 2021 +1000 send more values to SondeHub commit 30483560ba8308c5188aabb9997a5a199910e449 Author: Uskompuf <22492406+Uskompuf@users.noreply.github.com> Date: Fri May 14 15:02:30 2021 +1000 unnecessary cast--; precision++; commit b9482906466523774fe4f31e11fb933846cd273e Author: Luke Prior <22492406+LukePrior@users.noreply.github.com> Date: Fri May 14 14:56:27 2021 +1000 Add Sondehub tracker link in web interface commit f1ebaa0d7744fbdcaaa35547544f532999e9a4a3 Author: dl9rdz (via Travis CI) Date: Thu May 13 14:13:20 2021 +0300 Removed TimeLib.h dependency commit 80c9f25183da8a423744263e178a1bf3ed0f5164 Author: Hansi, dl9rdz Date: Sun May 9 10:11:39 2021 +0200 unnecessary cast--; precision++; commit 9a66ad25ff929bc3c3a777b364423e210949e1b8 Author: dl9rdz (via Travis CI) Date: Tue May 4 21:14:23 2021 +0300 Manufacturer and type added commit e5b080d6684fcf3ee8544216bd56d73ede2b9273 Author: dl9rdz (via Travis CI) Date: Sun May 2 17:06:39 2021 +0300 cleaning commit 5ffc016077ee7dd402af77bcdad0cc2810ffba33 Author: Hansi, dl9rdz Date: Sat Apr 24 19:11:36 2021 +0200 test with other display driver -- do not use unless you are sure you want this -- missing font, slow display updates - travis fix commit b4099e1970685139f8494b0eb2c4af18c2c1b131 Author: Hansi, dl9rdz Date: Sat Apr 24 18:57:43 2021 +0200 test with other display driver -- do not use unless you are sure you want this -- missing font, slow display updates commit 9d883313a9098f6c5b83ad49d06ceafbe063ca4b Author: dl9rdz (via Travis CI) Date: Thu Apr 22 23:04:50 2021 +0300 Update RX_FSK.ino commit f148c96509afda858486044dc114e291212f84c3 Author: dl9rdz (via Travis CI) Date: Thu Apr 22 21:05:17 2021 +0300 Update config.txt commit fdf745e87148fc9a206fd69ed9394b01b9a88827 Author: dl9rdz (via Travis CI) Date: Thu Apr 22 21:00:44 2021 +0300 Update networks.txt commit cbd6446c4a7db8d03a446c4e6d023957a63423ed Author: dl9rdz (via Travis CI) Date: Thu Apr 22 20:54:59 2021 +0300 update commit 7323d5fed16d84173de2afd2cd5a8d0e60203497 Author: dl9rdz (via Travis CI) Date: Thu Apr 22 17:55:46 2021 +0300 update commit 85a1291e1389e179c38420d30cf403241c34ec20 Author: Hansi, dl9rdz Date: Fri Apr 2 23:20:41 2021 +0200 partial mp3h1, and (maybe) fix travis for esp 1.0.6 commit 59b2787c24c75325b985e5c794284cca5c6b0967 Author: Hansi, dl9rdz Date: Fri Apr 2 23:02:12 2021 +0200 partial mp3h1 commit 1e72d8f303d495a44297ec2195f0d1ed0b179f85 Author: Hansi, dl9rdz Date: Thu Apr 1 20:42:34 2021 +0200 serial++ commit 5a1fc1ce1be99a4b497dba9e8cc5e968107bfa64 Merge: f6161a9 2154212 Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Fri Apr 2 21:04:56 2021 +0300 Merge pull request #2 from oh3bsg/renaming Renamed server name and other minor updates commit 2154212c3ed7bd21a8bd6edcbddf69557d14f5c7 Author: dl9rdz (via Travis CI) Date: Fri Apr 2 20:58:44 2021 +0300 Renamee server name and other minor updates Renamed server name Updated networks Updated scanning list commit f6161a9c9fd486395eb94d69da21684d11d3338d Merge: 7e817f3 8e6d953 Author: oh3bsg <60152526+oh3bsg@users.noreply.github.com> Date: Fri Apr 2 12:57:57 2021 +0300 Merge pull request #1 from oh3bsg/devel Devel commit 519c656cb0eeddb20c02dd69c2e92e222c0438d4 Author: Eben van Ellewee Date: Tue Mar 30 20:58:50 2021 +0200 Edited OLED Battery screen to show just Volts commit d7f1f37fcc1822f7cdf6eb887f5f5c5139dccdcb Merge: 2db65cc 18760bb Author: Eben van Ellewee Date: Mon Mar 29 10:11:24 2021 +0200 Merge branch 'devel' of https://github.com/dl9rdz/rdz_ttgo_sonde into displayvolts commit 2db65cc2bdda2e411850734282ea6efe433c2c23 Author: Eben van Ellewee Date: Mon Mar 29 09:55:34 2021 +0200 fix if statement commit 684253ce0ed20f91ac232f3696d4126881637744 Author: Eben van Ellewee Date: Mon Mar 29 08:47:42 2021 +0200 Display Battery Volts TTGO 2.1.6 commit cd3b34c494d5929b095d28bd7f7b7164bca3678e Merge: 4ed3baf c1d1887 Author: Eben van Ellewee Date: Mon Mar 29 08:44:33 2021 +0200 Merge branch 'devel' of https://github.com/eben80/rdz_ttgo_sonde into devel commit 18760bb687f94cb198b324f424f4e7ae965ae7df Author: dl9rdz Date: Wed Mar 24 12:38:40 2021 +0100 Update issue templates commit 4da22ab2ec41212da72032c34d9e964cf1121397 Author: Hansi, dl9rdz Date: Tue Mar 16 09:39:54 2021 +0100 fix minor bug that prevents most revent devel versions from communicating with app commit c1d1887d96addc50b65058a619f60a8bf2dd9f9c Merge: 8d66dde 67b11b2 Author: eben80 Date: Mon Mar 15 23:10:13 2021 +0100 Merge pull request #7 from dl9rdz/devel Merge new chanes commit 67b11b2a65c4cf0cc141940978a26ee24436dba1 Author: Hansi, dl9rdz Date: Mon Mar 15 21:51:36 2021 +0100 M10/M20 test: reset pll fast hop (set by spectrum) commit 48b74355e8529b341fde008232ce4f00708404d3 Merge: 8df0859 4fcd24c Author: Hansi, dl9rdz Date: Sun Mar 14 21:31:39 2021 +0100 Merge branch 'temphum' into devel commit 8df0859f1c8669b04e830a80b8a47a6732c8e1d1 Author: Hansi, dl9rdz Date: Sun Mar 14 18:12:07 2021 +0100 gps init bugfix, less debug messages, gps for android w/o gps (+GPGST parser), merge kml live view commit db3f62c24366c07442a6423b2ad043b7dba09f8b Merge: a7a6423 9b9cd87 Author: Hansi, dl9rdz Date: Sun Mar 14 18:05:13 2021 +0100 Merge branch 'kml' into devel commit a7a642332fc118a241c077583ac549a145d63764 Author: Hansi, dl9rdz Date: Tue Mar 2 12:47:46 2021 +0100 test (Joerg) commit a051b069bb4adb74c50ac0f6146bc4b26b640785 Author: Hansi, dl9rdz Date: Sat Feb 27 00:32:03 2021 +0100 fix travis? commit cb6f2a7c9121a728bc69061fc35eab6c3a6b30f4 Author: Hansi, dl9rdz Date: Fri Feb 26 23:40:15 2021 +0100 auto gps factoryreset for t-beam commit 30b7b353390b45d9dec32787031f47a91e88bdb6 Author: Hansi, dl9rdz Date: Sat Feb 20 10:27:50 2021 +0100 fix for wrong DFM position for negative lat/lon (untested) commit 4ed3bafb8631c9c3c81610694cf3cee4f01be3ec Merge: 8d66dde 7db0e8f Author: Eben van Ellewee Date: Mon Feb 15 10:11:35 2021 +0100 Merge branch 'devel' of https://github.com/dl9rdz/rdz_ttgo_sonde into devel commit 7db0e8ff1163675865a153527373cad030d00833 Author: Hansi, dl9rdz Date: Sat Feb 13 12:23:21 2021 +0100 web ui usability enhancements commit 4fcd24cc417866a956edbdc1f99280be6a75349b Author: Michael Carter Date: Thu Feb 11 07:35:41 2021 +0000 Update version.h update version commit 581024f035689f173552638abdd888c7c96c2b1b Author: mycarda Date: Thu Feb 11 07:33:28 2021 +0000 Fix bug for negative uint, convert to float first commit 9b9cd8720bf45dfe73317e75b70e4a501f9d09d1 Author: Tadeusz Magura-Witkowski Date: Wed Feb 10 18:00:00 2021 +0100 Small fixes to make it work with upstream version commit dd3d428fc88e4812e70aa2f59e5cfea722ce5d06 Author: Tadeusz Magura-Witkowski Date: Fri Feb 28 15:29:25 2020 +0100 KML live output commit 6e64cd753c2508677fd62b0ec5cbd96b3c048237 Author: mycarda Date: Tue Feb 9 11:32:01 2021 +0000 minor updates after testing commit 981ecc804474ba24fbea39765df7faf85c6b2d22 Author: Hansi, dl9rdz Date: Tue Feb 9 00:59:56 2021 +0100 detect rdzclient timeout and disconnect from app commit 0304e4ea32c3d45c159f22641c9c15da3f894216 Author: michael carter Date: Mon Feb 8 17:45:17 2021 +0000 subframe and temp, hum calcs commit 8e6d953e60ab51f8709ae6974f4ff25a8ac41246 Author: Hansi, dl9rdz Date: Fri Feb 5 16:51:26 2021 +0100 rs92 eph: configurable ftp site commit 8d66dde162ed194bf519b7675dc092bc8a2d9616 Merge: 4fcf26e a408ae5 Author: eben80 Date: Wed Jan 27 22:32:50 2021 +0100 Merge pull request #4 from dl9rdz/devel always send json data after each frame for rdzwx-go commit a408ae546140d925f59f036967f73ea59eecc710 Author: Hansi, dl9rdz Date: Tue Jan 26 20:57:31 2021 +0100 always send json data after each frame for rdzwx-go commit 4fcf26e8ea1fe2e39e623dcad75d5ed7941efe60 Merge: 82db61c 5ea5720 Author: eben80 Date: Sun Jan 24 22:35:36 2021 +0100 Merge pull request #1 from dl9rdz/devel Get latest commits commit 5ea572053a123ffc80579946815afde00bce1824 Author: Hansi, dl9rdz Date: Sun Jan 24 13:19:56 2021 +0100 better T-Beam 1.1 autodetect commit 0a625f1283703b5b8a77196b0c77d65e5d81d621 Author: Hansi, dl9rdz Date: Sun Jan 24 13:04:17 2021 +0100 better T-Beam 1.1 autodetect commit 82db61c91fa28a535db0158969a1f3dc1b89f976 Author: Hansi, dl9rdz Date: Thu Dec 31 00:10:15 2020 +0100 some reorg, gps factory def, ftp bugfix commit b0f5f0c7ea99926fcfe119b9b22ab825791f0968 Author: Hansi, dl9rdz Date: Wed Dec 30 15:43:58 2020 +0100 enable AXP interrupt only if axp button is enabled in config commit ba338a4a4c98fb556397bf7719b184adb45ae186 Author: Hansi, dl9rdz Date: Wed Dec 30 14:14:51 2020 +0100 minor improvements (display, m10) commit 6350447f64249c2b67864950e912363f97b7886e Author: Hansi, dl9rdz Date: Wed Dec 30 13:57:21 2020 +0100 minor improvements (display, m10) commit ad244bc771106874a3a9a8fd62eae909efba9532 Author: Hansi, dl9rdz Date: Wed Dec 30 13:52:58 2020 +0100 minor improvements (display, m10) commit 32cb370964c4ef01463a8768e0f3fdea6f171c36 Author: Hansi, dl9rdz Date: Wed Dec 30 12:02:57 2020 +0100 MicroNMEA update compatibility by type inference commit 8d560599f1259387cabd7f54261420f298cac763 Author: Hansi, dl9rdz Date: Wed Dec 30 03:35:49 2020 +0100 M10 AFC+ commit 5f3b6e38b54cf2a6112ceb6a1c4969c8d8222a64 Author: Hansi, dl9rdz Date: Mon Dec 28 17:26:28 2020 +0100 (reorder download links: new on top) commit f397781a8ceb126f21d8a0c1625fa71bad637f80 Merge: 1d28450 669c021 Author: Hansi, dl9rdz Date: Mon Dec 28 17:25:22 2020 +0100 Merge branch 'grundsch-add_googlemaps' into devel commit 669c0212cb5c94700ec9c3e522f711e51455d3f2 Merge: 1d28450 392044c Author: Hansi, dl9rdz Date: Mon Dec 28 17:24:58 2020 +0100 Merge branch 'add_googlemaps' of https://github.com/grundsch/rdz_ttgo_sonde into grundsch-add_googlemaps commit 1d284508619cc98905afeb7f967e4953d174ebc1 Author: Hansi, dl9rdz Date: Mon Dec 28 17:14:01 2020 +0100 typo--; more robust web interface commit e273c5e38eac46e9386419d5a3475b25d838f4ca Author: Hansi, dl9rdz Date: Sun Dec 27 23:08:13 2020 +0100 tentative m20 supported (untested) commit 28d5a89fd4e3e201b48a2ee6ff454f4447deb104 Author: Hansi, dl9rdz Date: Sun Dec 27 16:19:28 2020 +0100 mqtt compatibility enhanced: remove trailing comma commit 4bcdc958c29e76180aa35b457ef387ec443703eb Author: Hansi, dl9rdz Date: Tue Dec 15 21:15:15 2020 +0100 reduce html size for QRG form commit 392044ce9f69fc08461ef2f365f529cd727162bf Author: Steph Date: Sun Dec 6 17:12:42 2020 +0100 add googlemaps to data page commit 77df309009bced09a11a3c5f1c0b1bfcbe86c7e3 Author: Hansi, dl9rdz Date: Tue Dec 1 16:29:58 2020 +0100 new version: mqtt support commit 44e373764505bc9b6ee3cd33e0c30ba4252062b2 Author: Hansi, dl9rdz Date: Tue Dec 1 15:42:23 2020 +0100 nits commit 5664ce3e6d9079d957642f28cd7bb5a3c96aadd3 Author: SH Date: Tue Dec 1 09:56:59 2020 +0100 fix travis build commit cc7a00b60aec7a01b23eab2b61e5c22ac07f5871 Merge: b268754 67d0cbf Author: SH Date: Tue Dec 1 09:51:54 2020 +0100 merge commit b268754b66b2476848f58293238b150216202c7e Author: SH Date: Tue Dec 1 09:45:47 2020 +0100 finalize commit 67d0cbf858440b3b6fb302badab26fca062ad59c Author: Hansi, dl9rdz Date: Mon Nov 30 15:44:49 2020 +0100 testing modified DFM decoder, ttgo 2.1_1.6 bugfix, modified screens commit 52a998ebd034bcfcd4259dcc6ab28dcfb20157dc Author: Hansi, dl9rdz Date: Sun Nov 29 16:20:05 2020 +0100 arduino 1.8.13 upgrade for travis commit 4f343800a731b84d2f1883d7341fb3fbff4bc6f6 Author: analogic Date: Mon Nov 23 08:07:51 2020 +0100 Removing unnecessary pin defines commit 1b0cde0f6c46c8254dc122b7584fb55c87bf1e73 Author: Hansi, dl9rdz Date: Sun Nov 29 16:01:54 2020 +0100 debug output cleanup; minor dfm17 id bugs removed commit aaa33267d7b88985f8895924069d5376d4e4924d Author: Hansi, dl9rdz Date: Sat Nov 28 19:53:09 2020 +0100 updated dfm serial numbers commit 39f96e3bcd41c734e52eada7b50010ea0ed20a8d Author: Hansi, dl9rdz Date: Sat Nov 28 01:43:16 2020 +0100 test decode serial of dfm17 etc. commit 2a43004b71219fc30898a632ec49fc2ae0f2c91c Author: SH Date: Thu Nov 26 08:33:58 2020 +0100 fix bool leakage commit 3f74b3a8aa2392b115a71b1a3c8b370d5bbd9d55 Author: SH Date: Wed Nov 25 11:04:58 2020 +0100 remove fixed espressif32 platform version commit 89141622d71033e0f47e862a4261633237ae2214 Author: SH Date: Wed Nov 25 11:03:55 2020 +0100 set mqtt client id commit dcd93dfe97851cd6fef9a4a692d9bb02e054808a Author: SH Date: Wed Nov 25 11:01:18 2020 +0100 mqtt initial implementation commit 5bc751d261f3da109b11f1339ccea4a2d108d36e Author: SH Date: Mon Nov 23 08:14:00 2020 +0100 remove unnecessary flag commit 1954cafa6f2d09c14db1938802929b6e243910e2 Author: Hansi, dl9rdz Date: Fri Nov 20 22:07:29 2020 +0100 support development with platformio (in addition to Arduino IDE) commit 1ea3bdd0eef1a7d86203a2a069e8456651a4ad31 Merge: 8f75960 5715eb0 Author: Hansi, dl9rdz Date: Fri Nov 20 21:48:37 2020 +0100 Merge branch 'analogic-devel' (pull request #36) into devel commit 5715eb0d91be920225df548de2056d9470383ff2 Author: sh Date: Fri Nov 20 21:06:06 2020 +0100 integrat platformio without breaking changes commit 8f75960405be5d18fc68045a3e7daf8b47d448d0 Author: Hansi, dl9rdz Date: Wed Nov 18 10:05:37 2020 +0100 fix horizontal speed value (was wrong for all except RS41) commit b586fafa5a91e914e342c77cd7a4280fff8ddc3a Author: Hansi, dl9rdz Date: Sun Nov 15 16:40:41 2020 +0100 test3 commit e5f3ae8c35500f05acd3a2896b29dd6bf790fb0d Author: Hansi, dl9rdz Date: Sun Nov 15 16:32:08 2020 +0100 test2 commit 3bde8911c2b439395223da4555c3124d2ac4b11f Author: Hansi, dl9rdz Date: Sun Nov 15 16:25:21 2020 +0100 test commit 10594d79e134255f747e2a420670fdd7c1e0f08b Author: Hansi, dl9rdz Date: Sun Nov 15 16:17:08 2020 +0100 fix spectrum display for 1.3inch SH1106 LCD commit e0ad39b9f00d18f4cca261dbbb37cd11fc74e171 Author: Hansi, dl9rdz Date: Wed Nov 11 14:13:33 2020 +0100 tentativ apx key fix commit 92edc5e04c316e229a6e195a44c1d470e3a7c8f1 Author: Hansi, dl9rdz Date: Wed Nov 11 09:42:01 2020 +0100 avoid compilter warnings commit dd900e96f2f9356c8f9be9af7a427560cdef82b7 Merge: cf1b302 7e817f3 Author: Hansi, dl9rdz Date: Wed Nov 11 08:53:11 2020 +0100 Merge branch 'master' into devel commit cf1b3026b0530f7c17a09626d8e83b96d9b41dac Author: cixio <5869764+cixio@users.noreply.github.com> Date: Thu Jul 30 12:30:52 2020 +0200 starting with first enabled QRG on powerup commit 71afbe932b1b7390086b84e3b3a5ee1edb252bd0 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Thu Jul 30 12:30:04 2020 +0200 avoid skipping one ORG in loop when none is enabled commit fa75c2058417e066caa24862a1ec6e80b4ae80dc Author: Hansi, dl9rdz Date: Wed Nov 11 00:12:10 2020 +0100 fix spectrum display for LCD, better display for TFT commit 052f502d456356f423205941d4060fb671616e7b Author: Hansi, dl9rdz Date: Tue Jul 28 22:12:16 2020 +0200 update version with cixio mod commit 51902df994ae6e866e8675f42e7dfc5f9149c6c4 Author: cixio <5869764+cixio@users.noreply.github.com> Date: Tue Jul 28 21:04:28 2020 +0200 allow to access mobile internet connection while connected to sonde commit 8a05698f44ca51522045df89ae7aae99f217c819 Author: Hansi, dl9rdz Date: Tue Apr 14 09:45:53 2020 +0200 edit.html: multipart/form-data instead of urlencoded commit a28042da3d6df3ec885464c5e5ec09245fd733de Author: Hansi, dl9rdz Date: Sun Feb 9 22:01:42 2020 +0100 noch ein versuch es richtig zu machen :) commit b5d7af6445455c9cbc50bc91405dd6a8a9528339 Author: Hansi, dl9rdz Date: Sun Feb 9 21:50:36 2020 +0100 arg. get it right :) commit f87acecb4948d54336036a916232da46d9340149 Author: Hansi, dl9rdz Date: Sun Feb 9 21:41:38 2020 +0100 norx_timeout is in seconds, internal timeout is in ms, so add missing *1000 commit 25ea6876cf7b7fafb68946fd1de87896a2fd3444 Author: Hansi, dl9rdz Date: Sun Feb 9 21:29:41 2020 +0100 enable/disable norx_timeout via config.txt commit c96f4812e9e2b284cedc597635ed97c950f93869 Author: Hansi, dl9rdz Date: Sun Feb 2 21:39:31 2020 +0100 +debug code commit 166eb56a0007259d6a0e5c3e1389d31a959228e8 Author: Hansi, dl9rdz Date: Fri Jan 31 19:34:38 2020 +0100 update version commit cd2fa5136035a935257356bf53d2c80ad9db7bb1 Author: Hansi, dl9rdz Date: Fri Jan 31 19:33:55 2020 +0100 use PWR button as button2 on T-Beam 1.0 commit 2a364870e1eae59bb9f4cff08d50b162c77a1de6 Author: Hansi, dl9rdz Date: Fri Jan 31 18:03:30 2020 +0100 licence info update commit 29e39bd0fa47156b4ff0ef4055e0ea0a8c80cece Author: Hansi, dl9rdz Date: Sun Dec 22 22:21:59 2019 +0100 workaround for asyncWebSocket bug commit faaef5c56ef2190a7a7eff973eb860fd7b0e226f Author: Hansi, dl9rdz Date: Sat Dec 21 18:45:45 2019 +0100 alternative battery display commit e64d699f6a138fb2847a45bc79cdc1c709355a5a Author: Hansi, dl9rdz Date: Sat Dec 21 18:41:34 2019 +0100 configurable mdns name commit 69aea6dcfd84228efee5db26cb4a28698827af50 Author: Hansi, dl9rdz Date: Sat Dec 21 18:07:17 2019 +0100 color for QS bar on TFT display commit 73133f3e61db50ebd3d0292da651aa992e60d09f Author: Hansi, dl9rdz Date: Sat Dec 21 17:43:26 2019 +0100 large font for IP address commit f96086c94e07849ab0c0ca2998f4c5fdb76954ec Author: Hansi, dl9rdz Date: Sat Dec 21 16:59:14 2019 +0100 scan index also for TFT commit 833acaa78e72faa21e957ea0a4c71e3088ee3de5 Author: Hansi, dl9rdz Date: Sat Dec 21 16:50:51 2019 +0100 added missing commit for kill timer display; show scan index commit 3bdee75a41bc6af084e72295424b6adfa1ad57f0 Author: Hansi, dl9rdz Date: Sat Dec 21 16:16:47 2019 +0100 +kill timer values commit e54d63ab22a3ccccce5accbb489d917562a9f40b Author: Hansi, dl9rdz Date: Sat Dec 21 15:30:54 2019 +0100 +kill timer values commit 7255f567aad987362e12e9bb8681bd06b575fc41 Author: Hansi, dl9rdz Date: Wed Dec 11 10:45:19 2019 +0100 additional warning if race condition causes unexpected timeout commit 44e0f8638263d825c2af26e317dd16db416e73a4 Author: Hansi, dl9rdz Date: Wed Dec 11 10:36:49 2019 +0100 make race condition less likely to happen. real solution should use a mutex commit 5459f76a7d94a0037004e6a64383b88b5e9363c6 Author: Hansi, dl9rdz Date: Sat Dec 7 17:14:19 2019 +0100 version update commit 250ead8f866a307f6b80f5180f14a8e08fbc1deb Author: Hansi, dl9rdz Date: Sat Dec 7 16:26:23 2019 +0100 stat bar for tft display commit bf4870c091bb368f50ae14b99ed2f18be4b6d9fe Author: Hansi, dl9rdz Date: Thu Dec 5 15:51:44 2019 +0100 set font commit 8cc844b22fa893a6c938f81e885f14cd1f06ceb5 Author: Hansi, dl9rdz Date: Fri Nov 29 09:47:56 2019 +0100 tentative fix: save kisstnc.active (not yet tested) commit edc09c4e17f31ad4ebc495c4db391b5b9fb9e4be Author: Hansi, dl9rdz Date: Thu Nov 28 08:07:13 2019 +0100 batt info for oled commit 76840649b63e536280f98bee8a5be04dde853ce1 Author: Hansi, dl9rdz Date: Thu Nov 28 08:06:05 2019 +0100 batt info for oled commit aa1699066e04ae824bc298a2d97c1b4b3b66ccb4 Author: Hansi, dl9rdz Date: Mon Nov 25 10:51:51 2019 +0100 RS41: keep previous position if frame with position 0/0 is received commit 57be2b7d80522e24ed925e1f08c721e0670431f0 Author: Hansi, dl9rdz Date: Sun Nov 24 20:54:47 2019 +0100 add simple gpx export commit 324b6d050551b29ff6ca1a326ebf3df010dbb420 Author: Hansi, dl9rdz Date: Sun Nov 24 20:54:23 2019 +0100 add license info commit f407cbb544604114e0f1508d5cbdbebb16b42dbc Author: Hansi, dl9rdz Date: Sun Nov 10 12:04:59 2019 +0100 internal button pullup; touch calibration mode commit 51ebef6d1b4541a9378040ae8b0b1567170754e1 Author: Hansi, dl9rdz Date: Sun Nov 3 21:04:39 2019 +0100 +flip oled support commit d6a32a0529c3a1423728ad3528ffe8f7f5ac6dc0 Author: Hansi, dl9rdz Date: Sun Nov 3 18:05:28 2019 +0100 just adding names for additional config options commit 2eb6a379b911f84356ab79a9af135e2e8963e75f Author: Hansi, dl9rdz Date: Sun Nov 3 17:59:38 2019 +0100 unspukify commit d40af02e12759f58b06c084e35a901c1bb4cbc65 Author: Hansi, dl9rdz Date: Sun Nov 3 00:49:27 2019 +0100 fix travis (mooo.com) comment commit 727ba7158fd8dd630eb3868ee6bd073489379f86 Author: Hansi, dl9rdz Date: Sun Nov 3 00:12:13 2019 +0100 typo-- commit d329189e034311beed940febd5799fb89a2f59e7 Author: Hansi, dl9rdz Date: Sat Nov 2 22:46:05 2019 +0100 spiffs version in mooo.com webpage for travis buidls commit b81dd7d78774c21cbdfc06bfb3e7ca5172f70cd5 Author: Hansi, dl9rdz Date: Sat Nov 2 19:04:06 2019 +0100 make use of LED :) -1 to disable commit f0a92a6d39a652c9325b1f7326cc1a57bf43f314 Author: Hansi, dl9rdz Date: Sat Nov 2 19:01:41 2019 +0100 make use of LED :) commit 9d0fd046e11d1d2772bff423e5b3b3a519cd029e Author: Hansi, dl9rdz Date: Sat Nov 2 16:48:21 2019 +0100 some M10 finetuning (reset IRQ flags when switching to different sonde type, TFT display of M10 ID/Type) commit de5308893a81199171baf648bc643e5feb8c7b7d Author: Hansi, dl9rdz Date: Sat Nov 2 13:18:17 2019 +0100 more info (frame#,sats) and time stamps from sonde in aprsmap data commit 08818e385edbf4bfaeb953fd7107a5ad3ce08c41 Author: Hansi, dl9rdz Date: Sat Nov 2 13:06:23 2019 +0100 make M10 id(dxlnew) fit on screen with freq in one line commit 3d41493ef990b58c22a37b08e282dc934920b732 Author: Hansi, dl9rdz Date: Fri Nov 1 23:35:56 2019 +0100 collect some more info (frame#, gpstime, sat#) from sonde commit 8502e0fc089d7696014bd0d5f1d03610f0abcbc7 Author: Hansi, dl9rdz Date: Fri Nov 1 18:16:06 2019 +0100 meteo commit 4f169fcb233f85c1f1a4070c254279f2ddeb3b86 Author: Hansi, dl9rdz Date: Sun Oct 27 15:45:09 2019 +0100 welcome display for rotated tft display commit 4314e8f23fd4c8c93c0e92b97030e845b0a1e7ce Author: Hansi, dl9rdz Date: Sun Oct 27 15:36:25 2019 +0100 same spiffs location for arduino ide and travis build, second attempt; +tft orientation config commit 84b3357fa076c3e9caa3a243d6c5948a8f8e603e Author: Hansi, dl9rdz Date: Sun Oct 27 14:05:08 2019 +0100 Revert "spiffs location in symc with more recent arduino ide default settings" This reverts commit 0f8a3872db7a9d6d9b5dfdcca97fb248c92e44c5. commit 1940ce2f50bb4899fea5d5005aeb24ee60e405d3 Author: Hansi, dl9rdz Date: Sun Oct 27 14:04:45 2019 +0100 Revert "fix spiffs" This reverts commit 22dbfca9af59cf490b9424cc03f175d09197d8f8. commit 22dbfca9af59cf490b9424cc03f175d09197d8f8 Author: Hansi, dl9rdz Date: Sun Oct 27 13:45:52 2019 +0100 fix spiffs commit 6e9e0e21440eb70babe6d13f73ef19aed1c62af1 Author: Hansi, dl9rdz Date: Sun Oct 27 00:10:13 2019 +0200 fix support for 'real' button2 (not touch) commit 0f8a3872db7a9d6d9b5dfdcca97fb248c92e44c5 Author: Hansi, dl9rdz Date: Sat Oct 26 23:31:05 2019 +0200 spiffs location in symc with more recent arduino ide default settings commit 27c57cffe31526cd1bff9d359932d9e33bc77304 Author: Hansi, dl9rdz Date: Mon Oct 21 21:10:11 2019 +0200 version update commit 4e593b38e0e6b37e000136c147ae6c85dbbcbd4b Author: Hansi, dl9rdz Date: Mon Oct 21 20:51:21 2019 +0200 G0 (circle diagram) and Vbatt for the display commit be64a7bf5fb69e503dc7df8dbecd2e87386ecafb Author: Hansi, dl9rdz Date: Sat Oct 19 16:36:57 2019 +0200 hs in m/s richtig commit 06204b1ad77c318f2869db2a5452d2a6f8166551 Author: Hansi, dl9rdz Date: Sat Oct 19 09:23:18 2019 +0200 more cleanup and better support for ILI9225 displays commit 69b269b0b947eec9c596bae3e2ac3e9e138da992 Author: Hansi, dl9rdz Date: Fri Oct 18 23:34:06 2019 +0200 typo-- commit 3ebdab267657e1f6da63645d30cfb900e280d0c9 Author: Hansi, dl9rdz Date: Fri Oct 18 23:29:43 2019 +0200 some more cleanup, slightly simpler screens configuration, additional screen layouts for ILI9225 commit 22bf0f8c215480acebe7680c7777a57b05d18f02 Author: Hansi, dl9rdz Date: Fri Oct 18 17:04:59 2019 +0200 horizantal speeds as m/s instead of km/h (optionally) commit 038f1f9c6d3d46d02d2507fe6da9ba32b08c60eb Author: Hansi, dl9rdz Date: Fri Oct 18 15:22:43 2019 +0200 Some cleanup, Power control for Heltec v2 board, hor.speed in m/s commit 804632dd884340fc5a0130bf318c966275057e29 Author: Hansi, dl9rdz Date: Wed Oct 16 08:20:36 2019 +0200 version update commit 8f36eb38a5858f75845e12cea78b5f53b19a2479 Author: Hansi, dl9rdz Date: Wed Oct 16 08:20:19 2019 +0200 updated 'docu' in screens.txt commit 111aceebdb816e5008bb419ecc0867497a683ecb Author: Hansi, dl9rdz Date: Wed Oct 16 08:16:28 2019 +0200 box sizes for proportinal fonts; right-justified text; extra text for hs/vs commit 450269510a063f8728f29f36e715874a7d605484 Author: Hansi, dl9rdz Date: Tue Oct 15 13:53:04 2019 +0200 Display options for GPS course and bearing relative to GPS course commit 13594556b72f03be7dcb0ec353f249f0ce2d1a77 Author: Hansi, dl9rdz Date: Mon Oct 14 21:26:31 2019 +0200 more reliable startup on power up for t-Beam 1.0 with oled commit 6d7edc67b8e5121266d10ea2014c04339e050117 Author: Hansi, dl9rdz Date: Mon Oct 14 21:03:25 2019 +0200 add support for Heltec v2 board commit 3e0c7668fbb4d14de37990744e8e97a5f41e5f03 Author: Hansi, dl9rdz Date: Mon Oct 14 08:14:58 2019 +0200 IP color, Wifi Scan on ILI9225, more robust screens.txt editing commit ed60efce87627c55fc21b2a629d899af29209d6e Author: Hansi, dl9rdz Date: Sun Oct 13 19:20:23 2019 +0200 autodetect I2S-Display on T-Beam 1.0 commit 82d4ee110fa4cb7194c47a09c2348bd308225c56 Author: Hansi, dl9rdz Date: Sun Oct 13 18:14:33 2019 +0200 some more display configurations options (select fonts, better but still incomplete support for ILI9225). autodetect of new t-beam 1.0 with oled commit 59098c55b7b69d9169db97986f0c2bfad8dd6928 Merge: 59f42cc 29e502b Author: Hansi, dl9rdz Date: Tue Oct 8 08:05:01 2019 +0200 in sync with master 0.7.1 commit 59f42ccfee043044a7c675573bad08da765116ea Author: Hansi, dl9rdz Date: Tue Oct 8 07:56:58 2019 +0200 minor stuff for 2.2 display commit 47c683ac12386614871ce849faf0cdaf281f4ed5 Author: Hansi, dl9rdz Date: Tue Oct 8 01:06:35 2019 +0200 +fonts commit 998d226433e1fffc19a2b7aede71c8b826b3af0d Author: Hansi, dl9rdz Date: Tue Oct 8 01:00:20 2019 +0200 better display support commit 1a25f0a6ecaae435db12f489fdd8aa68d93712da Author: Hansi, dl9rdz Date: Sat Oct 5 18:08:37 2019 +0200 remove halt loop w/o pmu commit 7fce59ba59d5a162b1ba1998910cceb1ffcb67c4 Author: Hansi, dl9rdz Date: Sat Oct 5 18:03:12 2019 +0200 more autodetection commit 5c0fae7d81352f17b62dda482c2a299e6a73e19d Author: Hansi, dl9rdz Date: Sat Oct 5 17:26:08 2019 +0200 better board model for t-beams commit e57df45e5d5954cd38163c91606fa278edb9d7f5 Author: Hansi, dl9rdz Date: Sat Oct 5 17:16:04 2019 +0200 t-beam 1.0 power up working commit 04f35f6753531466792bed40e62586f4b547ffce Author: Hansi, dl9rdz Date: Sat Oct 5 12:08:44 2019 +0200 more travis testing/debugging commit 7531b60e9ce3c4c71e3663f859585def6529c409 Author: Hansi, dl9rdz Date: Sat Oct 5 12:04:34 2019 +0200 more travis testing/debugging commit 09ff11cabd5cea48213bc2c9de88f3a61f919283 Author: Hansi, dl9rdz Date: Sat Oct 5 11:57:17 2019 +0200 more travis testing/debugging commit d2f892a9026be8ebb286ac3ae699999f0e46cc99 Author: Hansi, dl9rdz Date: Sat Oct 5 11:42:58 2019 +0200 added t-beam 1.0 power management configuration support commit 2bbc905317c358bc1b7c3c6bfa4a3236f783c1b4 Author: Hansi, dl9rdz Date: Sat Oct 5 11:33:38 2019 +0200 some display code reorganization, HW I2C for SSD1306 commit ce86c38babe1fbf94e2a141751521b43f09caee9 Author: Hansi, dl9rdz Date: Sat Oct 5 11:32:49 2019 +0200 read additional display config from config file commit 7956e0b7e9ac2c7a1696a3b91a3b72486c4eb68e Author: Hansi, dl9rdz Date: Sun Sep 29 17:22:53 2019 +0200 upgrade to arduino 1.8.10 commit 2efcc46351254c01606e308fd7830115601e0bf7 Author: Hansi, dl9rdz Date: Sun Sep 29 16:35:38 2019 +0200 remove debug statement commit 34e05738933205fd10f34999fe26d02252281818 Author: Hansi, dl9rdz Date: Sun Sep 29 16:22:07 2019 +0200 added travis debug commit bf6cdb003e3b97342c3d905f0e2bf2804e5e09e6 Author: Hansi, dl9rdz Date: Sun Sep 29 16:10:31 2019 +0200 updated setup (added ILI9225 library) commit 119456935f6718eacb2ca00b4783f1b8617c4de0 Author: Hansi, dl9rdz Date: Sun Sep 29 15:52:18 2019 +0200 updated setup (added ILI9225 library) commit f6cdf342cc9b2571e99b90a8415ff1e64965ff26 Author: Hansi, dl9rdz Date: Sun Sep 29 15:50:35 2019 +0200 partial TFT (ILI9225) support; web/data: only show active frequence commit 079cb4980d528eaf257a8d1b977b7bd083bd1dae Author: Hansi, dl9rdz Date: Wed Sep 11 20:53:58 2019 +0200 first test: tnc tcp/ip server for APRSdroid commit 0053c9549823a8927602f3f869ba4bee1fc143b4 Author: Hansi, dl9rdz Date: Mon Jun 10 08:47:30 2019 +0200 missing update in last commit commit 6abd6a7a1a8defa969543b19979dab1c0fdcd4d1 Author: Hansi, dl9rdz Date: Sun Jun 9 23:23:43 2019 +0200 display layout easier to modify commit 3734101f668b4135896cff80d74bbc856421fe00 Merge: 0a79f1a 46658ad Author: Hansi, dl9rdz Date: Sat Jun 8 15:55:02 2019 +0200 devel in sync with master commit 0a79f1a85084ab0de8b34dc52b497fbea5d8132e Author: Hansi, dl9rdz Date: Sat Jun 8 15:49:30 2019 +0200 a bit better autodetect commit f8206b645a2bfd7a9bbb1a4b1cfab82c7735383c Author: Hansi, dl9rdz Date: Sat Jun 8 14:53:19 2019 +0200 re-enable axudp commit ff035eabd48666b92a071f853543b60b8326983d Author: Hansi, dl9rdz Date: Sat Jun 8 12:55:54 2019 +0200 nicer configuration of button/touch in web interface; autoconfig enhanced commit 2928b41270aa7be3b6ac6a361b69ea9749d6d24c Author: Hansi, dl9rdz Date: Sat Jun 8 10:50:02 2019 +0200 fix travis build: add micronmea library commit 0556d67fa0c8451d48e1321ccc73121beb64500e Author: Hansi, dl9rdz Date: Sat Jun 8 08:47:57 2019 +0200 Several updates for testing before next master release - RS92 should now work fine, inluding some fixes to the ephemeris download, and including information about download - Download only started if there is some RS92 in the qrg.txt configuration - Some enhancements to new internal structure (separate RX Task for handling the SX1278), should now work as good as before the reorganisation :-) - Avoid key glitch after startup on T-BEAM (triggering double wifi scan) - GPS playground (for T-Beam or external GPS connected to board)... commit 7fb4b8f9992c70d7a943685b9dce74172fd4cb84 Author: Hansi, dl9rdz Date: Sun Jun 2 22:24:47 2019 +0200 RS92: display ID commit 561da4fe3e925f91779b478ee60182e5bc5a6647 Author: Hansi, dl9rdz Date: Sun Jun 2 21:19:57 2019 +0200 somewhat usable RS92 decoder commit 01cccdcb754e0b340bb5d39cbfc6ed160e007432 Author: Hansi, dl9rdz Date: Sun Jun 2 12:01:58 2019 +0200 automatically fetch ephemeris once per hour on startup commit 1b192b6471260f9e08b5f75d72c3fcc642dde242 Author: Hansi, dl9rdz Date: Sun Jun 2 11:28:00 2019 +0200 ephemeris data download for RS92 (still not yet fully usable) commit 315586653f864bfac013f5c89649f0e8a7fae787 Author: Hansi, dl9rdz Date: Fri May 31 01:22:27 2019 +0200 removing all compiler warnings commit 15902b0230de64b80339ba80247f36111f9e1713 Author: Hansi, dl9rdz Date: Thu May 30 23:27:33 2019 +0200 some cleanup commit fc60655dfac25967f450aec3b2a78afd61e318e1 Author: Hansi, dl9rdz Date: Thu May 30 22:51:40 2019 +0200 save dram in bss segment commit a22c6797f44f873ea3e5b584c7c08de1de7c7d60 Author: Hansi, dl9rdz Date: Thu May 30 22:19:45 2019 +0200 no new features, but some code reorg: rx handling in a separate task, preparation for RS92 decoding commit beaa04416361e7d3815f0fd99c24dbe29dc76eb4 Author: Hansi, dl9rdz Date: Sun May 26 07:55:22 2019 +0200 default wifi mode back to 3; no-rx timeout only in legacy display mode commit 43807b613d333a04ca51f2d39bcd89de1e32340e Author: Hansi, dl9rdz Date: Sat May 25 10:49:26 2019 +0200 Fully functional touch button support commit b3943aee316e3919846ef8dff6fb311f745cd581 Author: Hansi, dl9rdz Date: Fri May 24 23:49:50 2019 +0200 Several incremental changes (not yet ready for a new release) - Correctly decode DMF06 (thanks to Chrischan for test sonde!!!) - Touch button support (in particular for v2 boards with "real" button) now its sufficient to just touch one of the pins of a v2 board - Multiple displays (inspired by DL2MF's modifications) - Wifi mode 2 (AP2) fixed missing initialization of mDNS (http://rdzsonde.local) - updated OTA URL (my.to domain unfortunately expired) - millis() call removed from ISR (/1000 on uint64_t type in millis causes library function call not marked as IRAM_ATTR, causing crash in some cases - edit files on file system (http://rdzsonde.local/edit.html?file=xyz.txt) (use with caution, no checks for buffer overflows) Some TODOs pending for next release version - sending AXUDP to aprsmap currently disabled - RX loop a bit too slow (in particular with AXUDP enabled), causing loss of RX frames due to SX1278 overflow. Needs some redesign in SX1278 handling. - display layout editable via config file commit 57970412721ec873f79a5bc717d53a1b1dc6a733 Author: Hansi, dl9rdz Date: Thu May 23 20:23:14 2019 +0200 enhance time stamps of travis generated html index commit d26e932c40d0aa2130d98bff8b21636adde78d0e Author: Hansi, dl9rdz Date: Thu May 23 20:03:47 2019 +0200 version number update commit 7844d42c7620c2b463f9ff1d7dab97fc89052ddb Author: Hansi, dl9rdz Date: Thu May 23 19:48:24 2019 +0200 maybe a fix for DFM-06 (still not yet tested) commit 9cea3ed9ad35dc8a5d722ebb0967e62b7991f603 Author: Hansi, dl9rdz Date: Wed May 22 23:04:06 2019 +0200 minor cleanup commit 49b3d771d10ac4b2e6c257166119025bf2c23288 Author: Hansi, dl9rdz Date: Wed May 22 22:35:36 2019 +0200 parse launch-site correctly even if frequency has more or less digits commit e84a5872b57f591f16d80b510dd9568c4e41f0c3 Author: Hansi, dl9rdz Date: Wed May 22 22:13:14 2019 +0200 new configurable display code, finetuning commit d6236b75d2cd6116a873a21e1094fef0031eb181 Author: Hansi, dl9rdz Date: Wed May 22 22:12:53 2019 +0200 simple file editor commit 3339b6841c76e4bbce60060c3d79db8311b35448 Author: Hansi, dl9rdz Date: Wed May 22 14:03:15 2019 +0200 data types cleanup commit 84c7ab80976380e7f16746115b30d4f30790a0f9 Author: Hansi, dl9rdz Date: Wed May 22 13:50:47 2019 +0200 initial touch button support; adapted version of DL2F's alternative display layouts commit 7c238ccc1dbf9f6456f9f63689cdb16e8812e86a Author: Hansi, dl9rdz Date: Wed May 22 11:36:58 2019 +0200 load iframes only when visible commit 6c02e32e183c40286ff8ee678a929d633ebc4dcd Author: Hansi, dl9rdz Date: Mon May 13 22:12:28 2019 +0200 version update commit 8863218ed916375c797b0d0c07dc073443ba0eb7 Author: Hansi, dl9rdz Date: Mon May 13 21:59:25 2019 +0200 wrong default values -- hz, not khz\! commit 054a7cbf82803022f59ac79b9c7a5668733a6acf Merge: 90c117d d8ea59e Author: Hansi, dl9rdz Date: Thu May 9 13:08:48 2019 +0200 Merge branch 'master' into devel commit 90c117da0f8ceb3c0b061672e62a214193ac44a9 Author: Hansi, dl9rdz Date: Tue May 7 02:20:35 2019 +0200 some more configurable options commit 7012768c8ed532d756b5c46829e132fa6b8a8dbb Author: Hansi, dl9rdz Date: Tue May 7 02:17:37 2019 +0200 some more configurable options commit fdeb179a679b5a0baac3dfa6c21df11ba9d23de6 Author: Hansi, dl9rdz Date: Mon May 6 17:25:54 2019 +0200 some config options ++ commit 3549ab21cfd788126a341af3eb88b7e554582c36 Author: Hansi, dl9rdz Date: Mon May 6 01:18:41 2019 +0200 configurable RX and AFC bandwidth; configuration display of AFC value commit 00e67ac018fe8080efb23e9051569d7ffdd205b5 Merge: 84566ec 1b68b09 Author: Hansi, dl9rdz Date: Fri May 3 14:14:56 2019 +0200 devel in sync with master v0.6b commit 84566ec4dd957bf298266a7d47646688987d2525 Author: Hansi, dl9rdz Date: Fri May 3 14:07:39 2019 +0200 enable network services in all wifi modes commit 7cf4b116a67738b58531378432ae3550dacd8c7e Merge: 3ae104d b676149 Author: Hansi, dl9rdz Date: Fri May 3 13:34:35 2019 +0200 Merge branch 'p8' (pull request #8) into devel commit b6761498aad72ac2f4e6af47cca279fbc5d358bc Author: DL2MF Date: Fri May 3 13:07:08 2019 +0200 Fixed RX display line 1 commit 3ae104d10fb4602a5cdd50df22ec86cb035f8958 Author: Hansi, dl9rdz Date: Fri May 3 11:55:26 2019 +0200 + default AP name if networks.txt is missing commit c0fc4980c24ea0bbb8bcd9f9406a3bd4c40ff50f Author: DL2MF Date: Fri May 3 11:38:21 2019 +0200 Added launchsite info to scan and webinterface commit c259e75ce6874ad8256e83993ebd9e6201450bfb Author: Hansi, dl9rdz Date: Fri May 3 08:15:33 2019 +0200 ...and update version info commit 2eaba4fe7e26158285e66519703086140cba7a34 Author: Hansi, dl9rdz Date: Fri May 3 07:53:21 2019 +0200 lokale IP per mDNS annoncieren (http://rdzsonde.local/) commit 1732f17cce35a7f260d8e044a30810a7995d2c60 Author: Hansi, dl9rdz Date: Wed May 1 19:21:29 2019 +0200 fix travis directory listing commit dc16c9fa07f694ce5b0559008e1663c8d82cad5e Author: Hansi, dl9rdz Date: Wed May 1 19:14:36 2019 +0200 explicitly set button pin as input commit 8bd087a9f016a6b093d58ea5e696f0c721ea0ffe Author: Hansi, dl9rdz Date: Wed May 1 00:27:17 2019 +0200 playing around with OTA updates commit 61dbf7bc200dda7f9b038c84dd7f729fd7e2ed56 Merge: a08b5ea 98bd469 Author: Hansi, dl9rdz Date: Mon Apr 29 23:01:27 2019 +0200 Merge branch 'master' into devel commit a08b5ea6c334d661b08c167234aeaf9d178baa73 Author: Hansi, dl9rdz Date: Mon Apr 29 22:49:42 2019 +0200 more travis testing :-/// commit 5a7dfcffcfdb7c5d8e3f853ced9e3bd4a611c3d8 Author: Hansi, dl9rdz Date: Mon Apr 29 22:41:38 2019 +0200 more travis testing :-/ commit cdda2e0f10ec573b86a995367421515d6356dd51 Author: Hansi, dl9rdz Date: Mon Apr 29 22:31:56 2019 +0200 more travis testing :-/ commit 9e04a61b8b0e5994f0297fb4cfefb6e9a509b421 Author: Hansi, dl9rdz Date: Mon Apr 29 22:15:57 2019 +0200 more travis testing commit 378af68174d7fe1351ad02a226455f39ec64833c Merge: 0dd00a8 8febd29 Author: Hansi, dl9rdz Date: Mon Apr 29 22:03:33 2019 +0200 Merge branch 'master' into devel commit 0dd00a8eeba1296fb3d6d9dee0720308ec1d2f64 Author: Hansi, dl9rdz Date: Mon Apr 29 21:59:10 2019 +0200 spectrum timer fixes for v1 boards commit 016c060df4570ebec5900019538571b2ee3f2292 Author: Hansi, dl9rdz Date: Mon Apr 29 21:35:42 2019 +0200 fixed potential C++ object lifetime problems with dangling pointers commit 42f575043826f87573895c1961f98764bc08a86b Author: Hansi, dl9rdz Date: Mon Apr 29 18:19:02 2019 +0200 nicer download page commit 01229e0160358a03239b2201399cf26c7fe30f93 Author: Hansi, dl9rdz Date: Mon Apr 29 18:13:24 2019 +0200 configuration editable via web commit 0981210762aa95d41b80f6434295dab583cd6d1c Merge: 078f0ff d1a419c Author: Hansi, dl9rdz Date: Mon Apr 29 00:24:43 2019 +0200 Merge branch 'master' into devel commit 078f0ff83824aa77fc1144055c43c047b00d4aa3 Author: Hansi, dl9rdz Date: Mon Apr 29 00:23:12 2019 +0200 travis ci testing commit 0e80772b5db1efab282ce3f6158baf5788fc9f12 Merge: b997846 5e0c562 Author: Hansi, dl9rdz Date: Mon Apr 29 00:18:45 2019 +0200 Merge branch 'master' into devel commit b997846f45c6a39a45c4632434f70ae1059b7b8d Author: Hansi, dl9rdz Date: Mon Apr 29 00:06:41 2019 +0200 more debug for networks commit a410c1ad915843e41a770dae14bd61c152090a60 Author: Hansi, dl9rdz Date: Sun Apr 28 23:48:40 2019 +0200 more travis ci testing commit c5ddec7a14a74b3cb5b936f92b809750ac0e4fd1 Author: Hansi, dl9rdz Date: Sun Apr 28 23:36:59 2019 +0200 more debug output for wifi scan commit b191f707dcbd2b1c5a12e998e11215890e5cde41 Author: Hansi, dl9rdz Date: Sun Apr 28 22:57:34 2019 +0200 travis ci testing commit b7ae8f661409c7f1882c416f042960a84be2a50c Author: Hansi, dl9rdz Date: Sun Apr 28 22:35:17 2019 +0200 travis ci testing commit 771bb4865eb2d586632f19ba64b66aa5eead44c4 Author: Hansi, dl9rdz Date: Sun Apr 28 22:26:32 2019 +0200 travis ci testing commit c6e91298b3d2d24c1a9fdcf6225c9eb5c4d6c7f4 Merge: 24dd1f4 f2a1a7e Author: Hansi, dl9rdz Date: Sun Apr 28 22:20:41 2019 +0200 Merge branch 'master' into devel commit 24dd1f4579215c342e74511a315e093749b34612 Author: Hansi, dl9rdz Date: Sun Apr 28 22:14:55 2019 +0200 travis ci commit 1062e55bd7c19b2423170c4cc2ca12b8f4956513 Author: Travis CI Date: Sun Apr 28 22:03:17 2019 +0200 travis ci commit acaf7f6a81dff18edc14ceba82862a551bc05431 Author: Hans P. Reiser Date: Sun Apr 28 19:43:04 2019 +0200 travis testing commit c357dbd71bff6e63968fe5e8bedb0a59f6472bed Author: Hans P. Reiser Date: Sun Apr 28 19:28:46 2019 +0200 travis testing commit b4cc1dc18c46b99cf074363db29391398f636be8 Author: Hans P. Reiser Date: Sun Apr 28 19:24:27 2019 +0200 travis testing commit 43057631493ed6e167a00affc163fd112d3d68ad Author: Hans P. Reiser Date: Sun Apr 28 19:20:06 2019 +0200 travis testing commit e4cce47863104b8f8a4140859213751d87f3ff88 Author: Hans P. Reiser Date: Sun Apr 28 19:17:07 2019 +0200 travis testing commit f51d09f1658b865bc73e1448b9c36edd87f1d849 Author: Hans P. Reiser Date: Sun Apr 28 19:11:16 2019 +0200 travis testing commit e0462c838157353223ef939d3a44851c397f94df Author: Hans P. Reiser Date: Sun Apr 28 18:58:50 2019 +0200 scripts for image generation commit ed174f7617c14d6424bbf8799e57daace5494b33 Author: Hans P. Reiser Date: Sun Apr 28 18:17:27 2019 +0200 +skript for image generation commit 03db476a5e9696d899a7ee2cfe4921ec300ccee9 Merge: eb83c6f 170e7cb Author: Hans P. Reiser Date: Sun Apr 28 16:51:32 2019 +0200 merging master commit eb83c6f50fd6c34a693d7abb63018ef47d4dba1f Author: Hans P. Reiser Date: Sun Apr 28 16:27:36 2019 +0200 fix memory leak - generate reed solomon table only once commit 04196347bb4120d227492fcd8373032cce8e757f Author: Hans P. Reiser Date: Sun Apr 28 16:07:47 2019 +0200 code cleanup commit 90f409e7238fec008d11252c74678facc829bb00 Author: Hans P. Reiser Date: Sun Apr 28 16:04:11 2019 +0200 travis ci testing and minor cleanup commit d68b445d271291f64abfb6268b0bc59bbf535648 Author: Hans P. Reiser Date: Sun Apr 28 15:49:51 2019 +0200 remove duplicated register names commit 10a01b30f1d85c00b508b855868a1fff56164ec9 Author: Hans P. Reiser Date: Sun Apr 28 15:38:33 2019 +0200 testing travis ci commit d9d3edba6a7c3f76e8af073270432c4a7d2fe96d Author: Hans P. Reiser Date: Sun Apr 28 15:36:36 2019 +0200 testing travis ci commit 0d0f360177a0c908fdb959230dae76425fde0bd3 Author: Hans P. Reiser Date: Sun Apr 28 15:24:13 2019 +0200 testing travis ci commit 43130b520536e69b5a736159a8331581dc642c5b Author: Hans P. Reiser Date: Sun Apr 28 15:15:25 2019 +0200 testing travis ci commit 07e037dab72391803510cf961d695976a4118f0c Author: Hans P. Reiser Date: Sun Apr 28 15:01:52 2019 +0200 testing travis ci commit d28abf0f974983f371a2544fc3e12b5efa4cfeb9 Author: Hans P. Reiser Date: Sun Apr 28 14:55:41 2019 +0200 travis ci testing commit 67c65145fb9fcb58ad189752e408fada2b141349 Author: Hans P. Reiser Date: Sun Apr 28 14:50:09 2019 +0200 testing travis ci commit 9f3810c14df22c02ca023d26af9cebe452a3fd0f Merge: 5c37b3f ca3fa52 Author: Hans P. Reiser Date: Sun Apr 28 14:38:13 2019 +0200 Merge branch 'master' into devel commit 5c37b3f0fa64d5fd991c03e4e04ad5575b4d780f Author: Hans P. Reiser Date: Sun Apr 28 14:17:52 2019 +0200 version from config.h also for html page; minor polishing commit 9fea636d2078811932f2ed53af37370468db6697 Author: Hans P. Reiser Date: Sun Apr 28 14:17:37 2019 +0200 version from config.h also for html page; minor polishing commit 75eb15cc243c8ea0ada23e4f4e109467f4c0cd48 Author: Hans P. Reiser Date: Sun Apr 28 13:29:58 2019 +0200 version info in version.h, some code formatting (arduino style) commit 8da577a3138899314dbf8abb81bff0bd28ca1614 Author: Hans P. Reiser Date: Sun Apr 28 13:29:53 2019 +0200 version info in version.h, some code formatting (arduino style) commit b68ffee8b031689493e1946941d7ca60b32297f1 Author: Mike Date: Sat Apr 27 20:54:20 2019 +0200 merging DL2MF's 71cc86cff064682e7774635d236541d7140bc819 commit c67a4fc734e415521b477847600e46bec8269230 Author: DL2MF Date: Sat Apr 27 00:10:11 2019 +0200 merging DL2MF's e2161c57d10a61d15debd4c298984e1dca3787ec commit 6e665cb6ab794d2c6536488a641532671186d7de Author: DL2MF Date: Fri Apr 26 19:21:11 2019 +0200 merging DL2MF's 25b438db84f4ca708250e2cd287c01a30a054fb7 to current devel branch commit 71cc86cff064682e7774635d236541d7140bc819 Author: Mike Date: Sat Apr 27 20:54:20 2019 +0200 Windows GitGui did not update the RX_FSK.ino Some of the latest changes to the .ino were not uploaded correctly. commit e2161c57d10a61d15debd4c298984e1dca3787ec Author: DL2MF Date: Sat Apr 27 00:10:11 2019 +0200 SondeMap on index.html, typo in DFM.cpp altitude fixed. Fix startSpectrum in RX_FSK when joining WLAN. commit b467f25c05fc84976148a1b210e2c5300b1cb53e Author: Hans P. Reiser Date: Fri Apr 26 23:54:36 2019 +0200 working new Wifi support commit 25b438db84f4ca708250e2cd287c01a30a054fb7 Author: DL2MF Date: Fri Apr 26 19:21:11 2019 +0200 Adding WiFi bugfix from b4sh and minor changes in RX_FSK commit 2959dfad4f6bf7943f3ec4c758be4989c5612f06 Author: Hans P. Reiser Date: Fri Apr 26 23:09:09 2019 +0200 background wifi scan/connected/reconnect. partial code, incomplete, for testing station mode only (wifi=1) commit 9f822df519b9fd2e1b5154fc4d8a54012025989a Merge: 9264ec3 0518f07 Author: Hans P. Reiser Date: Tue Apr 23 14:50:51 2019 +0200 sync devel with master v0.4 commit 9264ec3b3bd9045205b20b26f0d3e5d17e0779f2 Author: Hans P. Reiser Date: Tue Apr 23 14:46:52 2019 +0200 GPL info in about window, display update after key press commit fe8003c526d6b3f46423e2d95af662ee33171a50 Author: Hans P. Reiser Date: Tue Apr 23 13:49:57 2019 +0200 minor display fix commit 86f249f094fa7e4c36852b6fe234913e9db5c56d Author: Hans P. Reiser Date: Tue Apr 23 13:29:58 2019 +0200 modifiying pull request: lat should be alt commit d056ec8b762686d1738791b45891dd34f0d6a217 Author: Hans P. Reiser Date: Tue Apr 23 13:08:02 2019 +0200 merging pull request #2 by DL2MF to devel branch commit 86982f6a913bfdcd1d0c6b8a3c698c3fd3a64c05 Author: DL2MF Date: Mon Apr 22 20:12:12 2019 +0200 Fixing missing libs and minor changes, improving spectrum display info. commit a1dd2ebd2c2d3cd2714d939176a69ed6d6589833 Author: DL2MF Date: Sun Apr 21 06:54:49 2019 +0200 Full rebuild, support new params, new functions for ESP LoRa boards w/o buttons commit 619631f80e83ba59e7d644a80830080768fbeadd Author: Hans P. Reiser Date: Wed Apr 17 14:54:19 2019 +0200 configurable oled pins, minor spectrum enhancement commit 1ffe73708f9c107ff4972bf1ca0e24ddad15add8 Author: Hans P. Reiser Date: Wed Apr 17 14:54:08 2019 +0200 configurable oled pins, minor spectrum enhancement commit 500679bdc521e48ea53969cc84ca6bf32fdb9f44 Author: Hans P. Reiser Date: Tue Apr 16 17:51:41 2019 +0200 read config from config.txt, configurable display ports commit 63abbe9a2c42ad7a52e189425331f9a9f08978d3 Author: Hans P. Reiser Date: Tue Apr 16 16:52:16 2019 +0200 dao extension, aprs symbol commit cd30b6ce94512fcbf23a61997000b8a244d5ed09 Merge: 88d75b5 791a6bd Author: Hans P. Reiser Date: Mon Apr 15 21:03:06 2019 +0200 Merge branch 'master' into devel commit 88d75b55c360653af3b27a4ca7af02710f09117e Author: Hans P. Reiser Date: Mon Apr 15 20:59:30 2019 +0200 working version with config page (readonly) commit d2e1b84991ca7275416fb371727f7c4b1743d2a9 Author: Hans P. Reiser Date: Mon Apr 15 20:28:50 2019 +0200 reorg -- currently not working commit a7572ec6f3f69a9a84eb6ccb8cde848a29072e71 Merge: 9b0785b 69cb203 Author: Hans P. Reiser Date: Fri Apr 12 18:55:03 2019 +0200 sync with master commit 9b0785bc44b1346d8e570f63df7b98469c1c0a3b Author: Hans P. Reiser Date: Fri Apr 12 17:57:03 2019 +0200 +setup instructions commit 459673a310ed85f70313cc994e0e034d8c5374d4 Merge: df4514f 2fe6687 Author: Hans P. Reiser Date: Thu Apr 11 00:00:38 2019 +0200 Merge remote-tracking branch 'refs/remotes/origin/devel' into devel commit df4514f48c1cf0d0a1859059d926fabd95fc3c25 Author: Hans P. Reiser Date: Thu Apr 11 00:00:25 2019 +0200 +aprs udp (axupd) commit e386891d2a66ee47eaea72964bb0c1f3c9b5bc82 Author: Hans P. Reiser Date: Thu Apr 11 00:00:19 2019 +0200 +aprs udp (axupd) commit 2fe668727c68e275c0276e16371fe8904b1e0905 Author: Hansi Reiser Date: Wed Apr 10 23:59:41 2019 +0200 +status page commit 26eed1ff7768e73bd76d989c6f5de5443562c831 Author: Hansi Reiser Date: Wed Apr 10 00:29:23 2019 +0200 temp commit a527d5837ecea92eb6a2cca0fd91a59fac199e00 Author: Hansi Reiser Date: Wed Apr 10 00:29:11 2019 +0200 temp commit 7b58febb457a71bc4bde944898a6b0bb874cf048 Author: Hansi Reiser Date: Mon Apr 8 19:22:08 2019 +0200 some web interface updates commit 0d64f8d05de9dcaaf78134295a82b423a22f6081 Author: Hansi Reiser Date: Mon Apr 8 19:22:02 2019 +0200 some web interface updates commit da9d4367be473c0ca1b1a27d5f664314a50d9994 Author: Hans P. Reiser Date: Fri Apr 5 23:32:26 2019 +0200 some minor updates commit e7360f2c1ecdd9fff033c8938f613a52d7e5ef45 Author: Hans P. Reiser Date: Fri Apr 5 20:05:22 2019 +0200 incremental enhancements on train trip commit b3ac2c55064c90adf85d95f45ad2b08dcfe927f4 Author: Hans P. Reiser Date: Fri Apr 5 20:05:18 2019 +0200 incremental enhancements on train trip commit ab4367992efb69aeb645a5c27567522f4c5fb4c6 Author: Hans P. Reiser Date: Thu Apr 4 23:46:48 2019 +0200 some more testing commit d02d687670b5493dc7455b78f3f87c21cd6249ca Author: Hans P. Reiser Date: Thu Apr 4 23:46:37 2019 +0200 some more testing commit 34f9971143445e53919798a52f017dd77eae41cf Author: Hansi Reiser Date: Thu Apr 4 08:11:14 2019 +0200 scanner-test commit a22bb43c892ee1e03f9839190c54db39f9ed187f Author: Hansi Reiser Date: Thu Apr 4 08:10:56 2019 +0200 scanner-test --- .travis.yml | 2 +- RX_FSK/RX_FSK.ino | 65 ++++++++----- RX_FSK/data/cfg.js | 4 +- RX_FSK/data/config.txt | 7 +- RX_FSK/data/livemap.html | 4 +- RX_FSK/data/livemap.js | 183 ++++++++++++++++++++----------------- RX_FSK/data/qrg.txt | 5 +- RX_FSK/data/screens1.txt | 1 + RX_FSK/src/DFM.cpp | 44 +++++---- RX_FSK/src/DFM.h | 3 +- RX_FSK/src/DecoderBase.cpp | 51 +++++++++++ RX_FSK/src/DecoderBase.h | 38 ++++++++ RX_FSK/src/Display.cpp | 59 ++++++++++-- RX_FSK/src/Display.h | 8 +- RX_FSK/src/M10M20.cpp | 23 ++++- RX_FSK/src/M10M20.h | 5 +- RX_FSK/src/MP3H.cpp | 17 +++- RX_FSK/src/MP3H.h | 5 +- RX_FSK/src/RS41.cpp | 18 +++- RX_FSK/src/RS41.h | 5 +- RX_FSK/src/RS92.cpp | 17 +++- RX_FSK/src/RS92.h | 5 +- RX_FSK/src/Sonde.cpp | 20 ++-- RX_FSK/src/Sonde.h | 5 + RX_FSK/src/json.cpp | 106 +++++++++++++++++++++ RX_FSK/src/json.h | 8 ++ RX_FSK/src/mqtt.cpp | 25 ++++- RX_FSK/version.h | 2 +- 28 files changed, 573 insertions(+), 162 deletions(-) create mode 100644 RX_FSK/src/DecoderBase.cpp create mode 100644 RX_FSK/src/DecoderBase.h create mode 100644 RX_FSK/src/json.cpp create mode 100644 RX_FSK/src/json.h diff --git a/.travis.yml b/.travis.yml index 9e0d917..934091c 100644 --- a/.travis.yml +++ b/.travis.yml @@ -49,7 +49,7 @@ install: - ln -s $PWD/libraries/SondeLib /usr/local/share/arduino/libraries/SondeLib - arduino --install-library "U8g2:2.29.11" - arduino --install-library "MicroNMEA" - - arduino --install-library "GFX Library for Arduino" + - arduino --install-library "GFX Library for Arduino:1.1.5" script: - arduino --board esp32:esp32:t-beam --verify $PWD/RX_FSK/RX_FSK.ino - ESPPATH=`arduino --get-pref runtime.tools.xtensa-esp32-elf-gcc.path` diff --git a/RX_FSK/RX_FSK.ino b/RX_FSK/RX_FSK.ino index de921bf..7ca701e 100644 --- a/RX_FSK/RX_FSK.ino +++ b/RX_FSK/RX_FSK.ino @@ -23,6 +23,7 @@ #include "src/aprs.h" #include "src/ShFreqImport.h" #include "src/RS41.h" +#include "src/json.h" #if FEATURE_CHASEMAPPER #include "src/Chasemapper.h" #endif @@ -241,7 +242,7 @@ const String sondeTypeSelect(int activeType) { //trying to work around //"assertion "heap != NULL && "free() target pointer is outside heap areas"" failed:" // which happens if request->send is called in createQRGForm!?!?? -char message[10240 * 4]; //needs to be large enough for all forms (not checked in code) +char message[10240 * 4-2048]; //needs to be large enough for all forms (not checked in code) // QRG form is currently about 24kb with 100 entries ///////////////////////// Functions for Reading / Writing QRG list from/to qrg.txt @@ -545,9 +546,12 @@ const char *createStatusForm() { const char *createLiveJson() { char *ptr = message; - strcpy(ptr, "{"); - SondeInfo *s = &sonde.sondeList[sonde.currentSonde]; + + strcpy(ptr, "{\"sonde\": {"); + // use the same JSON format here as for MQTT and for the Android App + sonde2json( ptr+strlen(ptr), 1024, s ); +#if 0 sprintf(ptr + strlen(ptr), "\"sonde\": {\"rssi\": %d, \"vframe\": %d, \"time\": %d,\"id\": \"%s\", \"freq\": %3.3f, \"type\": \"%s\"", s->rssi, s->d.vframe, s->d.time, s->d.id, s->freq, sondeTypeStr[sonde.realType(s)]); @@ -563,7 +567,8 @@ const char *createLiveJson() { sprintf(ptr + strlen(ptr), ", \"speed\": %.1f", s->d.hs); sprintf(ptr + strlen(ptr), ", \"launchsite\": \"%s\", \"res\": %d }", s->launchsite, s->rxStat[0]); - +#endif + strcat(ptr, " }"); if (gpsPos.valid) { sprintf(ptr + strlen(ptr), ", \"gps\": {\"lat\": %g, \"lon\": %g, \"alt\": %d, \"sat\": %d, \"speed\": %g, \"dir\": %d, \"hdop\": %d }", gpsPos.lat, gpsPos.lon, gpsPos.alt, gpsPos.sat, gpsPos.speed, gpsPos.course, gpsPos.hdop); //} @@ -573,7 +578,6 @@ const char *createLiveJson() { int alt = isnan(sonde.config.rxalt) ? 0 : (int)sonde.config.rxalt; sprintf(ptr + strlen(ptr), ", \"gps\": {\"lat\": %g, \"lon\": %g, \"alt\": %d, \"sat\": 0, \"speed\": 0, \"dir\": 0, \"hdop\": 0 }", sonde.config.rxlat, sonde.config.rxlon, alt); } - } strcat(ptr, "}"); @@ -609,6 +613,8 @@ struct st_configitems config_list[] = { {"rxalt", -7, &sonde.config.rxalt}, {"screenfile", 0, &sonde.config.screenfile}, {"display", -6, sonde.config.display}, + {"dispsaver", 0, &sonde.config.dispsaver}, + {"dispcontrast", 0, &sonde.config.dispcontrast}, /* Spectrum display settings */ {"spectrum", 0, &sonde.config.spectrum}, {"startfreq", 0, &sonde.config.startfreq}, @@ -806,6 +812,9 @@ const char *handleConfigPost(AsyncWebServerRequest * request) { f.close(); Serial.printf("Re-reading file file\n"); setupConfigData(); + // TODO: Check if this is better done elsewhere? + // Use new config (whereever this is feasible without a reboot) + disp.setContrast(); return ""; } @@ -1262,11 +1271,6 @@ void SetupAsyncServer() { request->send(response); }); - // Route to set GPIO to HIGH - server.on("/test.php", HTTP_POST, [](AsyncWebServerRequest * request) { - request->send(SPIFFS, "/index.html", String(), false, processor); - }); - server.on("/live.kml", HTTP_GET, [](AsyncWebServerRequest * request) { request->send(200, "application/vnd.google-earth.kml+xml", createKMLLive(sonde.ipaddr.c_str())); }); @@ -2323,23 +2327,21 @@ void loopDecoder() { sondehub_reply_handler(&shclient); #endif - // wifi (axudp) or bluetooth (bttnc) active => send packet + // wifi active and good packet received => send packet SondeInfo *s = &sonde.sondeList[rxtask.receiveSonde]; - if ((res & 0xff) == 0 && (connected || tncclient.connected() )) { + if ((res & 0xff) == 0 && connected) { //Send a packet with position information // first check if ID and position lat+lonis ok if (s->d.validID && ((s->d.validPos & 0x03) == 0x03)) { char *str = aprs_senddata(s, sonde.config.call, sonde.config.objcall, sonde.config.udpfeed.symbol); - if (connected) { - char raw[201]; - int rawlen = aprsstr_mon2raw(str, raw, APRS_MAXLEN); - Serial.println("Sending AXUDP"); - //Serial.println(raw); - udp.beginPacket(sonde.config.udpfeed.host, sonde.config.udpfeed.port); - udp.write((const uint8_t *)raw, rawlen); - udp.endPacket(); - } + char raw[201]; + int rawlen = aprsstr_mon2raw(str, raw, APRS_MAXLEN); + Serial.println("Sending AXUDP"); + //Serial.println(raw); + udp.beginPacket(sonde.config.udpfeed.host, sonde.config.udpfeed.port); + udp.write((const uint8_t *)raw, rawlen); + udp.endPacket(); if (tncclient.connected()) { Serial.println("Sending position via TCP"); char raw[201]; @@ -2409,6 +2411,21 @@ void loopDecoder() { } else { *gps = 0; } + // + raw[0] = '{'; + // Use same JSON format as for MQTT and HTML map........ + sonde2json(raw+1, 1023, s); + sprintf(raw+strlen(raw), + ",\"active\":%d" + ",\"validId\":%d" + ",\"validPos\":%d" + " %s}\n", + (int)s->active, + s->d.validID, + s->d.validPos, + gps); + int len = strlen(raw); +#if 0 //maintain backwords compatibility float lat = isnan(s->d.lat) ? 0 : s->d.lat; float lon = isnan(s->d.lon) ? 0 : s->d.lon; @@ -2417,7 +2434,6 @@ void loopDecoder() { float hs = isnan(s->d.hs) ? 0 : s->d.hs; float dir = isnan(s->d.dir) ? 0 : s->d.dir; - // int len = snprintf(raw, 1024, "{" "\"res\": %d," "\"type\": \"%s\"," @@ -2473,6 +2489,8 @@ void loopDecoder() { s->d.crefKT, gps ); +#endif + //Serial.println("Writing rdzclient..."); if (len > 1024) len = 1024; int wlen = rdzclient.write(raw, len); @@ -2483,6 +2501,7 @@ void loopDecoder() { //Serial.println("Writing rdzclient OK"); } Serial.print("MAIN: updateDisplay started\n"); + sonde.dispsavectlOFF( (res & 0xff) == 0 ); // handle screen saver (disp auto off) if (forceReloadScreenConfig) { disp.initFromFile(sonde.config.screenfile); sonde.clearDisplay(); @@ -3541,7 +3560,7 @@ void sondehub_send_data(WiFiClient * client, SondeInfo * s, struct st_sondehub * } // Check if current sonde data is valid. If not, don't do anything.... - if (*s->d.ser == 0) return; // Don't send anything without serial number + if (*s->d.ser == 0 || s->d.validID==0 ) return; // Don't send anything without serial number if (((int)s->d.lat == 0) && ((int)s->d.lon == 0)) return; // Sometimes these values are zeroes. Don't send those to the sondehub if ((int)s->d.alt > 50000) return; // If alt is too high don't send to SondeHub // M20 data does not include #sat information diff --git a/RX_FSK/data/cfg.js b/RX_FSK/data/cfg.js index 9ef3bc5..b0abf00 100644 --- a/RX_FSK/data/cfg.js +++ b/RX_FSK/data/cfg.js @@ -11,6 +11,8 @@ var cfgs = [ [ "", "OLED/TFT display configuration", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/Display-configuration" ], [ "screenfile", "Screen config (0=automatic; 1-5=predefined; other=custom)" ], [ "display", "Display screens (scan, default, ...)" ], +[ "dispsaver", "Display saver (0=never/1=always/2=ifnorx [+10*n: after n sec.])" ], +[ "dispcontrast", "OLED contrast (-1=use default; 0..255=set contrast)" ], [ "norx_timeout", "No-RX-timeout in seconds (-1=disabled)"], [ "tft_orient", "TFT orientation (0/1/2/3), OLED flip: 3"], [ "", "Spectrum display configuration", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/Spectrum-configuration" ], @@ -72,7 +74,7 @@ var cfgs = [ [ "sondehub.fimaxdist", "Import maximum distance (km, ≤ 700)" ], [ "sondehub.fimaxage", "Import maximum age (hours, ≤ 48)" ], [ "", "Hardware configuration (requires reboot)", "https://github.com/dl9rdz/rdz_ttgo_sonde/wiki/Hardware-configuration"], -[ "disptype", "Display type (0=OLED/SSD1306, 1=ILI9225, 2=OLED/SH1106, 3=ILI9341, 4=ILI9342)"], +[ "disptype", "Display type (0=OLED/SSD1306, 1=ILI9225, 2=OLED/SH1106, 3=ILI9341, 4=ILI9342, 5=ST7789)"], [ "oled_sda", "OLED SDA/TFT SDA"], [ "oled_scl", "OLED SCL/TFT CLK"], [ "oled_rst", "OLED RST/TFT RST (needs reboot)"], diff --git a/RX_FSK/data/config.txt b/RX_FSK/data/config.txt index aca7559..6d8e254 100644 --- a/RX_FSK/data/config.txt +++ b/RX_FSK/data/config.txt @@ -51,6 +51,10 @@ kisstnc.active = 1 # second entry: default "Receiver" display # additional entries: alternative receiver display, activated by button display=0,1,2,3,4 +# turn off display: 0=never, 1=always, 2=if no RX; (+n*10: after n seconds) +dispsaver=0 +# set OLED contrast (0..255) or leave at factory default (-1) +dispcontrast=-1 # set to -1 to disable (used for "N" values in timers in screens.txt). Value in seconds norx_timeout=20 #-------------------------------# @@ -86,7 +90,8 @@ dfm.rxbw=10400 # s2: www.ngs.noaa.gov/cors/rinex/ #-------------------------------# #ephftp=www.ngs.noaa.gov/cors/rinex/ -ephftp=igs.bkg.bund.de/IGS/BRDC/ +#ephftp=igs.bkg.bund.de/IGS/BRDC/ +ephftp=gssc.esa.int/gnss/data/daily/ #-------------------------------# # axudp for sending to aprsmap #-------------------------------# diff --git a/RX_FSK/data/livemap.html b/RX_FSK/data/livemap.html index cc6b669..5d471af 100644 --- a/RX_FSK/data/livemap.html +++ b/RX_FSK/data/livemap.html @@ -5,10 +5,10 @@ - + - + diff --git a/RX_FSK/data/livemap.js b/RX_FSK/data/livemap.js index 9d425cf..7aeea16 100644 --- a/RX_FSK/data/livemap.js +++ b/RX_FSK/data/livemap.js @@ -13,40 +13,54 @@ $(document).ready(function(){ L.control.scale().addTo(map); L.control.attribution({prefix:false}).addTo(map); - - if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) { - var osm = L.tileLayer('https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png', { - attribution: '© OpenStreetMap contributors © CARTO', - minZoom: 1, - maxZoom: 19 - }); - } else { - var osm = L.tileLayer('https://{s}.tile.openstreetmap.de/tiles/osmde/{z}/{x}/{y}.png', { - attribution: '', - minZoom: 1, - maxZoom: 19 - }); - } - - var esri = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', { - attribution: '
Leaflet · Map: Esri · Earthstar Geographics
', - minZoom: 1, - maxZoom: 20 + + var osmlight = L.tileLayer('https://{s}.tile.openstreetmap.de/{z}/{x}/{y}.png', { + maxZoom: 19, + attribution: '© OpenStreetMap contributors' }); - var basemap = 'osm'; - osm.addTo(map); + var osmdark = L.tileLayer('https://{s}.basemaps.cartocdn.com/dark_all/{z}/{x}/{y}.png', { + attribution: '© OpenStreetMap contributors © CARTO', + maxZoom: 19 + }); + + var opentopo = L.tileLayer('https://{s}.tile.opentopomap.org/{z}/{x}/{y}.png', { + maxZoom: 17, + attribution: 'Map data: © OpenStreetMap contributors, SRTM
Map style: © OpenTopoMap (CC-BY-SA)' + }); + var esri = L.tileLayer('https://server.arcgisonline.com/ArcGIS/rest/services/World_Imagery/MapServer/tile/{z}/{y}/{x}', { + attribution: 'Tiles © Esri — Source: Esri, i-cubed, USDA, USGS, AEX, GeoEye,
Getmapping, Aerogrid, IGN, IGP, UPR-EGP, and the GIS User Community', + maxZoom: 21 + }); + + var basemap; + if (window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches) { + map.addLayer(osmdark); + basemap='osmdark'; + } else { + map.addLayer(osmlight); + basemap='osmlight'; + } + basemap_change = function () { - if (basemap == 'osm') { - map.removeLayer(osm); - map.addLayer(esri); - basemap = 'esri'; - } else { - map.removeLayer(esri); - map.addLayer(osm); - basemap = 'osm'; - } + if (basemap == 'osmlight') { + map.removeLayer(osmlight); + map.addLayer(opentopo); + basemap = 'opentopo'; + } else if (basemap == 'opentopo') { + map.removeLayer(opentopo); + map.addLayer(esri); + basemap = 'esri'; + } else if (basemap == 'esri') { + map.removeLayer(esri); + map.addLayer(osmdark); + basemap = 'osmdark'; + } else { + map.removeLayer(osmdark); + map.addLayer(osmlight); + basemap = 'osmlight'; + } }; if(mapcenter) map.setView(mapcenter, 5); @@ -80,7 +94,6 @@ $('.leaflet-footer').append(footer); var statbar = ''; headtxt = function(data,stat) { - //console.log(data); var staticon = (stat == '1')?greendot:yellowdot; statbar = staticon + statbar; if ((statbar.length) > 10*greendot.length) { statbar = statbar.substring(0,10*greendot.length); } @@ -105,22 +118,23 @@ headtxt = function(data,stat) { $('#sonde_statbar').html(' '+statbar); }; - map.addControl(new L.Control.Button([ { position: 'topleft', text: 'πŸ”™', href: 'index.html' } ])); +map.addControl(new L.Control.Button([ { position: 'topleft', text: 'πŸ”™', href: 'index.html' } ])); - L.control.zoom({ position:'topleft' }).addTo(map); +L.control.zoom({ position:'topleft' }).addTo(map); - map.addControl(new L.Control.Button([ { position: 'topleft', text: 'πŸ—ΊοΈ', href: 'javascript:basemap_change();' } ])); +map.addControl(new L.Control.Button([ { position: 'topleft', text: 'πŸ—ΊοΈ', href: 'javascript:basemap_change();' } ])); - map.addControl(new L.Control.Button([ { position: 'topright', id: "status", text: '', href: 'javascript:get_data();' } ])); +map.addControl(new L.Control.Button([ { position: 'topright', id: "status", text: '', href: 'javascript:get_data();' } ])); + +map.addControl(new L.Control.Button([ + { position:'topright', text: '🎈', href: 'javascript:show(marker[last_id],\'marker\');' }, + { text: '〰️', href: 'javascript:show_line();' }, + { text: 'πŸ’₯', href: 'javascript:show(marker_burst[last_id],\'burst\');' }, + { text: '🎯', href: 'javascript:show(marker_landing[last_id],\'landing\');' } +])); + +map.addControl(new L.Control.Button([ { position:'topright', text: 'βš™οΈ', href: 'javascript:show_settings();' } ])); - map.addControl(new L.Control.Button([ - { position:'topright', text: '🎈', href: 'javascript:show(marker,\'marker\');' }, - { text: '〰️', href: 'javascript:show_line();' }, - { text: 'πŸ’₯', href: 'javascript:show(marker_burst,\'burst\');' }, - { text: '🎯', href: 'javascript:show(marker_landing,\'landing\');' } - ])); - - map.addControl(new L.Control.Button([ { position:'topright', text: 'βš™οΈ', href: 'javascript:show_settings();' } ])); show = function(e,p) { @@ -144,64 +158,65 @@ headtxt = function(data,stat) { show_line = function() { $('.i_position, .i_landing').remove(); map.closePopup(); - if (line._latlngs.length != 0 && line_predict._latlngs.length != 0) { - map.fitBounds(getTwoBounds(line.getBounds(),line_predict.getBounds())); - } else if (line._latlngs.length != 0) { - map.fitBounds(line.getBounds()); - } else if (line_predict._latlngs.length != 0) { - map.fitBounds(line_predict.getBounds()); + if (line[last_id]._latlngs.length != 0 && line_predict[last_id]._latlngs.length != 0) { + map.fitBounds(getTwoBounds(line[last_id].getBounds(),line_predict[last_id].getBounds())); + } else if (line[last_id]._latlngs.length != 0) { + map.fitBounds(line[last_id].getBounds()); + } else if (line_predict[last_id]._latlngs.length != 0) { + map.fitBounds(line_predict[last_id].getBounds()); } }; last_data = false; + last_id = false; follow = 'marker'; - marker_landing = false; + marker_landing = []; icon_landing = L.divIcon({className: 'leaflet-landing'}); dots_predict = []; - line_predict = L.polyline(dots_predict,{color: 'yellow'}).addTo(map); - marker_burst = false; + line_predict = []; + marker_burst = []; icon_burst = L.divIcon({className: 'leaflet-burst'}); - marker = false; + marker = []; dots = []; - line = L.polyline(dots).addTo(map); + line = []; draw = function(data) { var stat; - console.log(data); if (data.id) { + last_id = data.id; // data.res: 0: ok 1: no rx (timeout), 2: crc err, >2 some other error if ((data.lat && data.lon && data.alt) && (lastframe != 0)) { var location = [data.lat,data.lon,data.alt]; - if (!marker) { + if (!marker[data.id]) { map.setView(location, 14); - marker = L.marker(location).addTo(map) + marker[data.id] = L.marker(location).addTo(map) .bindPopup(poptxt('position',data),{closeOnClick:false, autoPan:false}).openPopup(); get_predict(data); } else { - marker.slideTo(location, { + marker[data.id].slideTo(location, { duration: 500, keepAtCenter: (follow=='marker')?true:false }) .setPopupContent(poptxt('position',data)); - if (last_data.id != data.id) { - storage_remove(); - dots = []; - get_predict(data); - } } - dots.push(location); - line.setLatLngs(dots); + if (!dots[data.id]) { dots[data.id] = []; } + dots[data.id].push(location); + if (!line[data.id]) { + line[data.id] = L.polyline(dots[data.id]).addTo(map); + } else { + line[data.id].setLatLngs(dots[data.id]); + } + } if (data.res == 0) { storage_write(data); $('#status').html(greendot); stat = 1; - } - else { + } else { $('#status').html(yellowdot); stat = 0; } @@ -252,8 +267,7 @@ headtxt = function(data,stat) { get_data = function() { $('#status').html(reddot); $.ajax({url: 'live.json', success: (function( data ) { - if (typeof data != "object") { data = $.parseJSON(data);Β } - //console.log(data); + if (typeof data != "object") { data = $.parseJSON(data); } if (data.sonde) { draw(data.sonde); } else { @@ -342,7 +356,7 @@ headtxt = function(data,stat) { var m = new Date(); var datetime = m.getUTCFullYear() + "-" + az(m.getUTCMonth()+1) + "-" + az(m.getUTCDate()) + "T" + az(m.getUTCHours()) + ":" + az(m.getUTCMinutes()) + ":" + az(m.getUTCSeconds()) + "Z"; - var url = 'https://predict.cusf.co.uk/api/v1/'; + var url = 'https://api.v2.sondehub.org/tawhiri'; url += '?launch_latitude='+data.lat + '&launch_longitude='+tawhiri_lon(data.lon); url += '&launch_altitude='+data.alt + '&launch_datetime='+datetime; url += '&ascent_rate='+ascent + '&burst_altitude=' + burst + '&descent_rate='+descent; @@ -352,7 +366,7 @@ headtxt = function(data,stat) { }); }; - draw_predict = function(prediction,data) { + draw_predict = function(prediction,data) { var ascending = prediction.prediction[0].trajectory; var highest = ascending[ascending.length-1]; var highest_location = [highest.latitude,sanitize_lon(highest.longitude)]; @@ -361,34 +375,39 @@ headtxt = function(data,stat) { var landing = descending[descending.length-1]; var landing_location = [landing.latitude,sanitize_lon(landing.longitude)]; - if (!marker_landing) { - marker_landing = L.marker(landing_location,{icon: icon_landing}).addTo(map) + if (!marker_landing[data.id]) { + marker_landing[data.id] = L.marker(landing_location,{icon: icon_landing}).addTo(map) .bindPopup(poptxt('landing',landing),{closeOnClick:false, autoPan:false}); } else { - marker_landing.slideTo(landing_location, { + marker_landing[data.id].slideTo(landing_location, { duration: 500, keepAtCenter: (follow=='landing')?true:false }) .setPopupContent(poptxt('landing',landing)); } - dots_predict=[]; + dots_predict[data.id]=[]; if (data.climb > 0) { - ascending.forEach(p => dots_predict.push([p.latitude,sanitize_lon(p.longitude)])); + ascending.forEach(p => dots_predict[data.id].push([p.latitude,sanitize_lon(p.longitude)])); - if (!marker_burst) { - marker_burst = L.marker(highest_location,{icon:icon_burst}).addTo(map).bindPopup(poptxt('burst',highest),{closeOnClick:false, autoPan:false}); + if (!marker_burst[data.id]) { + marker_burst[data.id] = L.marker(highest_location,{icon:icon_burst}).addTo(map).bindPopup(poptxt('burst',highest),{closeOnClick:false, autoPan:false}); } else { - marker_burst.slideTo(highest_location, { + marker_burst[data.id].slideTo(highest_location, { duration: 500, keepAtCenter: (follow=='burst')?true:false }).setPopupContent(poptxt('burst',highest)); } } - descending.forEach(p => dots_predict.push([p.latitude,sanitize_lon(p.longitude)])); - line_predict.setLatLngs(dots_predict); + descending.forEach(p => dots_predict[data.id].push([p.latitude,sanitize_lon(p.longitude)])); + + if (!line_predict[data.id]) { + line_predict[data.id] = L.polyline(dots_predict[data.id],{color: 'yellow'}).addTo(map); + } else { + line_predict[data.id].setLatLngs(dots_predict[data.id]); + } if (data.climb > 0) { predictor_time = 5 * 60; // ascending, every 5 min @@ -419,7 +438,7 @@ headtxt = function(data,stat) { var add = '
Position: '+lat+', '+lon+'
'+ - 'Open: GMaps |Β OSM |Β Maps.me'; + 'Open: GMaps | OSM | GeoApp'; if (t == 'position') { return '
🎈 '+i.id+''+add+'
'; } if (t == 'burst') { return '
πŸ’₯ Predicted Burst:
'+fd(i.datetime)+' in '+mr(i.altitude)+'m'+add+'
'; } diff --git a/RX_FSK/data/qrg.txt b/RX_FSK/data/qrg.txt index 6b3cc96..069778e 100644 --- a/RX_FSK/data/qrg.txt +++ b/RX_FSK/data/qrg.txt @@ -1,5 +1,8 @@ # Frequency in Mhz (format nnn.nnn) -# Type (4=RS41, 6=DFM normal, DFM-06, 9=DFM inverted, DFM-09) +# Type (4=RS41, R=RS92, D=DFM (automated normal/inverted), M=M10/M20, 3=MP3H) +# (older versions: 6=DFM6, 9=DFM9, now both treated the same as D) +# (older versions: M=M10, 2=M20, now both treaded the same: automated M10/M20 decoding) +# +: active, -: not active # 402.300 4 + Greifswald 402.500 4 - Schleswig diff --git a/RX_FSK/data/screens1.txt b/RX_FSK/data/screens1.txt index 52bd823..bbcc942 100644 --- a/RX_FSK/data/screens1.txt +++ b/RX_FSK/data/screens1.txt @@ -116,6 +116,7 @@ timeaction=#,D,+ 0,9=T 3,0=F MHz 5,0,16=S +7,0=gV 7,5=n ############ diff --git a/RX_FSK/src/DFM.cpp b/RX_FSK/src/DFM.cpp index 1b0cad3..e93ab05 100644 --- a/RX_FSK/src/DFM.cpp +++ b/RX_FSK/src/DFM.cpp @@ -47,6 +47,17 @@ static struct st_dfmstat { float meas[5+2]; } dfmstate; +decoderSetupCfg DFMSetupCfg { + .bitrate = 2500, + // continuous mode + // Enable auto-AFC, auto-AGC, RX Trigger by preamble ???? + .rx_cfg = 0x1E, + .sync_cfg = 0x70, + .sync_len = 2, + .sync_data = (const uint8_t *)"\xAA\xAA", + .preamble_cfg = 0xA8, +}; + int DFM::setup(float frequency, int type) { stype = type; @@ -57,6 +68,12 @@ int DFM::setup(float frequency, int type) DFM_DBG(Serial.println("Setting SX1278 power on FAILED")); return 1; } + + if(DecoderBase::setup(DFMSetupCfg, sonde.config.dfm.agcbw, sonde.config.dfm.rxbw) != 0) { + return 1; + } +#if 0 + // This is now all done by the generic setup method in base class if(sx1278.setFSK()!=0) { DFM_DBG(Serial.println("Setting FSM mode FAILED")); return 1; @@ -65,12 +82,6 @@ int DFM::setup(float frequency, int type) DFM_DBG(Serial.println("Setting bitrate 2500bit/s FAILED")); return 1; } -#if DFM_DEBUG - float br = sx1278.getBitrate(); - Serial.print("Exact bitrate is "); - Serial.println(br); -#endif - if(sx1278.setAFCBandwidth(sonde.config.dfm.agcbw)!=0) { DFM_DBG(Serial.printf("Setting AFC bandwidth %d Hz FAILED", sonde.config.dfm.agcbw)); return 1; @@ -79,11 +90,7 @@ int DFM::setup(float frequency, int type) DFM_DBG(Serial.printf("Setting RX bandwidth to %d Hz FAILED", sonde.config.dfm.rxbw)); return 1; } - - // DFM OLD support has been removed { - // continuous mode - // Enable auto-AFC, auto-AGC, RX Trigger by preamble ???? if(sx1278.setRxConf(0x1E)!=0) { DFM_DBG(Serial.println("Setting RX Config FAILED")); return 1; @@ -99,12 +106,13 @@ int DFM::setup(float frequency, int type) DFM_DBG(Serial.println("Setting PreambleDetect FAILED")); return 1; } - if(sx1278.setPacketConfig(0x08, 0x40)!=0) { - DFM_DBG(Serial.println("Setting Packet config FAILED")); - return 1; - } - sx1278.setPayloadLength(0); // infinite for now... } +#endif + if(sx1278.setPacketConfig(0x08, 0x40)!=0) { + DFM_DBG(Serial.println("Setting Packet config FAILED")); + return 1; + } + sx1278.setPayloadLength(0); // infinite for now... Serial.print("DFM: setting RX frequency to "); Serial.println(frequency); @@ -221,6 +229,8 @@ const char* typestr[16]={ void DFM::killid() { SondeData *sd = &(sonde.si()->d); sd->validID = false; + *(sd->id) = 0; + *(sd->ser) = 0; memset((void *)&dfmstate, 0, sizeof(dfmstate)); } @@ -268,6 +278,7 @@ void DFM::finddfname(uint8_t *b) } if(i==6) { snprintf(sd->id, 10, "D%x ", id); + memcpy(sd->ser, sd->id+1, 9); sd->validID = true; sd->subtype = (st>>4)&0x0F; strncpy(sd->typestr, typestr[ (st>>4)&0x0F ], 5); @@ -319,6 +330,7 @@ void DFM::finddfname(uint8_t *b) snprintf(sd->id, 10, "D%d", ((dfmstate.dat[2*i]<<16)|dfmstate.dat[2*i+1])%100000000); Serial.print("\nNEW AUTOID:"); Serial.println(sd->id); + memcpy(sd->ser, sd->id+1, 9); sd->validID = true; sd->subtype = (st>>4)&0x0F; strncpy(sd->typestr, typestr[ (st>>4)&0x0F ], 5); @@ -402,8 +414,6 @@ void DFM::decodeCFG(uint8_t *cfg) Serial.printf("battery: %f\n", si->batteryVoltage); } } - // new aprs ID (dxlaprs, autorx) is now "D" + serial (8 digits) by consensus - memcpy(sonde.si()->d.ser, sonde.si()->d.id+1, 9); } #if 0 diff --git a/RX_FSK/src/DFM.h b/RX_FSK/src/DFM.h index db7564f..0d690bb 100644 --- a/RX_FSK/src/DFM.h +++ b/RX_FSK/src/DFM.h @@ -15,12 +15,13 @@ #ifndef inttypes_h #include #endif +#include "DecoderBase.h" #define DFM_NORMAL 0 #define DFM_INVERSE 1 /* Main class */ -class DFM +class DFM : public DecoderBase { private: int stype; diff --git a/RX_FSK/src/DecoderBase.cpp b/RX_FSK/src/DecoderBase.cpp new file mode 100644 index 0000000..86a4e00 --- /dev/null +++ b/RX_FSK/src/DecoderBase.cpp @@ -0,0 +1,51 @@ + +#include "DecoderBase.h" +#include "SX1278FSK.h" +#include "Sonde.h" + +#define DECODERBASE_DEBUG 1 + +#if DECODERBASE_DEBUG +#define DBG(x) x +#else +#define DBG(x) +#endif + + +int DecoderBase::setup(decoderSetupCfg &setupcfg, uint16_t agcbw, uint16_t rxbw) { + if(sx1278.setFSK()!=0) { + DBG(Serial.println("Setting FSK mode FAILED")); + return 1; + } + if(sx1278.setBitrate(setupcfg.bitrate)!=0) { + DBG(Serial.println("Setting bitrate FAILED")); + return 1; + } +#if DECODERBASE_DEBUG + float br = sx1278.getBitrate(); + Serial.print("Exact bitrate is "); + Serial.println(br); +#endif + if(sx1278.setAFCBandwidth(agcbw)!=0) { + DBG(Serial.printf("Setting AFC bandwidth %d Hz FAILED", agcbw)); + return 1; + } + if(sx1278.setRxBandwidth(rxbw)!=0) { + DBG(Serial.printf("Setting RX bandwidth to %d Hz FAILED", rxbw)); + return 1; + } + + if(sx1278.setRxConf(setupcfg.rx_cfg)!=0) { + DBG(Serial.println("Setting RX Config FAILED")); + return 1; + } + if(sx1278.setSyncConf(setupcfg.sync_cfg, setupcfg.sync_len, setupcfg.sync_data)!=0) { + DBG(Serial.println("Setting SYNC Config FAILED")); + return 1; + } + if(sx1278.setPreambleDetect(setupcfg.preamble_cfg)!=0) { + DBG(Serial.println("Setting PreambleDetect FAILED")); + return 1; + } + return 0; +} diff --git a/RX_FSK/src/DecoderBase.h b/RX_FSK/src/DecoderBase.h new file mode 100644 index 0000000..d1867ba --- /dev/null +++ b/RX_FSK/src/DecoderBase.h @@ -0,0 +1,38 @@ + +#ifndef DECODER_BASE_H +#define DECODER_BASE_H + +#include +#include +#include +#ifndef inttypes_h + #include +#endif +#include "Sonde.h" + +typedef struct _decoderSetupCfg { + uint16_t bitrate; + //uint16_t agcbw; + //uint16_t rxbw; + uint8_t rx_cfg; + uint8_t sync_cfg; + uint8_t sync_len; + const uint8_t *sync_data; + uint8_t preamble_cfg; +} decoderSetupCfg; + +/* Generic base class for all sonde decoders */ +class DecoderBase +{ +protected: + +public: + int setup(decoderSetupCfg &setupcfg, uint16_t agcbw, uint16_t rxbw); + virtual int setup(float frequency, int type=0) = 0; + + virtual int receive() = 0; + virtual int waitRXcomplete() = 0; +}; + + +#endif diff --git a/RX_FSK/src/Display.cpp b/RX_FSK/src/Display.cpp index 706e8f0..10a8a93 100644 --- a/RX_FSK/src/Display.cpp +++ b/RX_FSK/src/Display.cpp @@ -277,6 +277,7 @@ void U8x8Display::begin() { } u8x8->begin(); if(sonde.config.tft_orient==3) u8x8->setFlipMode(true); + if(sonde.config.dispcontrast>=0) u8x8->setContrast(sonde.config.dispcontrast); fontlist = fl; nfonts = sizeof(fl)/sizeof(uint8_t *); @@ -287,6 +288,10 @@ void U8x8Display::clear() { u8x8->clear(); } +void U8x8Display::setContrast(uint8_t contrast) { + u8x8->setContrast(contrast); +} + // For u8x8 oled display: 0=small font, 1=large font 7x14 void U8x8Display::setFont(uint8_t fontindex) { @@ -509,9 +514,11 @@ void ILI9225Display::begin() { tft = new Arduino_ILI9341(bus, sonde.config.oled_rst); else if(_type == 4) tft = new Arduino_ILI9342(bus, sonde.config.oled_rst); + else if(_type == 5) + tft = new Arduino_ST7789(bus, sonde.config.oled_rst); else tft = new Arduino_ILI9225(bus, sonde.config.oled_rst); - Serial.println("ILI9225/ILI9341 init: done"); + Serial.println("ILI9225/ILI9341/ST7789 init: done"); tft->begin(sonde.config.tft_spifreq); tft->fillScreen(BLACK); tft->setRotation(sonde.config.tft_orient); @@ -526,12 +533,15 @@ void ILI9225Display::clear() { SPI_MUTEX_UNLOCK(); } +void ILI9225Display::setContrast(uint8_t /*contrast*/) { +} + // for now, 0=small=FreeSans9pt7b, 1=large=FreeSans18pt7b void ILI9225Display::setFont(uint8_t fontindex) { //if(fontindex==1 || fontindex==2) { fontindex=3; } findex = fontindex; switch(fontindex) { - case 0: tft->setFont(NULL); tft->setTextSize(1); break; + case 0: tft->setFont(); tft->setTextSize(1); break; //case 1: tft->setFont(NULL); tft->setTextSize(2); break; //case 2: tft->setFont(NULL); tft->setTextSize(2); break; default: tft->setFont(gfl[fontindex-1]); @@ -769,16 +779,17 @@ RawDisplay *Display::rdis = NULL; //TODO: maybe merge with initFromFile later? void Display::init() { Serial.printf("disptype is %d\n",sonde.config.disptype); - if(sonde.config.disptype==1 || sonde.config.disptype==3 || sonde.config.disptype==4 ) { - rdis = new ILI9225Display(sonde.config.disptype); - } else { + if(sonde.config.disptype==0 || sonde.config.disptype==2) { rdis = new U8x8Display(sonde.config.disptype); + } else { + rdis = new ILI9225Display(sonde.config.disptype); } Serial.println("Display created"); rdis->begin(); delay(100); Serial.println("Display initialized"); rdis->clear(); + dispstate = 1; // display active by default } @@ -1024,6 +1035,7 @@ int Display::getScreenIndex(int index) { break; case 3: // ILI9341 case 4: // ILI9342 + case 5: index = 4; // landscape mode (orient=1/3) if( (sonde.config.tft_orient&0x01)==0 ) index++; // portrait mode (0/2) break; @@ -1145,7 +1157,9 @@ void Display::initFromFile(int index) { char text[61]; n=sscanf(s, "%f,%f,%f", &y, &x, &w); sscanf(ptr+1, "%60[^\r\n]", text); - if(sonde.config.disptype==1 || sonde.config.disptype==3 || sonde.config.disptype==4 ) { x*=xscale; y*=yscale; w*=xscale; } + if(sonde.config.disptype!=0 && sonde.config.disptype!=2) { + x*=xscale; y*=yscale; w*=xscale; + } newlayouts[idx].de[what].x = x; newlayouts[idx].de[what].y = y; newlayouts[idx].de[what].width = n>2 ? w : WIDTH_AUTO; @@ -1727,30 +1741,35 @@ void Display::drawText(DispEntry *de) { } void Display::updateDisplayPos() { + if( dispstate == 0 ) return; // do not display anything for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawLat && di->func != disp.drawLon) continue; di->func(di); } } void Display::updateDisplayPos2() { + if( dispstate == 0 ) return; // do not display anything for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawAlt && di->func != disp.drawHS && di->func != disp.drawVS) continue; di->func(di); } } void Display::updateDisplayID() { + if( dispstate == 0 ) return; // do not display anything for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawID) continue; di->func(di); } } void Display::updateDisplayRSSI() { + if( dispstate == 0 ) return; // do not display anything for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawRSSI) continue; di->func(di); } } void Display::updateStat() { + if( dispstate == 0 ) return; // do not display anything for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawQS) continue; di->func(di); @@ -1758,7 +1777,8 @@ void Display::updateStat() { } void Display::updateDisplayRXConfig() { - for(DispEntry *di=layout->de; di->func != NULL; di++) { + if( dispstate == 0 ) return; // do not display anything + for(DispEntry *di=layout->de; di->func != NULL; di++) { if(di->func != disp.drawQS && di->func != disp.drawAFC) continue; di->func(di); } @@ -1773,10 +1793,35 @@ void Display::updateDisplayIP() { } void Display::updateDisplay() { + if( dispstate == 0 ) return; // do not display anything calcGPS(); for(DispEntry *di=layout->de; di->func != NULL; di++) { di->func(di); } } +// Called when key is pressed or new RX starts +void Display::dispsavectlON() { + // nothing to do to turn display on, may add power on code here later + dispstate = 1; +} + +// Should be called 1x / sec to update display +// parameter: rxactive (1=currently receiving something, 0=no rx) +void Display::dispsavectlOFF(int rxactive) { + if( sonde.config.dispsaver == 0 ) return; // screensaver disabled + if( dispstate == 0 ) return; // already OFF + if( rxactive && ((sonde.config.dispsaver%10)==2) ) return; // OFF only if no RX, but rxactive is 0 + dispstate++; + if( dispstate > (sonde.config.dispsaver/10) ) { + rdis->clear(); + dispstate = 0; + } +} + +void Display::setContrast() { + if(sonde.config.dispcontrast<0) return; + rdis->setContrast(sonde.config.dispcontrast); +} + Display disp = Display(); diff --git a/RX_FSK/src/Display.h b/RX_FSK/src/Display.h index 5178621..37dd226 100644 --- a/RX_FSK/src/Display.h +++ b/RX_FSK/src/Display.h @@ -64,6 +64,7 @@ class RawDisplay { public: virtual void begin() = 0; virtual void clear() = 0; + virtual void setContrast(uint8_t contrast) = 0; virtual void setFont(uint8_t fontindex) = 0; virtual void getDispSize(uint8_t *height, uint8_t *width, uint8_t *lineskip, uint8_t *colskip) = 0; virtual void drawString(uint16_t x, uint16_t y, const char *s, int16_t width=WIDTH_AUTO, uint16_t fg=0xffff, uint16_t bg=0 ) = 0; @@ -86,6 +87,7 @@ public: U8x8Display(uint8_t type = 0) { _type = type; } void begin(); void clear(); + void setContrast(uint8_t contrast); void setFont(uint8_t fontindex); void getDispSize(uint8_t *height, uint8_t *width, uint8_t *lineskip, uint8_t *colskip); void drawString(uint16_t x, uint16_t y, const char *s, int16_t width=WIDTH_AUTO, uint16_t fg=0xffff, uint16_t bg=0); @@ -110,6 +112,7 @@ public: ILI9225Display(int type = 1) { _type = type; } void begin(); void clear(); + void setContrast(uint8_t contrast); void setFont(uint8_t fontindex); void getDispSize(uint8_t *height, uint8_t *width, uint8_t *lineskip, uint8_t *colskip); void drawString(uint16_t x, uint16_t y, const char *s, int16_t width=WIDTH_AUTO, uint16_t fg=0xffff, uint16_t bg=0); @@ -160,6 +163,7 @@ public: DispInfo *layouts; int nLayouts; static RawDisplay *rdis; + char dispstate; Display(); void init(); @@ -193,8 +197,10 @@ public: void updateDisplayRXConfig(); void updateDisplayIP(); void updateDisplay(); - + void dispsavectlON(); + void dispsavectlOFF(int rxactive); void setLayout(int layout); + void setContrast(); }; extern Display disp; diff --git a/RX_FSK/src/M10M20.cpp b/RX_FSK/src/M10M20.cpp index b6e2c0f..bfaf0a8 100644 --- a/RX_FSK/src/M10M20.cpp +++ b/RX_FSK/src/M10M20.cpp @@ -26,7 +26,19 @@ static int haveNewFrame = 0; //static int lastFrame = 0; static int headerDetected = 0; -int M10M20::setup(float frequency) + +decoderSetupCfg m10m20SetupCfg = { + .bitrate = 9600, + //// Disable auto-AFC, auto-AGC, RX Trigger by preamble + .rx_cfg = 0x00, + .sync_cfg = 0x70, + .sync_len = 1, + .sync_data = (const uint8_t *)"\x66\x66", + // Preamble detection off (+ size 1 byte, maximum tolerance; should not matter for "off"?) + .preamble_cfg = 0x00 | 0x00 | 0x1F, +}; + +int M10M20::setup(float frequency, int /*type*/) { M10M20_DBG(Serial.println("Setup sx1278 for M10/M20 sonde"));; if(sx1278.ON()!=0) { @@ -92,6 +104,11 @@ int M10M20::setup(float frequency) } //// Step 2: Real reception + if( DecoderBase::setup(m10m20SetupCfg, sonde.config.m10m20.agcbw, sonde.config.m10m20.rxbw)!=0 ) { + return 1; + } +#if 0 + // Now all done in DecoderBase::setup // FSK standby mode, seems like otherweise baudrate cannot be changed? sx1278.setFSK(); if(sx1278.setBitrate(9600)!=0) { @@ -127,6 +144,7 @@ int M10M20::setup(float frequency) M10M20_DBG(Serial.println("Setting PreambleDetect FAILED")); return 1; } +#endif // Packet config 1: fixed len, no mancecer, no crc, no address filter // Packet config 2: packet mode, no home ctrl, no beackn, msb(packetlen)=0) @@ -556,6 +574,7 @@ int M10M20::decodeframeM20(uint8_t *data) { } Serial.println(crcok?"CRC OK":"CRC NOT OK"); Serial.printf(" repair: %d/%d\n", repl, repairstep); + if(!crcok) return 2; Serial.println("Decoding..."); // Its a M20 @@ -584,7 +603,7 @@ int M10M20::decodeframeM20(uint8_t *data) { ser[1] = ((tmp%12 + 1) / 10 ) + '0'; ser[2] = ((tmp%12 + 1) % 10 ) + '0'; ser[3] = '-'; - ser[4] = (data[18]/128) + 1 + '0'; + ser[4] = ((data[19]&0x03)<<1) + (data[18]/128) + 1 + '0'; ser[5] = '-'; ser[6] = ids[4]; ser[7] = ids[5]; diff --git a/RX_FSK/src/M10M20.h b/RX_FSK/src/M10M20.h index 7f789b6..9585b90 100644 --- a/RX_FSK/src/M10M20.h +++ b/RX_FSK/src/M10M20.h @@ -15,9 +15,10 @@ #ifndef inttypes_h #include #endif +#include "DecoderBase.h" /* Main class */ -class M10M20 +class M10M20 : public DecoderBase { private: void printRaw(uint8_t *data, int len); @@ -53,7 +54,7 @@ private: public: M10M20(); - int setup(float frequency); + int setup(float frequency, int type = 0); int receive(); int waitRXcomplete(); diff --git a/RX_FSK/src/MP3H.cpp b/RX_FSK/src/MP3H.cpp index ae8831e..43458a5 100644 --- a/RX_FSK/src/MP3H.cpp +++ b/RX_FSK/src/MP3H.cpp @@ -35,7 +35,16 @@ static int headerDetected = 0; extern uint16_t MON[]; -int MP3H::setup(float frequency) +decoderSetupCfg mp3hSetupCfg = { + .bitrate = 2400, + .rx_cfg = 0x00, + .sync_cfg = 0x70, + .sync_len = 1, + .sync_data = (const uint8_t *)"\x66\x66", + .preamble_cfg = 0x00 | 0x00 | 0x1F +}; + +int MP3H::setup(float frequency, int /*type*/) { MP3H_DBG(Serial.println("Setup sx1278 for MP3H sonde"));; if(sx1278.ON()!=0) { @@ -63,6 +72,11 @@ int MP3H::setup(float frequency) } //// Step 2: Real reception + if(DecoderBase::setup(mp3hSetupCfg, sonde.config.mp3h.agcbw, sonde.config.mp3h.rxbw)!=0) { + return 1; + } +#if 0 + // Now all done in Decoderbase // FSK standby mode, seems like otherweise baudrate cannot be changed? sx1278.setFSK(); if(sx1278.setBitrate(2400)!=0) { @@ -98,6 +112,7 @@ int MP3H::setup(float frequency) MP3H_DBG(Serial.println("Setting PreambleDetect FAILED")); return 1; } +#endif // Packet config 1: fixed len, no mancecer, no crc, no address filter // Packet config 2: packet mode, no home ctrl, no beackn, msb(packetlen)=0) diff --git a/RX_FSK/src/MP3H.h b/RX_FSK/src/MP3H.h index 9deea5b..7967f22 100644 --- a/RX_FSK/src/MP3H.h +++ b/RX_FSK/src/MP3H.h @@ -15,9 +15,10 @@ #ifndef inttypes_h #include #endif +#include "DecoderBase.h" /* Main class */ -class MP3H +class MP3H : public DecoderBase { private: void printRaw(uint8_t *data, int len); @@ -25,7 +26,7 @@ private: int decodeframeMP3H(uint8_t *data); public: MP3H(); - int setup(float frequency); + int setup(float frequency, int type = 0); int receive(); int waitRXcomplete(); }; diff --git a/RX_FSK/src/RS41.cpp b/RX_FSK/src/RS41.cpp index 086305a..ef6fbf4 100644 --- a/RX_FSK/src/RS41.cpp +++ b/RX_FSK/src/RS41.cpp @@ -193,7 +193,17 @@ static void Gencrctab(void) } /* end for */ } /* end Gencrctab() */ -int RS41::setup(float frequency) +decoderSetupCfg rs41SetupCfg = { + .bitrate = 4800, + .rx_cfg = 0x1E, // Enable auto-AFC, auto-AGC, RX Trigger by preamble + .sync_cfg = 0x57, // Set autostart_RX to 01, preamble 0, SYNC detect==on, syncsize=3 (==4 byte + .sync_len = 8, + .sync_data = (const uint8_t *)"\x08\x6D\x53\x88\x44\x69\x48\x1F", + .preamble_cfg = 0xA8, +}; + + +int RS41::setup(float frequency, int /*type*/) { if(!initialized) { Gencrctab(); @@ -205,6 +215,11 @@ int RS41::setup(float frequency) RS41_DBG(Serial.println("Setting SX1278 power on FAILED")); return 1; } + if(DecoderBase::setup(rs41SetupCfg, sonde.config.rs41.agcbw, sonde.config.rs41.rxbw)!=0 ) { + return 1; + } +#if 0 + // all moved to DecoderBase now if(sx1278.setFSK()!=0) { RS41_DBG(Serial.println("Setting FSK mode FAILED")); return 1; @@ -240,6 +255,7 @@ int RS41::setup(float frequency) RS41_DBG(Serial.println("Setting PreambleDetect FAILED")); return 1; } +#endif // Packet config 1: fixed len, no mancecer, no crc, no address filter // Packet config 2: packet mode, no home ctrl, no beackn, msb(packetlen)=0) diff --git a/RX_FSK/src/RS41.h b/RX_FSK/src/RS41.h index e0b8c46..149a672 100644 --- a/RX_FSK/src/RS41.h +++ b/RX_FSK/src/RS41.h @@ -16,9 +16,10 @@ #include #endif #include "Sonde.h" +#include "DecoderBase.h" /* Main class */ -class RS41 +class RS41 : public DecoderBase { private: uint32_t bits2val(const uint8_t *bits, int len); @@ -51,7 +52,7 @@ public: RS41(); // New interface: // setup() is called when channel is activated (sets mode and frequency and activates receiver) - int setup(float frequency); + int setup(float frequency, int type = 0); // processRXbyte is called by background task for each received byte // should be fast enough to not cause sx127x fifo buffer overflow // void processRXbyte(uint8_t data); diff --git a/RX_FSK/src/RS92.cpp b/RX_FSK/src/RS92.cpp index fd1a175..f9f6e52 100644 --- a/RX_FSK/src/RS92.cpp +++ b/RX_FSK/src/RS92.cpp @@ -68,7 +68,16 @@ static int haveNewFrame = 0; static int lastFrame = 0; static int headerDetected = 0; -int RS92::setup(float frequency) +decoderSetupCfg rs92SetupCfg = { + .bitrate = 4800, + .rx_cfg = 0x1E, + .sync_cfg = 0x70, + .sync_len = 2, + .sync_data = (const uint8_t *)"\x66\x65", + .preamble_cfg = 0xA8, +}; + +int RS92::setup(float frequency, int /*type*/) { #if RS92_DEBUG Serial.println("Setup sx1278 for RS92 sonde"); @@ -84,6 +93,10 @@ int RS92::setup(float frequency) RS92_DBG(Serial.println("Setting SX1278 power on FAILED")); return 1; } + if(DecoderBase::setup(rs92SetupCfg, sonde.config.rs92.rxbw, sonde.config.rs92.rxbw)!=0) { + return 1; + } +#if 0 if(sx1278.setFSK()!=0) { RS92_DBG(Serial.println("Setting FSJ mode FAILED")); return 1; @@ -118,7 +131,6 @@ int RS92::setup(float frequency) //const char *SYNC="\x08\x6D\x53\x88\x44\x69\x48\x1F"; // was 0x57 //const char *SYNC="\x99\x9A"; -#if 1 // version 1, working with continuous RX const char *SYNC="\x66\x65"; if(sx1278.setSyncConf(0x70, 2, (const uint8_t *)SYNC)!=0) { @@ -130,6 +142,7 @@ int RS92::setup(float frequency) return 1; } #endif + #if 0 // version 2, with per-packet rx start, untested // header is 2a 10 65, i.e. with lsb first diff --git a/RX_FSK/src/RS92.h b/RX_FSK/src/RS92.h index a004d2d..8c88add 100644 --- a/RX_FSK/src/RS92.h +++ b/RX_FSK/src/RS92.h @@ -15,6 +15,7 @@ #ifndef inttypes_h #include #endif +#include "DecoderBase.h" struct CONTEXTR9 { @@ -49,7 +50,7 @@ struct CONTEXTR9 { /* Main class */ -class RS92 +class RS92 : public DecoderBase { private: void process8N1data(uint8_t data); @@ -79,7 +80,7 @@ private: public: RS92(); - int setup(float frequency); + int setup(float frequency, int type = 0); int receive(); int waitRXcomplete(); diff --git a/RX_FSK/src/Sonde.cpp b/RX_FSK/src/Sonde.cpp index 832d072..55f0357 100644 --- a/RX_FSK/src/Sonde.cpp +++ b/RX_FSK/src/Sonde.cpp @@ -102,6 +102,7 @@ void Sonde::defaultConfig() { config.sx1278_sck = SCK; config.oled_rst = 16; config.disptype = 0; + config.dispcontrast = -1; config.tft_orient = 1; config.button2_axp = 0; config.norx_timeout = 20; @@ -332,14 +333,6 @@ void Sonde::setConfig(const char *cfg) { if(i==N_CONFIG) { Serial.printf("Invalid config option '%s'=%s \n", cfg, val); } -#if 0 - // currently not in config_list. Maybe add later. - } else if(strcmp(cfg,"axudp.symbol")==0) { - strncpy(config.udpfeed.symbol, val, 3); - } else if(strcmp(cfg,"tcp.symbol")==0) { - strncpy(config.tcpfeed.symbol, val, 3); - } -#endif } void Sonde::setIP(String ip, bool AP) { @@ -490,6 +483,7 @@ void Sonde::receive() { if(si->lastState != 1) { si->rxStart = millis(); si->lastState = 1; + sonde.dispsavectlON(); } } else { // RX Timeout //Serial.printf("Sonde::receive(): result %d (%s), laststate was %d\n", res, (res<=3)?RXstr[res]:"?", si->lastState); @@ -507,6 +501,7 @@ void Sonde::receive() { int event = getKeyPressEvent(); if (!event) event = timeoutEvent(si); + else sonde.dispsavectlON(); int action = (event==EVT_NONE) ? ACT_NONE : disp.layout->actions[event]; //if(action!=ACT_NONE) { Serial.printf("event %x: action is %x\n", event, action); } // If action is to move to a different sonde index, we do update things here, set activate @@ -716,6 +711,15 @@ void Sonde::clearDisplay() { disp.rdis->clear(); } +void Sonde::dispsavectlON() { + disp.dispsavectlON(); +} + +void Sonde::dispsavectlOFF(int rxactive) { + disp.dispsavectlOFF(rxactive); +} + + SondeType Sonde::realType(SondeInfo *si) { if(TYPE_IS_METEO(si->type) && si->d.subtype>0 ) { return si->d.subtype==1 ? STYPE_M10:STYPE_M20; } else return si->type; diff --git a/RX_FSK/src/Sonde.h b/RX_FSK/src/Sonde.h index 5e31a3a..7d76b11 100644 --- a/RX_FSK/src/Sonde.h +++ b/RX_FSK/src/Sonde.h @@ -263,6 +263,9 @@ typedef struct st_rdzconfig { int wifi; // connect to known WLAN 0=skip int screenfile; int8_t display[30]; // list of display mode (0:scanner, 1:default, 2,... additional modes) + int dispsaver; // Turn display on/off (0=always on, 10*n+1: off after n seconds, + // 10*n+2: scanner off after n seconds, RX always shown) + int dispcontrast; // For OLED: set contrast to 0..255 (-1: don't set/leave at factory default) int startfreq; // spectrum display start freq (400, 401, ...) int channelbw; // spectrum channel bandwidth (valid: 5, 10, 20, 25, 50, 100 kHz) int spectrum; // show freq spectrum for n seconds -1=disable; 0=forever @@ -360,6 +363,8 @@ public: void updateDisplayIP(); void updateDisplay(); void clearDisplay(); + void dispsavectlON(); + void dispsavectlOFF(int rxactive); void setIP(String ip, bool isAP); }; diff --git a/RX_FSK/src/json.cpp b/RX_FSK/src/json.cpp new file mode 100644 index 0000000..15b80da --- /dev/null +++ b/RX_FSK/src/json.cpp @@ -0,0 +1,106 @@ +#include "json.h" +#include "RS41.h" + +extern const char *sondeTypeStrSH[]; +extern const char *dfmSubtypeStrSH[]; + +static char typestr[11]; + +const char *getType(SondeInfo *si) { + if( si->type == STYPE_RS41 ) { + if ( RS41::getSubtype(typestr, 11, si) == 0 ) return typestr; + } else if ( TYPE_IS_DFM(si->type) && si->d.subtype > 0 && si->d.subtype < 16 ) { + const char *t = dfmSubtypeStrSH[si->d.subtype]; + if(t) return t; + sprintf(typestr, "DFMx%X", si->d.subtype); + return typestr; + } + return sondeTypeStrSH[sonde.realType(si)]; +} + +int float2json(char **buf, int *maxlen, const char *fmt, float value) { + if(isnan(value)) return 0; + int n = snprintf(*buf, *maxlen, fmt, value); + if(n>*maxlen) return -1; + *buf += n; *maxlen -= n; + return n; +} + +// To be used by +// - MQTT +// - rdzJSON (for Android app) +// - Web map +int sonde2json(char *buf, int maxlen, SondeInfo *si) +{ + SondeData *s = &(si->d); + int n; + + n = float2json(&buf, &maxlen, "\"lat\": %.5f,", s->lat); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"lon\": %.5f,", s->lon); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"alt\": %.1f,", s->alt); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"vs\": %.1f,", s->vs); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"hs\": %.1f,", s->hs); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"climb\": %.1f,", s->vs); // used by HTML map, to be removed (-> vs) + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"speed\": %.1f,", s->hs); // used by HTML map, to be removed (-> hs) + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"dir\": %.1f,", s->dir); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"temp\": %.1f,", s->temperature ); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"humidity\": %.1f,", s->relativeHumidity); + if(n<0) return -1; + n = float2json(&buf, &maxlen, "\"pressure\": %.1f,", s->pressure); + if(n<0) return -1; + n = snprintf(buf, maxlen, + "\"type\":\"%s\"," + "\"id\": \"%s\"," // TODO: maybe remove in the future, ser is enough, client can calculate APRS id if needed + "\"ser\": \"%s\"," + "\"frame\": %u," // raw frame, from sonde, can be 0. (TODO: add virtual frame # as in sondehub?) + "\"vframe\": %d," + "\"time\": %u," + "\"sats\": %d," + "\"freq\": %.2f," + "\"rssi\": %d," + "\"afc\": %d," + "\"launchKT\": %d," + "\"burstKT\": %d," + "\"countKT\": %d," + "\"crefKT\": %d," + "\"launchsite\": \"%s\"," + "\"res\": %d", + getType(si), + s->id, + s->ser, + s->frame, + s->vframe, + s->time, + s->sats, + si->freq, + si->rssi, + si->afc, + s->launchKT, + s->burstKT, + s->countKT, + s->crefKT, + si->launchsite, + (int)si->rxStat[0] + ); + if(n>=maxlen) return -1; + buf += n; maxlen -= n; + + // add only if available + if(s->batteryVoltage > 0) { + n = snprintf(buf, maxlen, ",\"bat\": %.1f", s->batteryVoltage); + if(n>=maxlen) return -1; + buf += n; maxlen -= n; + } + return 0; +} + + diff --git a/RX_FSK/src/json.h b/RX_FSK/src/json.h new file mode 100644 index 0000000..608e924 --- /dev/null +++ b/RX_FSK/src/json.h @@ -0,0 +1,8 @@ +#ifndef _JSON_H +#define _JSON_H + +#include "Sonde.h" + +int sonde2json(char *buf, int maxlen, SondeInfo *si); + +#endif diff --git a/RX_FSK/src/mqtt.cpp b/RX_FSK/src/mqtt.cpp index fd40760..c2380d1 100644 --- a/RX_FSK/src/mqtt.cpp +++ b/RX_FSK/src/mqtt.cpp @@ -4,9 +4,13 @@ #include #include #include "RS41.h" +#include "json.h" TimerHandle_t mqttReconnectTimer; +extern const char *version_name; +extern const char *version_id; + void mqttCallback(char* topic, byte* payload, unsigned int length) { Serial.print("Message arrived ["); Serial.print(topic); @@ -30,6 +34,7 @@ void MQTT::init(const char* host, uint16_t port, const char* id, const char *use mqttClient.setServer(ip, port); snprintf(buffer, 20, "%s%04d", id, (int)random(0, 1000)); buffer[20] = 0; + Serial.print(buffer); mqttClient.setClientId(buffer); if (strlen(password) > 0) { mqttClient.setCredentials(username, password); @@ -46,8 +51,13 @@ void MQTT::publishUptime() mqttClient.connect(); // ensure we've got connection Serial.println("[MQTT] writing"); - char payload[12]; - snprintf(payload, 12, "%lu", millis()); + //char payload[128]; + //snprintf(payload, 12, "%lu", millis()); + //snprintf(payload, 124, "{\"uptime\": %lu," "\"user\": \"%s\"", millis(), username ); + char payload[128]; + snprintf(payload, 128, "{\"uptime\": %ld, \"user\": \"%s\", \"rxlat\": %.5f, \"rxlon\": %.5f, \"ver\": \"%s\", \"sub\": \"%s\"}", + millis(), username, sonde.config.rxlat, sonde.config.rxlon, version_name, version_id); + Serial.println(payload); char topic[128]; snprintf(topic, 128, "%s%s", this->prefix, "uptime"); mqttClient.publish(topic, 1, 1, payload); @@ -59,6 +69,14 @@ void MQTT::publishPacket(SondeInfo *si) mqttClient.connect(); // ensure we've got connection char payload[1024]; + payload[0] = '{'; + int n = sonde2json(payload+1, 1023, si); + if(n<0) { + // ERROR + Serial.println("publishPacket: sonde2json failed, string too long"); + } + +#if 0 snprintf(payload, 1024, "{" "\"active\": %d," "\"freq\": %.2f," @@ -134,8 +152,11 @@ void MQTT::publishPacket(SondeInfo *si) snprintf(payload, 1024, "%s%s%s%s", payload, ",\"subtype\": \"", subtype, "\"" ); } snprintf(payload, 1024, "%s%s", payload, "}" ); // terminate payload string +#endif + strcat(payload, "}"); // terminate payload string char topic[128]; snprintf(topic, 128, "%s%s", this->prefix, "packet"); + Serial.print(payload); mqttClient.publish(topic, 1, 1, payload); } diff --git a/RX_FSK/version.h b/RX_FSK/version.h index 6d69ffe..c22f069 100644 --- a/RX_FSK/version.h +++ b/RX_FSK/version.h @@ -1,4 +1,4 @@ const char *version_name = "rdzTTGOsonde"; -const char *version_id = "master_v0.9.1"; +const char *version_id = "devel20220918"; const int SPIFFS_MAJOR=2; const int SPIFFS_MINOR=16; From dad746846e67ab7b8a1e072f4ab871d76f65465f Mon Sep 17 00:00:00 2001 From: "Hansi, dl9rdz" Date: Sat, 24 Sep 2022 22:36:30 +0000 Subject: [PATCH 2/2] version update --- RX_FSK/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/RX_FSK/version.h b/RX_FSK/version.h index c22f069..bc4b24c 100644 --- a/RX_FSK/version.h +++ b/RX_FSK/version.h @@ -1,4 +1,4 @@ const char *version_name = "rdzTTGOsonde"; -const char *version_id = "devel20220918"; +const char *version_id = "master_v0.9.2"; const int SPIFFS_MAJOR=2; const int SPIFFS_MINOR=16;