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

Fix reference joint angle used to calculate error. #966

Merged
merged 1 commit into from
Apr 4, 2016

Conversation

snozawa
Copy link
Contributor

@snozawa snozawa commented Apr 4, 2016

SoftErrorLimitのErrorの計算時に、
今までは入力指令関節角と実関節角との比較になってましたが、
posとvelのlimit制限をおえた指令関節角と実関節角との比較になしました
(研究室内の旧システムはそうなっていました)。
よろしくお願いします。

…robot_soft_error_limiter.py] Fix reference joint angle used to calculate error. Use joint angle which consider position limit and velocity limit.
@k-okada
Copy link
Contributor

k-okada commented Apr 4, 2016

Refer to this link for build results (access rights to CI server needed):
http://jenkins.jsk.imi.i.u-tokyo.ac.jp:8080/job/hrpsys-qnx/2574/

Build Log
last 10 lines

[...truncated 8556 lines...]
    at org.jenkinsci.plugins.ghprb.GhprbRepository.createCommitStatus(GhprbRepository.java:122)
    at org.jenkinsci.plugins.ghprb.GhprbBuilds.onCompleted(GhprbBuilds.java:118)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:27)
    at org.jenkinsci.plugins.ghprb.GhprbBuildListener.onCompleted(GhprbBuildListener.java:12)
    at hudson.model.listeners.RunListener.fireCompleted(RunListener.java:202)
    at hudson.model.Run.execute(Run.java:1783)
    at hudson.model.FreeStyleBuild.run(FreeStyleBuild.java:43)
    at hudson.model.ResourceController.execute(ResourceController.java:98)
    at hudson.model.Executor.run(Executor.java:410)

Test FAILed.

@fkanehiro fkanehiro merged commit 2ad8a5e into fkanehiro:master Apr 4, 2016
@snozawa snozawa deleted the fix_el_error_limitation branch April 4, 2016 13:00
@k-okada
Copy link
Contributor

k-okada commented Apr 5, 2016

CMakeFiles/RobotHardware.dir/robot.o -c /tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp: In member function 'bool robot::checkEmergency(robot::emg_reason&, int&)':
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp:607: error: 'SS_EMERGENCY' was not declared in this scope
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp: In member function 'void robot::readBatteryState(unsigned int, double&, double&, double&)':
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp:774: error: 'read_battery' was not declared in this scope
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp: In member function 'int robot::numBatteries()':
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp:783: error: 'number_of_batteries' was not declared in this scope
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp: In member function 'int robot::numThermometers()':
/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp:801: error: 'number_of_thermometers' was not declared in this scope
cc: /usr/qnx650/host/qnx6/x86/usr/lib/gcc/i486-pc-nto-qnx6.5.0/4.4.2/cc1plus error 1
make[2]: *** [rtc/RobotHardware/CMakeFiles/RobotHardware.dir/robot.o] Error 1
make[2]: Leaving directory `/tmp/hrpsys-source-966-2016-04-04/build'
make[1]: *** [rtc/RobotHardware/CMakeFiles/RobotHardware.dir/all] Error 2
make[1]: Leaving directory `/tmp/hrpsys-source-966-2016-04-04/build'

ヘッダファイルのバージョンでえ切り分けしないといけないパターンでしょうか.

@snozawa
Copy link
Contributor Author

snozawa commented Apr 5, 2016

ヘッダファイルのバージョンでえ切り分けしないといけないパターンでしょうか.

そのようですね。

このPRが
#842 (comment)
関係してそうで、確かに上記のタイミングでエラーになってそうでした。

@k-okada
Copy link
Contributor

k-okada commented Apr 6, 2016

[ 27%] Building CXX object rtc/RobotHardware/CMakeFiles/RobotHardware.dir/robot.o
cd /tmp/hrpsys-source-966-2016-04-04/build/rtc/RobotHardware && /usr/qnx650/host/qnx6/x86/usr/bin/QCC  -x c++ -DRobotHardware_EXPORTS -DROBOT_IOB_VERSION=2 -I/usr/pkg/include -O3 -DNDEBUG -I/usr/local/include -I/opt/jsk/include -I/usr/pkg/include -I/tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/../../include -I/opt/jsk/include/coil-1.1 -I/opt/jsk/include/openrtm-1.1 -I/opt/jsk/include/openrtm-1.1/rtm/idl -I/opt/jsk/include/OpenHRP-3.1 -I/opt/jsk/include/eigen3 -I/tmp/hrpsys-source-966-2016-04-04/build   -DHRPSYS_PACKAGE_VERSION="\"315.7.0\"" -o CMakeFiles/RobotHardware.dir/robot.o -c /tmp/hrpsys-source-966-2016-04-04/src/hrpsys-base-966/rtc/RobotHardware/robot.cpp

みると,ソースツリーのiob.h にパスが通っていないような気がしませんか? 

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants