[Fawkes Git] branch/timn/robotino-direct: 2 revs updated. (0.5.0-3115-gd022bd3)

Tim Niemueller niemueller at kbsg.rwth-aachen.de
Sun Jun 19 22:16:24 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, timn/robotino-direct has been updated
        to  d022bd332531762b28e5a25eaa5b1f2763c7e495 (commit)
       via  a7368717c6becd8e146261a2143d04c6eff14ddf (commit)
      from  11850b75b65468ccae033b9a1768fe43f3d113f3 (commit)

http://git.fawkesrobotics.org/fawkes.git/timn/robotino-direct

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 a7368717c6becd8e146261a2143d04c6eff14ddf
Author:     Matthias Loebach <matthias.loebach at ima-zlw-ifu.rwth-aachen.de>
AuthorDate: Fri Jun 17 02:15:01 2016 -0700
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Fri Jun 17 02:15:01 2016 -0700

    robotino: fix types of checksum bound config values

http://git.fawkesrobotics.org/fawkes.git/commit/a736871
http://trac.fawkesrobotics.org/changeset/a736871

- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
commit d022bd332531762b28e5a25eaa5b1f2763c7e495
Author:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
AuthorDate: Fri Jun 17 02:16:12 2016 -0700
Commit:     Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
CommitDate: Fri Jun 17 02:16:12 2016 -0700

    robotino: always consume remaining buffer on checksum error

http://git.fawkesrobotics.org/fawkes.git/commit/d022bd3
http://trac.fawkesrobotics.org/changeset/d022bd3

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


- *Summary* -----------------------------------------------------------
 src/plugins/robotino/direct_com_thread.cpp |    5 +++--
 src/plugins/robotino/direct_com_thread.h   |    4 ++--
 2 files changed, 5 insertions(+), 4 deletions(-)


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

- *commit* a7368717c6becd8e146261a2143d04c6eff14ddf - - - - - - - - - -
Author:  Matthias Loebach <matthias.loebach at ima-zlw-ifu.rwth-aachen.de>
Date:    Fri Jun 17 02:15:01 2016 -0700
Subject: robotino: fix types of checksum bound config values

 src/plugins/robotino/direct_com_thread.cpp |    4 ++--
 src/plugins/robotino/direct_com_thread.h   |    4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/direct_com_thread.cpp b/src/plugins/robotino/direct_com_thread.cpp
index 0830a29..0435a22 100644
--- a/src/plugins/robotino/direct_com_thread.cpp
+++ b/src/plugins/robotino/direct_com_thread.cpp
@@ -75,8 +75,8 @@ DirectRobotinoComThread::init()
 	cfg_drive_update_interval_ = config->get_uint("/hardware/robotino/direct/drive-update-interval");
 	cfg_read_timeout_ = config->get_uint("/hardware/robotino/direct/read-timeout");
 	cfg_log_checksum_errors_ = config->get_bool("/hardware/robotino/direct/checksums/log-errors");
-	cfg_checksum_error_recover_ = config->get_bool("/hardware/robotino/direct/checksums/recover-bound");
-	cfg_checksum_error_critical_ = config->get_bool("/hardware/robotino/direct/checksums/critical-bound");
+	cfg_checksum_error_recover_ = config->get_uint("/hardware/robotino/direct/checksums/recover-bound");
+	cfg_checksum_error_critical_ = config->get_uint("/hardware/robotino/direct/checksums/critical-bound");
 	
 	// -------------------------------------------------------------------------- //
 
diff --git a/src/plugins/robotino/direct_com_thread.h b/src/plugins/robotino/direct_com_thread.h
index e6db480..fae2822 100644
--- a/src/plugins/robotino/direct_com_thread.h
+++ b/src/plugins/robotino/direct_com_thread.h
@@ -108,8 +108,8 @@ class DirectRobotinoComThread
 	unsigned int    cfg_drive_update_interval_;
 	unsigned int    cfg_read_timeout_;
 	bool            cfg_log_checksum_errors_;
-	bool            cfg_checksum_error_recover_;
-	bool            cfg_checksum_error_critical_;
+	unsigned int    cfg_checksum_error_recover_;
+	unsigned int    cfg_checksum_error_critical_;
 	
 	bool opened_;
 	unsigned int open_tries_;

- *commit* d022bd332531762b28e5a25eaa5b1f2763c7e495 - - - - - - - - - -
Author:  Tim Niemueller <niemueller at kbsg.rwth-aachen.de>
Date:    Fri Jun 17 02:16:12 2016 -0700
Subject: robotino: always consume remaining buffer on checksum error

 src/plugins/robotino/direct_com_thread.cpp |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

_Diff for modified files_:
diff --git a/src/plugins/robotino/direct_com_thread.cpp b/src/plugins/robotino/direct_com_thread.cpp
index 0435a22..18092e2 100644
--- a/src/plugins/robotino/direct_com_thread.cpp
+++ b/src/plugins/robotino/direct_com_thread.cpp
@@ -160,6 +160,7 @@ DirectRobotinoComThread::loop()
 			process_message(m);
 			update_nodata_timer();
 		} catch (DirectRobotinoComMessage::ChecksumError &ce) {
+			input_buffer_.consume(input_buffer_.size());
 			if (! finalize_prepared && opened_) {
 				checksum_errors_ += 1;
 				if (cfg_log_checksum_errors_) {




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


More information about the fawkes-commits mailing list