-
Notifications
You must be signed in to change notification settings - Fork 25
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
base: master
Are you sure you want to change the base?
Commits on Nov 27, 2019
-
Fix Bug with Error-Acknowledgement-Messages
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
Configuration menu - View commit details
-
Copy full SHA for f8352cf - Browse repository at this point
Copy the full SHA f8352cfView commit details -
Merge pull request #1 from MoBoo/MoBoo-patch-1_bugfix_TOPIC_OUTPUT_ST…
…ATE_ACK Fix Bug with Error-Acknowledgement-Messages
Configuration menu - View commit details
-
Copy full SHA for c33d5f0 - Browse repository at this point
Copy the full SHA c33d5f0View commit details -
Configuration menu - View commit details
-
Copy full SHA for 36a32cf - Browse repository at this point
Copy the full SHA 36a32cfView commit details -
Merge pull request #2 from MoBoo/MoBoo-patch-1_bugfix_TOPIC_OUTPUT_ST…
…ATE_ACK Update main.cpp
Configuration menu - View commit details
-
Copy full SHA for e4bb25f - Browse repository at this point
Copy the full SHA e4bb25fView commit details -
Merge pull request #3 from fischertechnik/master
MQTT-Acknowledge Messages Timestamp Check Bugix (#3)
Configuration menu - View commit details
-
Copy full SHA for cb896e8 - Browse repository at this point
Copy the full SHA cb896e8View commit details
Commits on Nov 29, 2019
-
Append env-var check, to make sure TOOLCHAIN_BIN_PATH is set.
Configuration menu - View commit details
-
Copy full SHA for 3ad12ab - Browse repository at this point
Copy the full SHA 3ad12abView commit details -
Configuration menu - View commit details
-
Copy full SHA for 7eba13e - Browse repository at this point
Copy the full SHA 7eba13eView commit details
Commits on Dec 12, 2019
-
1. Add Store-after-Produce Working Mode
2. Add Endless Working Mode 3. Add Pickup Workflow 4. Add Store Workflow
mmasur committedDec 12, 2019 Configuration menu - View commit details
-
Copy full SHA for d26296d - Browse repository at this point
Copy the full SHA d26296dView commit details
Commits on Dec 17, 2019
-
Update TxtFactoryMain/src/main.cpp and TxtFactoryClient/src/main.cpp …
…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>'
mmasur committedDec 17, 2019 Configuration menu - View commit details
-
Copy full SHA for a16a1a2 - Browse repository at this point
Copy the full SHA a16a1a2View commit details
Commits on Dec 20, 2019
-
Configuration menu - View commit details
-
Copy full SHA for 74dcb0b - Browse repository at this point
Copy the full SHA 74dcb0bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 30d811a - Browse repository at this point
Copy the full SHA 30d811aView commit details -
Configuration menu - View commit details
-
Copy full SHA for ad226ce - Browse repository at this point
Copy the full SHA ad226ceView commit details -
Configuration menu - View commit details
-
Copy full SHA for 8bbf15b - Browse repository at this point
Copy the full SHA 8bbf15bView commit details -
Configuration menu - View commit details
-
Copy full SHA for 10523e8 - Browse repository at this point
Copy the full SHA 10523e8View commit details -
Configuration menu - View commit details
-
Copy full SHA for b5e4520 - Browse repository at this point
Copy the full SHA b5e4520View commit details