[hrpiob] Upgrade for hrpsys 315.4.0 onward.#481
Open
130s wants to merge 4 commits intostart-jsk:indigo-develfrom
Open
[hrpiob] Upgrade for hrpsys 315.4.0 onward.#481130s wants to merge 4 commits intostart-jsk:indigo-develfrom
130s wants to merge 4 commits intostart-jsk:indigo-develfrom
Conversation
130s
force-pushed
the
hrpiob/upgrade_to_hrpsys315.4.0_onward
branch
from
a7cccfa to
be738c3
Compare
Contributor
Author
|
Relevant PR fkanehiro/hrpsys-base#598 |
|
better to have backward compatibility |
Contributor
Author
確認ですが，次のように理解しています．
上記の理解で正しいとすると，バージョン互換性を保つためのコードを加えるべきは，正論としては下流の hrpsys と思っています． |
Member
|
逆で、このコードがhrpsysにソースコードとしても作られたライブラリとしても依存しています．ソースコードとしては
```
#include <hrpsys/io/iob.h>
```
があるのと、ライブラリとしては、ｈｒｐｓｙｓが315.4.0
以前の環境だとread_batteryとかを定義した．.soでないとロードできないというこおとで、hrpsysのバージョンにおうじて、ここのソースの書き方が変わるので、このコードがhrpsysに依存しています．
fkanehiro/hrpsys-base#597
と表れ方は違いますが、原因はおなじです．
```
k-okada@p40-yoga:/tmp/rtmros_hironx/hironx_ros_bridge/robot/hrpiob$ cat
hoge.txt
diff --git a/hironx_ros_bridge/robot/hrpiob/CMakeLists.txt
b/hironx_ros_bridge/robot/hrpiob/CMakeLists.txt
index 7077046..3331d20 100644
--- a/hironx_ros_bridge/robot/hrpiob/CMakeLists.txt
+++ b/hironx_ros_bridge/robot/hrpiob/CMakeLists.txt
@@ -38,15 +38,29 @@ include_directories(/opt/jsk/include /usr/pkg/include)
link_directories(/opt/jsk/lib /usr/pkg/lib)
#endif()
-# hrpsys-base
-#include(FindPkgConfig)
+# Can not use this????
+# find_package(PkgConfig)
+# pkg_check_modules(HRPSYSBASE REQUIRED hrpsys-base)
+# include_directories(${HRPSYSBASE_INCLUDE_DIRS})
+# hrpsys-base
+include(FindPkgConfig)
execute_process(
COMMAND pkg-config --cflags-only-I hrpsys-base
OUTPUT_VARIABLE HRPSYSBASE_CXX_FLAGS
RESULT_VARIABLE RESULT)
+execute_process(
+ COMMAND pkg-config --modversion hrpsys-base
+ OUTPUT_VARIABLE HRPSYSBASE_VERSION
+ RESULT_VARIABLE RESULT)
message("HRPSYSBASE_CXX_FLAGS: ${HRPSYSBASE_CXX_FLAGS}")
+message("HRPSYSBASE_VERSION: ${HRPSYSBASE_VERSION}")
+if(NOT "${HRPSYSBASE_VERSION}" VERSION_LESS "315.4.0")
+ add_definitions(-DROBOT_IOB_VERSION=2)
+ message(STATUS "USE VERSION 2 OF IOB")
+ message(STATUS "ADD DEFINITION -DROBOT_IOB_VERSION=2")
+endif()
add_definitions(${HRPSYSBASE_CXX_FLAGS})
diff --git a/hironx_ros_bridge/robot/hrpiob/iob.cpp
b/hironx_ros_bridge/robot/hrpiob/iob.cpp
index 529c51c..931f596 100644
--- a/hironx_ros_bridge/robot/hrpiob/iob.cpp
+++ b/hironx_ros_bridge/robot/hrpiob/iob.cpp
@@ -734,6 +734,7 @@ int read_digital_output(char *doutput)
return FALSE;
}
+#if defined(ROBOT_IOB_VERSION) && ROBOT_IOB_VERSION >= 2
/**
* @brief Needed for hrpsys 315.4.0 onward (added at
fkanehiro/hrpsys-base#598).
* TODO Implement if we want to utilize this.
@@ -763,3 +764,4 @@ int read_battery(char *battery)
std::fprintf(stdout, "read_battery not implemented. See
#481\n");
return 0;
}
+#endif
diff --git a/hironx_ros_bridge/robot/hrpiob/nextage-open.hpp
b/hironx_ros_bridge/robot/hrpiob/nextage-open.hpp
index c91e2e2..dce6744 100644
--- a/hironx_ros_bridge/robot/hrpiob/nextage-open.hpp
+++ b/hironx_ros_bridge/robot/hrpiob/nextage-open.hpp
@@ -68,9 +68,11 @@ namespace NEXTAGE_OPEN
virtual int length_digital_output(void) = 0;
virtual int read_digital_output(char *doutput) = 0;
+#if defined(ROBOT_IOB_VERSION) && ROBOT_IOB_VERSION >= 2
virtual int number_of_thermometers(void) = 0;
virtual int number_of_batteries(void) = 0;
virtual int read_battery(char *battery) = 0;
+#endif
};
}
```
ちなみに、iob.hは全体がextern "C"でかこまれていて、-DROBOT_IOB_VERSION>=2
をしなにと、number_of_batteiresとかの定義がされないから、できた．.soでC++スタイルの定義になっていて、
hrpsys側からloadした時にエラーになりますね．なので、nextage-open.hpp でこれらの関数を
定義しているのが間違いで、iob.hにちゃんと定義があるから、-D.. をつかってこれを利用できるようにする
というのが正解ですね．
参考：
http://stackoverflow.com/questions/1041866/in-c-source-what-is-the-effect-of-extern-c
http://www.tldp.org/HOWTO/C++-dlopen/thesolution.html
…--
◉ Kei Okada
2016年12月16日 11:43 Isaac I.Y. Saito <notifications@github.com>:
better to have backward compatibility
確認ですが，次のように理解しています．
- "backward compatibility" は hrpsys の古いバージョンのこと．
- hrpsys が hrpiob に依存する (つまり hrpiob が上流)．
上記の理解で正しいとすると，バージョン互換性を保つためのコードを加えるべきは，正論としては下流の hrpsys と思っています．
よくわかっていませんが，両者は密接な関係がある等の理由で，正論通りにはいかず，hrpiob 側に互換コードを入れるのがこの場合正しい，
という状況でしょうか？
—
You are receiving this because you are subscribed to this thread.
Reply to this email directly, view it on GitHub
<#481 (comment)>,
or mute the thread
<https://github.com/notifications/unsubscribe-auth/AAeG3J5nJCjIX5qff9yFrYKg9Tc49EjAks5rIfrTgaJpZM4LLAIk>
.
|
130s
force-pushed
the
hrpiob/upgrade_to_hrpsys315.4.0_onward
branch
3 times, most recently
from
15275ba to
372c9e1
Compare
Contributor
Author
|
Thank you very much for the deep insight and a patch. Commits are now updated, and I'll test the .so with this change on the real robot.
|
Contributor
Author
|
Trying the binary |
Contributor
Author
|
Not sure if this is related, but in I assume the |
Contributor
Author
Looking at older ModelLoader log files, the less output started exactly when hrpsys was updated to 315.9.0. Now I also switched to hrpsys 315.7.0 but the symptom in both ModelLoader.log and rtcd.log remain the same.. |
Contributor
Author
Looks like this is also something that started with newer hrpsys (as you see below no rtcd-* from last month where the controller was still 315.1.8 has it). |
Contributor
Author
I found an old ticket start-jsk/rtmros_common#294 (comment) where I see the same |
Contributor
Author
|
Switched back to |
130s
force-pushed
the
hrpiob/upgrade_to_hrpsys315.4.0_onward
branch
from
372c9e1 to
92baa5e
Compare
Contributor
Author
|
I've added a couple of commits, and now I'm able to build with I noticed, however, that cmake failed to find |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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.
Since hrpsys 315.4.0 with updated
RobotHardware, rtcd on QNX fails on NEXTAGE Open as follows.hrpiobwith this PR hopefully fixes the issue.Please review @534o @emijah