Megastel Protocol - Exstended with WiFi data and Protocol Encoder #5134
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Improvements on MegastekProtocolDecoder decodeNew; - Added WifiAccessPoint (for LBS Geolocation). - BatteryLevel (percentage) was wrongly stored as battery what is battery voltage. - Satellite counts now all satellites (BDS, GPS and Glonass). - Belt status set to KEY_LOCK - A 'restart' was not covered, this will now trigger a ALARM_POWER_ON. - A 'detect water'. was not covered, this will now trigger a ALARM_FUEL_LEAK (most similar of all Alarm options) - Command Response messages (for new and old protocol) including for new protocol sending current timestamp back to the device on request (Q051;). Added; - MegastekProtocolEncoder, for new and old protocol. New protocol has more SupportedDataCommands. With Custom Commands only need to enter the actual command and not the full message including device id. This part is only tested with the new protocol. -- The old and the already existing new Megastek protocol in Traccar could perhaps better be divided up in two protocols? Megastek and Megastek2 like with Xexun and Xexun2 protocol?
|
To start with please clean up the formatting in the code. And also please provide the protocol documentation. |
|
Megastel Protocol v2.pdf Here are the Megastek Protocol and Command List documentation. |
|
Can I ask what you like to be cleaned up of the formatting? |
tananaev
reviewed
Jul 13, 2023
| private static final Pattern PATTERN_COMMAND_RESULT_OLD = new PatternBuilder() | ||
| .text("$") // start | ||
| .number("(d+),") // device id | ||
| .expression("(.*);") // command |
| .number("(d+),") // device id | ||
| .expression("(.*);") // command | ||
| .number("xx") // checksum | ||
| .any() // |
| .expression("[^,]*,") // name | ||
| .expression("([RS]),") | ||
| .expression("[^,]*,") // device name | ||
| .expression("([RS]),") // R = Realtime data, S = Stored data |
There was a problem hiding this comment.
Same here. You shouldn't use tabs anywhere in the code.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Improvements on MegastekProtocolDecoder decodeNew;
Added;
--
The old and the already existing new Megastek protocol in Traccar could perhaps better be divided up in two protocols? Megastek and Megastek2 like with Xexun and Xexun2 protocol?