Skip to content
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
wants to merge 15 commits into
base: master
Choose a base branch
from
Open

Commits on Nov 27, 2019

  1. 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
    MoBoo committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    f8352cf View commit details
    Browse the repository at this point in the history
  2. Merge pull request #1 from MoBoo/MoBoo-patch-1_bugfix_TOPIC_OUTPUT_ST…

    …ATE_ACK
    
    Fix Bug with Error-Acknowledgement-Messages
    MoBoo committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    c33d5f0 View commit details
    Browse the repository at this point in the history
  3. Update main.cpp

    MoBoo committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    36a32cf View commit details
    Browse the repository at this point in the history
  4. Merge pull request #2 from MoBoo/MoBoo-patch-1_bugfix_TOPIC_OUTPUT_ST…

    …ATE_ACK
    
    Update main.cpp
    MoBoo committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    e4bb25f View commit details
    Browse the repository at this point in the history
  5. Merge pull request #3 from fischertechnik/master

    MQTT-Acknowledge Messages Timestamp Check Bugix (#3)
    MoBoo committed Nov 27, 2019
    Configuration menu
    Copy the full SHA
    cb896e8 View commit details
    Browse the repository at this point in the history

Commits on Nov 29, 2019

  1. Update Makefile

    Append env-var check, to make sure TOOLCHAIN_BIN_PATH is set.
    MoBoo committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    3ad12ab View commit details
    Browse the repository at this point in the history
  2. Update Makefile

    MoBoo committed Nov 29, 2019
    Configuration menu
    Copy the full SHA
    7eba13e View commit details
    Browse the repository at this point in the history

Commits on Dec 12, 2019

  1. 1. Add Store-after-Produce Working Mode

    2. Add Endless Working Mode
    3. Add Pickup Workflow
    4. Add Store Workflow
    mmasur committed Dec 12, 2019
    Configuration menu
    Copy the full SHA
    d26296d View commit details
    Browse the repository at this point in the history

Commits on Dec 17, 2019

  1. 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 committed Dec 17, 2019
    Configuration menu
    Copy the full SHA
    a16a1a2 View commit details
    Browse the repository at this point in the history

Commits on Dec 20, 2019

  1. Update main.cpp

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    74dcb0b View commit details
    Browse the repository at this point in the history
  2. Update main.cpp

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    30d811a View commit details
    Browse the repository at this point in the history
  3. Update TxtMqttFactoryClient.cpp

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    ad226ce View commit details
    Browse the repository at this point in the history
  4. Update TxtMqttFactoryClient.h

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    8bbf15b View commit details
    Browse the repository at this point in the history
  5. Update TxtMqttFactoryClient.h

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    10523e8 View commit details
    Browse the repository at this point in the history
  6. Update TxtMqttFactoryClient.h

    MoBoo committed Dec 20, 2019
    Configuration menu
    Copy the full SHA
    b5e4520 View commit details
    Browse the repository at this point in the history