Commit Graph

815 Commits

Author SHA1 Message Date
wellenvogel e70591eb4f add changes from Homberger for AIS compatibility with raymarine 2022-01-14 21:07:54 +01:00
norbert-walter 9d0799f2cf Add unit parameter and unit conversion 2022-01-14 15:43:26 +01:00
wt 25c9ec0afe changes 2022-01-13 15:29:39 +01:00
wt 4ecadf4d77 changes 2022-01-13 15:23:01 +01:00
norbert-walter 3035314825
Merge branch 'wellenvogel:master' into master 2022-01-13 10:50:30 +01:00
wellenvogel 74064fb664 correctly send out seasmart only if NMEA out is not enabled on channel 2022-01-12 18:55:08 +01:00
wellenvogel ff1c6432af add keepalive to socket connections 2022-01-12 18:30:41 +01:00
Norbert Walter 68eb995909 QR code modifyed, insert all bus data 2022-01-11 16:41:58 +01:00
norbert-walter 1ed55ee3f7
Merge branch 'wellenvogel:master' into master 2022-01-11 09:42:39 +01:00
Adrien e5867b0b9d test commit
new comment
2022-01-10 20:33:20 +01:00
Norbert Walter 49906071cb Insert more data 2022-01-09 18:39:52 +01:00
wellenvogel 7d93ecb063 allow to set the log level 2022-01-09 18:09:34 +01:00
Norbert Walter ba002fc7c1 Bus names in disppay by nunning busses 2022-01-09 17:14:43 +01:00
norbert-walter f63c903b7a
Merge branch 'wellenvogel:master' into master 2022-01-09 16:17:50 +01:00
Norbert Walter addb3853f5 Change back to old status 2022-01-09 16:17:31 +01:00
wellenvogel 82b6c86247 correct formatWind 2022-01-08 21:43:52 +01:00
Norbert Walter 1bdb3ebfb9 Add status infos 2022-01-08 19:19:10 +01:00
norbert-walter b1bdc6ac7b
Merge branch 'wellenvogel:master' into master 2022-01-08 16:37:53 +01:00
Norbert Walter c99fbefbb6 Description 2022-01-08 16:30:11 +01:00
wellenvogel 9878c90e7b disable log in actisense mode 2022-01-07 12:37:20 +01:00
norbert-walter 09e4a03981
Merge branch 'wellenvogel:master' into master 2022-01-06 12:01:22 +01:00
wellenvogel ad45dd6036 also send counters for disabled channels in status 2022-01-03 19:23:38 +01:00
wellenvogel 2a56adf3c5 add status to Api 2022-01-03 18:59:17 +01:00
wellenvogel 73eee8461e allow receiving seasmart messages, correctly handle source for actisense and seasmart in converter 2022-01-03 18:05:14 +01:00
wellenvogel 4d5a3989ac correctly handle actisense mode when writing out 2022-01-03 13:43:20 +01:00
wellenvogel 469b801e04 tcp client resolve mdns 2022-01-03 13:37:35 +01:00
wellenvogel f0a4cfcc53 correct sending/receiving actisense 2022-01-03 13:36:59 +01:00
wellenvogel 5b843a23be tcp client 1st working 2022-01-02 17:26:46 +01:00
wellenvogel d21e497864 intermediate, untested: move channel handling out of main 2022-01-02 14:43:37 +01:00
wellenvogel 47fb805ee6 intermediate: introduce an abstract channel 2021-12-31 18:38:11 +01:00
wellenvogel 298b6c1640 intermediate: channel config 1st tests 2021-12-29 20:19:07 +01:00
wellenvogel 01dae66459 introduce channel config abstraction 2021-12-29 19:52:36 +01:00
wellenvogel 0ba05accdc introduce tcp client 2021-12-29 19:52:08 +01:00
wellenvogel 31798e3bec externalize socket connection 2021-12-28 18:44:01 +01:00
wellenvogel cd9cbd11d0 remove unused import 2021-12-28 18:09:31 +01:00
wellenvogel 61e0e66acb get rid of wifi client, directly use the socket api 2021-12-28 18:08:06 +01:00
Norbert Walter 88363e2bc1 Add all setup data in structure, save problem solved 2021-12-22 18:35:54 +01:00
Norbert Walter 3efba049f6 Different date styles, extend boat data, config save problem 2021-12-21 21:19:36 +01:00
Norbert Walter ff71fa855e New version after merge 2021-12-21 12:09:06 +01:00
norbert-walter 55862efe37
Merge branch 'wellenvogel:master' into master 2021-12-21 11:58:37 +01:00
Norbert Walter 2c312a578c Add config entrys 2021-12-21 11:52:08 +01:00
Norbert Walter 9e5d1b5244 Add heartbeat, date time and faster page update rate 2021-12-19 13:52:29 +01:00
wellenvogel 34540405d0 replace logString with logDebug 2021-12-18 18:47:57 +01:00
wellenvogel 1bc61f729b rename DaysSince1970 and SecondsSinceMidnight 2021-12-18 13:14:27 +01:00
Norbert Walter 2ca4cfbd38 real bus data for depth 2021-12-17 18:55:57 +01:00
wellenvogel 031e4fa0e0 move version and firmwaretype to appinfo 2021-12-17 13:01:03 +01:00
Norbert Walter 9af2fbcee8 Save version 2021-12-16 18:10:00 +01:00
Norbert Walter c0a6809299 New fonts and new page with 2 values 2021-12-16 14:51:49 +01:00
wellenvogel 20187fcb1d add changed flag to BoatDataValue in API 2021-12-16 11:45:35 +01:00
Norbert Walter c14ef2d886 Initial update nach Github crash 2021-12-16 09:37:54 +01:00
wellenvogel 428f55e87c intermediate: OTA update 2021-12-14 18:01:38 +01:00
wellenvogel 8b9fabe9e4 intermediate: prepare ota upload 2021-12-14 13:14:36 +01:00
wellenvogel b591c7ff12 remove GwConfigItem and write operations, log passwords on USB 2021-12-13 22:10:28 +01:00
wellenvogel df4b49ad5b intermediate: hide passwords in config, admin password 2021-12-13 16:44:02 +01:00
wellenvogel 2f1ea8e726 limit tcp clients to 6 2021-12-12 12:46:17 +01:00
wellenvogel de04e5443b optimize boat data string handling 2021-12-12 11:47:56 +01:00
wellenvogel e08bcf1009 use esp us timer for statistics 2021-12-11 21:23:57 +01:00
wellenvogel bb8c7b9d32 intermediate: statistics gettimeofday 2021-12-11 20:51:12 +01:00
wellenvogel 96036791b5 intermediate: change statistics 2021-12-11 20:31:36 +01:00
wellenvogel a02cecb6eb add example for formatting boat data 2021-12-09 17:19:04 +01:00
wellenvogel d47c19126f use separate formats for days and seconds 2021-12-09 17:18:48 +01:00
wellenvogel babe72c691 make boat data format info acessible at api 2021-12-09 17:18:24 +01:00
wellenvogel d2981dc8b1 avoid initial crash in handleBoatSpeed 2021-12-09 17:17:27 +01:00
wellenvogel 575d08e73f remove not workingb websocket stuff 2021-12-09 12:02:56 +01:00
wellenvogel 934f94fcaa improve logging for wifi 2021-12-09 12:01:26 +01:00
wellenvogel 24cd250d86 add boatData config item type to select a value from the boatDataItems 2021-12-05 22:01:17 +01:00
wellenvogel 4f2c9ed1c2 avoid string copy in api 2021-12-05 21:28:19 +01:00
wellenvogel 7b4ab178c2 change api for getBoatDataValues 2021-12-05 21:25:12 +01:00
wellenvogel 2e5b3b37d7 improve statistics 2021-12-05 20:45:49 +01:00
wellenvogel b089ae2a39 add some loop statistics 2021-12-05 17:10:23 +01:00
wellenvogel c5b6de32a9 add some time measurements 2021-12-05 12:38:24 +01:00
wellenvogel 5b2c6a3a9a avoid crash when converting 130312 2021-12-04 17:31:40 +01:00
wellenvogel 64a95f9316 correct engine rapid xdr back mapping 2021-12-04 12:44:15 +01:00
wellenvogel 84483024ac correct backward xdr mapping for unknown instance, prefer instance mode single for unmapped, improve traces 2021-12-03 22:51:31 +01:00
wellenvogel 236c417fb5 intermediate: fix some n2k->xdr mappings, add backwards conversions 2021-12-03 22:07:21 +01:00
wellenvogel 04d90447e8 add new function getBoatDataValues to api for easier access 2021-12-03 17:00:51 +01:00
wellenvogel 3e73f6b80c add XDR min interval, N2K min interval, add N2K_LOAD_LEVEL and N2K_CERTIFICATION_LEVEL 2021-12-03 11:47:05 +01:00
wellenvogel c837d9b028 allow to set the satck size for user tasks 2021-12-02 17:43:47 +01:00
wellenvogel cd1fefad52 restructure buffer handling, better buffer logging 2021-12-02 17:10:50 +01:00
wellenvogel 9dcb98bb51 intermediate: restructure buffer handling 2021-12-01 22:55:37 +01:00
wellenvogel d8950c4eb4 add missing file 2021-12-01 21:01:19 +01:00
wellenvogel 15c572ed9a remove sourceId from api in sendNMEA0183 2021-12-01 20:57:06 +01:00
wellenvogel c105eef969 #12: multiple capabilities in user task, user init function, cleanup message handling in main, clearer api 2021-12-01 20:03:33 +01:00
wellenvogel 16cf7655f0 simplify example task 2021-11-28 18:51:05 +01:00
wellenvogel 63f57b64f9 make destructor of GwMessage protected 2021-11-28 12:16:09 +01:00
wellenvogel 5195c3be88 free GwApi from ArduinoJson 2021-11-28 12:11:47 +01:00
wellenvogel d9af772a57 show how to restrict the default build to your user defined environments 2021-11-27 21:13:25 +01:00
wellenvogel e3d4ac5eba allow usercode to define config and set capabilities 2021-11-27 20:56:36 +01:00
wellenvogel 39bc516def move user task handling into separate lib 2021-11-27 15:45:21 +01:00
wellenvogel 1e4285fe5d intermediate: generic handling of user tasks 2021-11-27 14:57:16 +01:00
wellenvogel 5bf2aeaffe intermediate: debug via websocket 2021-11-27 10:25:18 +01:00
wellenvogel e8b6b42869 Merge branch 'feature/env2' of https://github.com/free-x/esp32-nmea2000 into free-x-feature/env2 2021-11-26 11:02:47 +01:00
wellenvogel 284be741f5 intermediate: actisense format on USB 2021-11-26 00:09:34 +01:00
wellenvogel dbadb6fb11 n2k engine pgns, untested 2021-11-25 22:16:51 +01:00
free-x 3f8ff2c5b4
Merge branch 'wellenvogel:master' into feature/env2 2021-11-25 20:45:21 +01:00
free-x 3e8680e511 Handle 127508 BatteryStatus 2021-11-25 20:19:21 +01:00
wellenvogel 99ba4b3d8e add exampleTask 2021-11-25 19:55:13 +01:00
free-x 2179555dea Handle 127505 Fluid Level 2021-11-25 18:47:16 +01:00
free-x 48a4142438 Merge branch 'master' of https://github.com/wellenvogel/esp32-nmea2000 into feature/env2 2021-11-25 17:47:51 +01:00
free-x 8a0301fabc adjusment to dynamic boat data 2021-11-25 17:45:18 +01:00
wellenvogel 5b39145e4f only recreate value string in boatData if changed 2021-11-25 17:02:42 +01:00
wellenvogel aae16531ff use new api boatDataString for the UI 2021-11-25 16:43:13 +01:00
wellenvogel 3944735190 intermediate: reorganize boatData code 2021-11-25 14:31:31 +01:00
free-x df126c9f34
Merge branch 'wellenvogel:master' into feature/env2 2021-11-24 21:31:28 +01:00
wellenvogel f5fcfa25c3 less memory for boatData request 2021-11-24 19:10:28 +01:00
wellenvogel fb13a70ce6 dynamic adding of xdr boat data for implemented n2k conversions 2021-11-24 18:52:33 +01:00
wellenvogel 166d8d826b intermediate: dynamic boat data for xdr 2021-11-24 12:47:41 +01:00
free-x 0bc071f856
Merge branch 'wellenvogel:master' into feature/env2 2021-11-24 10:57:32 +01:00
wellenvogel 3ef74581de intermediate: prepare for dynamic boat data 2021-11-23 20:26:59 +01:00
free-x ea60f5cabc Add Handling of PGNs 130311&130316 2021-11-22 19:23:06 +01:00
free-x ee8cd44f54 Rename HandleWaterTem to Handle130310 and expansion with more sensors 2021-11-22 18:32:09 +01:00
wellenvogel c31f18b65f move some debug messages to higher level 2021-11-22 12:24:00 +01:00
wellenvogel 8610d94382 xdrExample and xdrUnmapped requests 2021-11-22 12:16:19 +01:00
Andreas Vogel 769cf33e67
Merge pull request #6 from free-x/feature/env2
[WIP] N2K Meteogramms
2021-11-22 10:22:23 +00:00
wellenvogel 6201644e60 make unknown string a member 2021-11-22 11:21:27 +01:00
free-x 62d742268b Merge branch 'master' of https://github.com/wellenvogel/esp32-nmea2000 into feature/env2 2021-11-22 06:42:22 +01:00
wellenvogel 1d24fd3732 omit #nnn on instance mode single, prepare listing unmapped 2021-11-21 22:34:05 +01:00
free-x eb7239f27e Merge branch 'master' of https://github.com/wellenvogel/esp32-nmea2000 into feature/env2 2021-11-21 22:07:57 +01:00
free-x 8beab691ee Handle 130313: Humidity 2021-11-21 13:39:39 +01:00
free-x ca65ea87b4 Handle 130312: Temperature 2021-11-21 13:28:27 +01:00
wellenvogel 6e38a5250a generate embedded files automatically 2021-11-21 12:37:53 +01:00
wellenvogel 724e661396 avoid duplicate message conversion 2021-11-20 23:25:00 +01:00
wellenvogel 4d871bc121 better logging 2021-11-20 22:32:25 +01:00
wellenvogel 15ca1b9e17 xdrmappings: map 130314 2021-11-20 17:53:02 +01:00
wellenvogel ad29c93dd2 intermediate: xdr mappings 2021-11-20 12:08:55 +01:00
wellenvogel d927861cdf intermediate: xdr mappings 2021-11-20 11:20:49 +01:00
wellenvogel fbc955cd53 intermediate: xdr type mapping 2021-11-19 21:16:04 +01:00
wellenvogel c6c33fa3dd convert n2k to RMB 2021-11-18 22:46:16 +01:00
wellenvogel aa0d22aab3 convert xte 2 way 2021-11-18 17:27:40 +01:00
wellenvogel 32f9badda2 convert ROT from/to, add conv doc 2021-11-18 13:36:59 +01:00
andreas ff4b3b5c10 read GLL 2021-11-13 18:16:21 +01:00
andreas b3f4a11a8e improve logging MT robustness 2021-11-13 18:15:50 +01:00
andreas 6ef75422d8 send/receive GSA,GSV, 129540 2021-11-13 15:44:54 +01:00
andreas e7150d2259 avoid write error 2021-11-13 14:32:45 +01:00
andreas 08af807cf9 max handling also from 0183, satInfo cleanup 2021-11-13 12:32:38 +01:00
andreas 28abd16749 intermediate: handle sat status 2021-11-12 21:14:38 +01:00
andreas c12ac513ba send/receive gga 2021-11-12 19:25:57 +01:00
andreas 3cd9c5cea6 send/receive zda 2021-11-11 18:53:59 +01:00
andreas e1e2998a9a convert VHW,VTG 2021-11-10 18:25:08 +01:00
andreas 5560c39a02 convert RSA 2021-11-10 17:53:05 +01:00
andreas 127eb3f84c convert NMEA0183 depth records 2021-11-10 17:36:22 +01:00
andreas dc39832483 move formatters to js side 2021-11-09 15:08:38 +01:00
andreas 7e348431b0 better handling for ifdefs 2021-11-08 20:40:37 +01:00
andreas 9147359b90 improved counter display on status page 2021-11-07 17:00:40 +01:00
andreas 1deef5c7de intermediate: split UI, more icons 2021-11-07 15:50:14 +01:00
andreas 3c4920d104 add NMEA and NSk counter 2021-11-07 13:12:38 +01:00
andreas 1e09112e76 more formatters for UI 2021-11-06 20:57:20 +01:00
andreas ecad013d09 provide formatter info to the UI 2021-11-06 20:41:27 +01:00
andreas 616ca1348b correctly handle the talkerId 2021-11-06 20:41:08 +01:00
andreas 436dd3632b allow to set the AP password if we can do hardware reset 2021-11-06 18:55:05 +01:00
andreas 62151f9c3c add led handling for m5atom 2021-11-06 16:02:30 +01:00
andreas 33b2810f97 add button for m5atom 2021-11-06 14:52:54 +01:00
andreas 2526c82562 add api for supplementary tasks, add button task 2021-11-06 14:32:57 +01:00
andreas 99beb82014 make logging thread safe 2021-11-06 14:32:14 +01:00
andreas b0684fc65a allow to set the nmea0183 talker id 2021-11-05 21:14:39 +01:00
andreas c782225e33 handle HDG,HDM,HDT bothways 2021-11-05 20:38:15 +01:00
andreas fc57d73054 add info about conversions to UI, tweak layout 2021-11-05 19:19:43 +01:00
andreas 4572cafa23 MWD,VWR to n2k 2021-11-05 18:12:31 +01:00
andreas 702cac2a83 MWV to n2k 2021-11-05 17:12:10 +01:00
andreas 93180be220 use a more semantic input for the NMEA filters 2021-11-03 21:24:27 +01:00
andreas 3cf67d387e introduce NMEA filter 2021-11-03 19:36:28 +01:00
andreas bec155fb4d intermediate: use the arduino hwserial as idf does not receive data 2021-11-03 17:11:40 +01:00
andreas 301783ae40 handle and configure a serial device 2021-11-02 21:18:11 +01:00
andreas b84e47d16a NMEA0183 AIS to N2K, corrected some encodings 2021-11-02 19:29:40 +01:00
andreas 3b437c8476 intermediate: NMEA0183A AIS to N2K 2021-11-02 11:51:55 +01:00
andreas ce954e41f8 send 129285 on RMB 2021-11-02 11:18:32 +01:00
andreas ac9f113b54 intermediate: translate RMB to N2K 2021-11-01 15:43:17 +01:00
andreas 0bdcc8fff2 handle priorities in boat data 2021-11-01 11:41:41 +01:00
andreas 8d1895ad3a prepare message for AIS 2021-11-01 11:19:46 +01:00
andreas a57d91c63d add flush for gwserial 2021-11-01 11:19:31 +01:00
andreas 470dec92ad convert RMC from 0183 to 2k, avoid cores 2021-10-31 21:20:27 +01:00
andreas c14ed4cfe9 return status info in boatData request 2021-10-31 16:31:22 +01:00
andreas 165aca2f61 make boatData statically predefined 2021-10-31 12:29:50 +01:00
andreas 4cbd7b313d use converterlist for both directions 2021-10-31 11:17:04 +01:00
andreas f9bec3f0ba make the converterlist an own class 2021-10-31 10:59:53 +01:00
andreas c8778e4ceb intermediate: add nmea0183 to n2k 2021-10-30 21:37:44 +02:00
andreas 0b4aa58d71 remove compile warnings 2021-10-30 20:05:20 +02:00
andreas e61e2955b7 restructure n2ktoais 2021-10-30 20:05:02 +02:00
andreas 483e79f99e cleanup of unused code, streamline main 2021-10-30 19:43:14 +02:00
andreas bb7f2085a4 refactor message queue 2021-10-30 19:11:21 +02:00
andreas bb80c5f44f refactoring: move webserver stuff to own lib 2021-10-30 14:49:53 +02:00
andreas 11c6c78ad6 fix memory leak in main messages 2021-10-30 13:49:20 +02:00
andreas 9b65ce51d4 fix AIS decoding memory leaks 2021-10-30 13:13:45 +02:00
andreas 8182ce1fe9 fix AIS decoding memory leaks 2021-10-30 13:08:42 +02:00
andreas e7b2c6e756 add some memory diagnostics 2021-10-30 12:01:50 +02:00
andreas 56aaf595b4 increase reconnect interval to 10s 2021-10-28 22:10:09 +02:00
andreas b4fe48744b intermediate: externalize config definitions 2021-10-28 20:43:05 +02:00
andreas 1be2b1a667 handle receiving and distributing on NMEA messages 2021-10-28 10:25:12 +02:00
andreas b007586076 streamline buffer handling 2021-10-27 10:43:53 +02:00
andreas e378f6e56b intermediate: tcp read 2021-10-26 21:54:28 +02:00
andreas 933ea0d0aa intermediate: reading on tcp 2021-10-26 20:28:21 +02:00
andreas 60eabb05ab use nonblocking write for serial 2021-10-25 21:20:41 +02:00
andreas 8c02b21277 use static list of client connections in socket server 2021-10-25 19:46:53 +02:00
andreas c893025cd3 use async web server 2021-10-25 18:31:34 +02:00
andreas 2b1eda27d4 use async send for tcp connections 2021-10-24 21:17:10 +02:00
andreas 2057b70cb7 introduce debug log 2021-10-24 16:51:47 +02:00
andreas 149ffb7a5f add mdns 2021-10-22 16:15:49 +02:00
andreas 6e449ca4dc allow to set system name, auto shutdown AP, usb baud 2021-10-22 15:20:40 +02:00
andreas 35ff689cd9 include ais conversion 2021-10-22 13:08:25 +02:00
andreas c63a9bb689 initial import of ais stuff 2021-10-21 19:38:57 +02:00
andreas 63eb317816 add extended nmea2k status 2021-10-21 18:10:25 +02:00
andreas c24e699874 move to dynamic registration of converter functions 2021-10-21 17:04:56 +02:00
andreas f054413de4 intermediate: use header for n2kton0183 functions 2021-10-21 16:13:52 +02:00
andreas 30a91bd5d2 longer timeouts for data 2021-10-20 21:27:48 +02:00
andreas 940d7ea957 completely moved to dynamic boatData, first tests 2021-10-20 21:19:20 +02:00
andreas e1e3928062 cleanup boatData handling 2021-10-20 16:42:12 +02:00
andreas 68769368f2 further move to dynamic boat data 2021-10-18 21:58:32 +02:00
andreas 9fa577c768 store all values in boatData 2021-10-18 21:26:08 +02:00
andreas e421fe0722 config for sending to tcp, seasmart 2021-10-18 20:12:27 +02:00
andreas 3bbd9ef965 separate boat data, integrate with web server 2021-10-18 19:20:00 +02:00
andreas 0360044ef3 TCP server separated 2021-10-17 21:55:34 +02:00
andreas 117193fbed restructure ui, styling 2021-10-17 19:15:22 +02:00
andreas 8f03ad1373 add testServer 2021-10-17 18:17:18 +02:00
andreas 0fe10aeef8 intermediate: restructure wifi,log 2021-10-17 15:41:35 +02:00
andreas ec67767ca6 intermediate: config handler implementation 2021-10-16 20:18:03 +02:00