[Fawkes Git] branch/sschoenitz/timeout: jumpstate: Automatic conversion sec to msec

Sebastian Schoenitz sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de
Tue Apr 12 21:28:40 CEST 2016


Changes have been pushed for the project "Fawkes Robotics Software Framework".

Gitweb: http://git.fawkesrobotics.org/fawkes.git
Trac:   http://trac.fawkesrobotics.org

The branch, sschoenitz/timeout has been updated
        to  55cd4f0b2311993341f1723b98b6d85cda524d06 (commit)
      from  c5d50752f402d871f34eeca552e1e127084053c1 (commit)

http://git.fawkesrobotics.org/fawkes.git/sschoenitz/timeout

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- *Log* ---------------------------------------------------------------
commit 55cd4f0b2311993341f1723b98b6d85cda524d06
Author:     Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
AuthorDate: Tue Apr 12 21:21:05 2016 +0200
Commit:     Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
CommitDate: Tue Apr 12 21:21:05 2016 +0200

    jumpstate: Automatic conversion sec to msec
    
    Converts seconds given by the skills to the needed milliseconds.

http://git.fawkesrobotics.org/fawkes.git/commit/55cd4f0
http://trac.fawkesrobotics.org/changeset/55cd4f0

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -


- *Summary* -----------------------------------------------------------
 src/lua/fawkes/fsm/jumpstate.lua |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)


- *Diffs* -------------------------------------------------------------

- *commit* 55cd4f0b2311993341f1723b98b6d85cda524d06 - - - - - - - - - -
Author:  Sebastian Schoenitz <sebastian.schoenitz at ima-zlw-ifu.rwth-aachen.de>
Date:    Tue Apr 12 21:21:05 2016 +0200
Subject: jumpstate: Automatic conversion sec to msec

 src/lua/fawkes/fsm/jumpstate.lua |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

_Diff for modified files_:
diff --git a/src/lua/fawkes/fsm/jumpstate.lua b/src/lua/fawkes/fsm/jumpstate.lua
index 455b6e4..b75471e 100644
--- a/src/lua/fawkes/fsm/jumpstate.lua
+++ b/src/lua/fawkes/fsm/jumpstate.lua
@@ -314,7 +314,7 @@ end
 --- Fires on timeout.
 -- @return true if the time ran out
 function JumpState:jumpcond_timeout()
- return difftime(self.timeout_start) >= self.timeout_time
+ return difftime(self.timeout_start) >= math.floor(self.timeout_time*1000)
 end
 
 --- Initializes timeout value.




-- 
Fawkes Robotics Framework                 http://www.fawkesrobotics.org


More information about the fawkes-commits mailing list