-
Notifications
You must be signed in to change notification settings - Fork 26
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Erweiterung Lernfabrik 4.0 #5
Open
MoBoo
wants to merge
15
commits into
fischertechnik:master
Choose a base branch
from
MoBoo:master
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
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
Hallo Herr Steiger, ich habe heute auf die neue Firmware (4.6.6) und die Txt-Version 0.8.0 gewechselt und es scheint als würde das Quittieren von Fehlern in der Cloud nicht funktionieren. Es wird zwar der Timestamp über MQTT veröffentlicht, und der VGR bekommt auch die entsprechende MQTT-Nachricht, verwirft diese aber (!!!) In TxtFactoryClient.cpp wird der Timestamp in der MQTT-JSON-Nachricht geprüft, ob dieser im 10-Sekunden Fenster liegt. Allerdings wird der return der trycheckTimestampTTL negiert (!ft::trycheckTimestampTTL), das dürft meiner Meinung nach nicht sein. Sonst müsste in der MQTT-Nachricht ein Timestamp angegeben werden der mindestens 10 Sekunden von der aktuellen Zeit abweicht. Dies sind die entsprechenden Code-Stellen. Utils.cpp (ft::trycheckTimestampTTL) https://github.com/fischertechnik/txt_training_factory/blob/master/TxtSmartFactoryLib/src/Utils.cpp#L64 TxtFactoryClient https://github.com/fischertechnik/txt_training_factory/blob/master/TxtFactoryClient/src/main.cpp#L316 Mein Test Setup: - Werkstück in SLD einlegen und nach der Farberkennung entfernen. - VGR fährt zur Abholposition - NFC wird geprüft Error - VGR befindet sich in Error-State - Über Fischertechnik-Cloud Dashboard/MQTT-Nachricht (Topic f/o/state/ack) Nachricht veröffentlichen o mosquitto_pub -u txt -P xtx -t f/o/state/ack -m "{\"ts\": \"$(date -u +'%Y-%m-%dT%H:%M:%S').00Z\"}" -h 192.168.0.10 - VGR erhält Nachricht, Timestamp wird validiert (erfolgreich) -> Negierung in IF-Statement - VGR bleibt im Error-State Freundliche Grüße, Mark-Oliver Masur
…ATE_ACK Fix Bug with Error-Acknowledgement-Messages
…ATE_ACK Update main.cpp
MQTT-Acknowledge Messages Timestamp Check Bugix (#3)
Append env-var check, to make sure TOOLCHAIN_BIN_PATH is set.
2. Add Endless Working Mode 3. Add Pickup Workflow 4. Add Store Workflow
…to support custom mqtt client ids and prefixes. Configurable through /opt/knobloch/Data/Config.Client.json: 'mqtt_client_id': '<client_id>' and 'mqtt_prefix': '<prefix>'
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.
1. Normal Working Mode
2. Store-after-Produce Working Mode
{"ts": "<%Y-%m-%dT%H:%M:%S.000Z>", "id": "<nfc tag_uid>"}
{"ts": "<%Y-%m-%dT%H:%M:%S.000Z>"}
3. Endless Working Mode
Change Working Mode:
Improvements:
BugFix:
Things to consider: