Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
244 commits
Select commit Hold shift + click to select a range
0b6eda9
First commit
iory Nov 27, 2023
9cb6207
Add web server
iory Nov 27, 2023
c5042ad
Fixed human pose
iory Nov 27, 2023
ecd2ff1
Add visualize hand pose
iory Nov 27, 2023
d07d3be
Fixed
iory Nov 28, 2023
417e70d
Add show tag euslisp code
iory Nov 28, 2023
a5d9a9b
Add gesture recognition
iory Mar 15, 2024
a46dbcf
Add
iory Mar 15, 2024
0568c24
Add
iory Mar 15, 2024
788218e
Add
iory Mar 15, 2024
17f4f43
Add
iory Mar 15, 2024
1e27f6b
Add
iory Mar 15, 2024
a47d83c
Add
iory Mar 15, 2024
631f177
Add
iory Mar 15, 2024
1bfbca1
Add i2c audio publisher
iory Mar 16, 2024
62a8efc
Add
iory Mar 16, 2024
b483b6b
Add
iory Mar 16, 2024
49044a1
Add
iory Mar 16, 2024
37b128a
Add
iory Mar 16, 2024
341af34
Add
iory Mar 16, 2024
314a747
Add
iory Mar 16, 2024
506f046
Add
iory Mar 16, 2024
17dda4f
Refactor
iory Mar 16, 2024
b87b1b9
Add
iory Mar 16, 2024
0090632
Add
iory Mar 16, 2024
c22f848
Add
iory Mar 16, 2024
645229e
Add
iory Mar 16, 2024
5e1370c
Add
iory Mar 16, 2024
2c11eb0
Add
iory Mar 16, 2024
0a95848
Add
iory Mar 16, 2024
b74af34
Add
iory Mar 16, 2024
14e2bd8
Add multimaster
iory Mar 16, 2024
2366124
Add
iory Mar 16, 2024
62b78f4
Add
iory Mar 16, 2024
d516df1
Add
iory Mar 17, 2024
8b0feec
Add
iory Mar 17, 2024
e4334ec
Add
iory Mar 17, 2024
821bf7b
Add
iory Mar 17, 2024
223b77e
Add
iory Mar 17, 2024
817ef03
Add
iory Mar 17, 2024
73d7b68
Add
iory Mar 17, 2024
3ea2304
Add
iory Mar 17, 2024
58cb4ce
Add
iory Mar 17, 2024
91bc1ae
Add
iory Mar 17, 2024
d20a293
Add
iory Mar 17, 2024
44ab711
Add
iory Mar 17, 2024
f8a6d49
Add
iory Mar 17, 2024
b843559
Add
iory Mar 17, 2024
1edd164
Add
iory Mar 17, 2024
908e080
Add
iory Mar 17, 2024
18b9185
Add
iory Mar 17, 2024
2db31f1
Add
iory Mar 17, 2024
5432ad8
Add
iory Mar 17, 2024
9d67907
Add
iory Mar 17, 2024
cec41b0
Add
iory Mar 17, 2024
893cc1b
Add
iory Mar 17, 2024
dd7a8c6
Add
iory Mar 17, 2024
f1f1e7a
Add
iory Mar 17, 2024
fef6ca1
Add
iory Mar 18, 2024
490b7b5
Add
iory Mar 18, 2024
20c0c7d
Add
iory Mar 18, 2024
c2d2c90
Add
iory Mar 18, 2024
22b5bae
Add
iory Mar 18, 2024
7fbf09d
Add
iory Mar 19, 2024
e0294ff
Add
iory Mar 19, 2024
4fbea64
Add
iory Mar 19, 2024
4cd24c3
Add
iory Mar 19, 2024
0c80e92
Add
iory May 16, 2024
9b66a4b
Add
iory May 16, 2024
c75320a
Add
iory May 16, 2024
549c8be
Add
iory May 16, 2024
3cbc585
Add
iory May 16, 2024
8a53c5c
Add
iory May 16, 2024
66db9ec
Add
iory May 16, 2024
9441a5c
Add model
iory May 16, 2024
0d5cee0
Respawn
iory May 16, 2024
c156aa3
Add
iory Oct 21, 2024
59fe7f0
Add
iory Oct 21, 2024
d5d509d
Add
iory Oct 21, 2024
e7efb7d
Fixed name
iory Oct 21, 2024
16f0cd9
Add
iory Oct 21, 2024
975d56d
Add
iory Oct 21, 2024
be26187
Add
iory Oct 21, 2024
b78e287
Add
iory Oct 21, 2024
9376470
Add
iory Oct 23, 2024
619d95f
Add
iory Oct 23, 2024
b9df9a3
Add
iory Oct 30, 2024
747cb87
Add
iory Oct 30, 2024
f9f5299
Add kxr teleop program
iory Oct 30, 2024
e2918d0
Add
iory Oct 30, 2024
738b7ac
Fixed hand pose vis
iory Nov 6, 2024
4b2c2f7
Delete eusmodel server
iory Nov 6, 2024
04b7b50
Add shebang
iory Nov 6, 2024
768e39b
Add
iory Nov 6, 2024
7322051
Add look-hand.l
iory Nov 6, 2024
ebfb638
Add sample robot progoram
iory Nov 6, 2024
25656d5
Add tag detection
iory Nov 13, 2024
96adeb2
Add samples
iory Nov 13, 2024
e82a432
Add
iory Nov 13, 2024
263c171
Add
iory Nov 13, 2024
7f76835
add codesigned robot demo
sawada10 Jan 29, 2025
17bb204
make codesign files package and merged launch files
sawada10 Jan 30, 2025
4b8a2d8
changed urdf path in launch file
sawada10 Jan 31, 2025
4d199dc
merged kashiwagi_interface.py and kuromitsu_interface.py into robot_i…
sawada10 Jan 31, 2025
46755b2
added python files for saving angle vector
sawada10 Jan 31, 2025
bb7656f
Create README.md
sawada10 Jan 31, 2025
06e30e5
add repos.yaml
sawada10 Jan 31, 2025
c328d71
add codesigned_module.launch
sawada10 Feb 4, 2025
638ac31
Update README.md
a-ichikura Feb 4, 2025
e984247
add joy.launch and the yaml file to use a joystick with both robots.
a-ichikura Feb 6, 2025
3d27cb6
Add how to launch with a joystick in README.md
a-ichikura Feb 6, 2025
60a2a7d
Merge pull request #1 from a-ichikura/add-codesigned-robot-demos
sawada10 Feb 12, 2025
d0cb255
add WIP demo for call_person_name
sawada10 Apr 19, 2025
e0f6fbd
change package.xml to move with radxa on kashiwagi
sawada10 Apr 21, 2025
4e6e9db
move json files to config dir
sawada10 Apr 22, 2025
8c5b647
add launch and yaml files for apriltag detection
sawada10 Apr 22, 2025
f1a7c67
add demo of calling person name from both face and apriltag
sawada10 Apr 22, 2025
a793ddd
rename package to jsk_2025_05_kashiwagi
sawada10 May 13, 2025
4091e24
add files for talking game (generate response + speak it)
sawada10 May 13, 2025
5b35102
Modified promped and max_tokens to make talk more natural
sawada10 May 16, 2025
dde5094
Add a line to remove line breaks
sawada10 May 16, 2025
5cfe9f8
add question_generator from barcode
sawada10 May 16, 2025
9f42d9c
changed python file mode
sawada10 May 16, 2025
0ad82bb
add launch file for talking game
sawada10 May 16, 2025
51a5461
Merge branch 'add-codesigned-robot-demos' into kashiwagi-call-person-…
sawada10 May 16, 2025
f249c48
add udev files for kashiwagi
sawada10 May 24, 2025
5dbe47a
edit launch file for kashiwagi modules for updated version of eye_dis…
sawada10 May 26, 2025
5b4e8be
[WIP] add kashiwagi_motion_eye_expressions module file
sawada10 Jun 5, 2025
ba20a04
[WIP] use QR code, play talking_game repeatedlly and express state wi…
sawada10 Jun 6, 2025
c421949
add function for looking at sound direction
sawada10 Jun 10, 2025
ff8de83
use look-at-direction function in talking game
sawada10 Jun 11, 2025
50168e0
update talking_game.launch
sawada10 Jun 11, 2025
bc589d5
updated for demo tommorrow
sawada10 Jun 12, 2025
04182b1
update
sawada10 Jun 12, 2025
79e16f8
add more QA in talking_game
sawada10 Jun 12, 2025
7ff6b17
add words which changes kashiwagi state
sawada10 Jul 25, 2025
96858f5
add response_generator with gpt and predefined answers
sawada10 Jul 25, 2025
872ae2e
move unneccesary files to old dir
sawada10 Jul 29, 2025
66c1db7
add alsa setting and move udev file to config
sawada10 Jul 29, 2025
42604b9
[WIP] add README
sawada10 Jul 29, 2025
8c298e0
add speaker device setting in voicevox_texttospeech.launch
sawada10 Jul 29, 2025
fa4d70d
add sleep and fixed bugs
sawada10 Jul 29, 2025
56bde36
Add
iory Jul 30, 2025
e9e848c
Add
iory Jul 30, 2025
a3a10fa
add test launch file
sawada10 Jul 30, 2025
4c17cf2
Add
iory Aug 30, 2025
7de0479
Add
iory Aug 30, 2025
d730466
Add
iory Aug 30, 2025
682cb94
Add
iory Aug 30, 2025
5a1c778
Add
iory Aug 30, 2025
1ff8c43
Add
iory Aug 30, 2025
ee205f7
Add
iory Aug 30, 2025
1232d92
Add
iory Aug 30, 2025
baa6bfe
Add
iory Sep 1, 2025
4d5cf3b
Add
iory Sep 1, 2025
9d4f6b0
Add
iory Sep 1, 2025
dcece0a
Add
iory Sep 1, 2025
9b3395b
update azure gpuVM ip address and speaker dev name
sawada10 Sep 10, 2025
15ddf17
change LED color and brightness
sawada10 Sep 30, 2025
515c079
publish led constantly regardless of whether or not kashiwagi status …
sawada10 Oct 1, 2025
934333d
Merge remote-tracking branch 'sawada/kashiwagi-call-person-name' into…
sawada10 Oct 1, 2025
f2b7f4e
publish LED status constantly
sawada10 Oct 6, 2025
04ce60a
Merge remote-tracking branch 'origin/kashiwagi-call-person-name' into…
sawada10 Oct 6, 2025
1300c55
moved unused file to old
sawada10 Oct 7, 2025
7eccb00
Merge remote-tracking branch 'sawada/kashiwagi-call-person-name' into…
sawada10 Oct 7, 2025
80bf5f7
fixed bug in message type
sawada10 Oct 7, 2025
f1aeefc
[WIP] adding kashiwagi greeting
sawada10 Oct 8, 2025
491d6db
Merge remote-tracking branch 'origin/kashiwagi-call-person-name' into…
sawada10 Oct 8, 2025
6beb3c5
add reactions
sawada10 Oct 11, 2025
a88fe30
[WIP] kashiwagi thinking response
sawada10 Oct 11, 2025
8453156
[WIP] adding kashiwagi thinking time
sawada10 Oct 11, 2025
397f7ab
update kashiwagi ume udev rule
sawada10 Oct 14, 2025
07e972c
adjusted for kashiwagi_dual.launch
sawada10 Oct 20, 2025
ab6539d
add kashiwagi thinking time
sawada10 Oct 20, 2025
f322832
adjusted kashiwagi module slightly
sawada10 Oct 20, 2025
34b0536
[wip] add reaction word and debug (need to be tested)
sawada10 Oct 22, 2025
e96833d
tidy up files
sawada10 Oct 23, 2025
ac226b5
update talking_game.launch so as not to listen to kashiwagi's own voice
sawada10 Oct 23, 2025
23e00b3
add reaction words
sawada10 Oct 23, 2025
dd7bc67
adjusted kashiwagi answer
sawada10 Oct 23, 2025
ae9d599
tidy up files
sawada10 Oct 23, 2025
647f9c6
changed voice and add reaction words
sawada10 Nov 6, 2025
43c6077
merge iory/semi2024 into kashiwagi
sawada10 Nov 11, 2025
07599fc
add kashiwagi singing mode
sawada10 Nov 11, 2025
8f86786
[WIP] kashiwagi approach to person
sawada10 Nov 11, 2025
5a26d5a
add kashiwagi rotate and move demo and set lower rate for callback fu…
sawada10 Nov 12, 2025
9847f67
[response speaker] send request with wav file
sawada10 Nov 12, 2025
0d8e14e
adjusted kashiwagi move demo
sawada10 Nov 13, 2025
4c42729
kashiwagi now can play katakanashi together with me
sawada10 Nov 13, 2025
7fef3f8
add new talking theme (2025.11.14)
sawada10 Nov 21, 2025
7cade52
fixed bugs (for 2025.11.21)
sawada10 Nov 21, 2025
8a6d3ba
add kashiwagi songs and voices
sawada10 Nov 29, 2025
aa2df57
changed gitignore
sawada10 Nov 29, 2025
ea33f85
add kashiwagi_state_logger
sawada10 Nov 29, 2025
e2c7403
add kashiwagi state logger into launch file
sawada10 Nov 29, 2025
58b65fe
add new kashiwagi state move:goal to make reaction when approaching p…
sawada10 Nov 29, 2025
d80526d
new motion function
sawada10 Nov 29, 2025
b320d5b
moved unused file into old folder
sawada10 Nov 29, 2025
71d0fa6
add kashiwagi voice when moving
sawada10 Nov 29, 2025
3023412
adjusted parameters in moving mode
sawada10 Nov 29, 2025
f1e288e
add reactions in moving mode and add songs and add word logger
sawada10 Nov 29, 2025
dbc9804
add new kashiwagi settings in response_generator
sawada10 Nov 29, 2025
ab73b6b
modifie gitignore
sawada10 Nov 29, 2025
2fd8ad5
edit some information
sawada10 Nov 29, 2025
a7edf0a
removed unused file
sawada10 Nov 29, 2025
11090fd
changed git management file for wav
sawada10 Nov 29, 2025
47b37d2
(changes before 12.05) add google_cloud_credidentials_json path
sawada10 Dec 9, 2025
d8e8b91
(changes before 12.05) add kashiwagi reaction words
sawada10 Dec 9, 2025
5288e28
(changes before 12.05) fixed bugs
sawada10 Dec 9, 2025
326dec5
(changes before 12.05) add launch file for test speech recognition only
sawada10 Dec 9, 2025
84d8522
add
sawada10 Jan 8, 2026
d1ac81d
add
sawada10 Jan 8, 2026
58e90fa
add shiritori function (before 2026-01-14)
sawada10 Jan 17, 2026
fd090db
modified prompt for talking_game response (shorter response and more …
sawada10 Jan 17, 2026
fd61e4e
[WIP] add speech_recognition_test.launch (for debug in speech recogni…
sawada10 Jan 17, 2026
78949f1
shiritori speed up (at 2026.01.21)
sawada10 Jan 30, 2026
77d84bb
add rection word 'ピッピ' (2026.01.21) and 'ヤッホー' (before 2026.02.04)
sawada10 Jan 30, 2026
c0f4a0b
robust for noise??? (before 2026.02.05)
sawada10 Jan 30, 2026
e212258
fix bug (so as not to speak and play thinking voice at the same time)…
sawada10 Jan 30, 2026
b100ceb
add kashiwagi yahho(before 2026.02.04)
sawada10 Jan 30, 2026
b7150c2
add kashiwagi time signal function
sawada10 Jan 30, 2026
0b79eeb
add kashiwagi free talk mode but wip and there is some bug
sawada10 Feb 4, 2026
faf2f13
add queue_size (does this actually reduce CPU use?)
sawada10 Feb 4, 2026
94fbe77
add shiritori bug (clear record file when node is initialized)
sawada10 Feb 4, 2026
f75fd25
edited kashiwagi time schedule
sawada10 Feb 4, 2026
66294fa
update launch and add shiritori as usual function
sawada10 Feb 4, 2026
a26d7e0
add kashiwagi time signal function to launch file
sawada10 Feb 20, 2026
2809c72
changed queue_size in shiritori (because sometimes spoken_word was sk…
sawada10 Feb 20, 2026
867ae23
add kashiwagi pippi for specific reaction word
sawada10 Feb 20, 2026
4065b99
chmod kashiwagi_free_talk.py
sawada10 Feb 20, 2026
33c0ca3
do not use absolute path
sawada10 Feb 21, 2026
949595a
do not use absolute pass in venv setting
sawada10 Feb 21, 2026
349508e
edit file_path for jetson
sawada10 Feb 25, 2026
cfa1244
add kashiwagi speech wav file
sawada10 Feb 25, 2026
ccf23c2
adjusted parameter for jetson
sawada10 Feb 25, 2026
da0a2e8
debug some shiritori bugs
sawada10 Feb 25, 2026
3d2e9b7
changed queue_size
sawada10 Feb 25, 2026
6ab09e2
comment out loginfo so as to make the logs readable
sawada10 Feb 25, 2026
dc375d0
add new self introduction wav file to gitignore
sawada10 Feb 25, 2026
bfba6a9
specify port for codesigned_robot.launch
sawada10 Mar 9, 2026
01afed0
add new reaction word and song, also add voice change interaction
sawada10 Mar 9, 2026
1de8fbd
change for jetson
sawada10 Mar 9, 2026
b06e9b7
add filtering speech function by sound_direction in free talk
sawada10 Mar 9, 2026
2f9e2b5
add rosbag_record.launch
sawada10 Mar 9, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,3 +7,5 @@ JSK demo programs
## [jsk_2013_04_pr2_610](https://github.com/jsk-ros-pkg/jsk_demos/tree/master/jsk_2013_04_pr2_610)

![bloom](https://gist.githubusercontent.com/k-okada/b3308c08ce31230e8947/raw/c14d6c52d8bf35fd5c244d989beccd35caa6fa8a/jsk_2013_04_pr2_irt_4.png =200x200)
=======
# Workspace for Semi2024 in JSK
206 changes: 206 additions & 0 deletions jsk_2023_12_codesign/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1,206 @@
cmake_minimum_required(VERSION 3.0.2)
project(jsk_2023_12_codesign)

## Compile as C++11, supported in ROS Kinetic and newer
# add_compile_options(-std=c++11)

## Find catkin macros and libraries
## if COMPONENTS list like find_package(catkin REQUIRED COMPONENTS xyz)
## is used, also find other catkin packages
find_package(catkin REQUIRED COMPONENTS
roscpp
rospy
std_msgs
)

## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system)


## Uncomment this if the package has a setup.py. This macro ensures
## modules and global scripts declared therein get installed
## See http://ros.org/doc/api/catkin/html/user_guide/setup_dot_py.html
# catkin_python_setup()

################################################
## Declare ROS messages, services and actions ##
################################################

## To declare and build messages, services or actions from within this
## package, follow these steps:
## * Let MSG_DEP_SET be the set of packages whose message types you use in
## your messages/services/actions (e.g. std_msgs, actionlib_msgs, ...).
## * In the file package.xml:
## * add a build_depend tag for "message_generation"
## * add a build_depend and a exec_depend tag for each package in MSG_DEP_SET
## * If MSG_DEP_SET isn't empty the following dependency has been pulled in
## but can be declared for certainty nonetheless:
## * add a exec_depend tag for "message_runtime"
## * In this file (CMakeLists.txt):
## * add "message_generation" and every package in MSG_DEP_SET to
## find_package(catkin REQUIRED COMPONENTS ...)
## * add "message_runtime" and every package in MSG_DEP_SET to
## catkin_package(CATKIN_DEPENDS ...)
## * uncomment the add_*_files sections below as needed
## and list every .msg/.srv/.action file to be processed
## * uncomment the generate_messages entry below
## * add every package in MSG_DEP_SET to generate_messages(DEPENDENCIES ...)

## Generate messages in the 'msg' folder
# add_message_files(
# FILES
# Message1.msg
# Message2.msg
# )

## Generate services in the 'srv' folder
# add_service_files(
# FILES
# Service1.srv
# Service2.srv
# )

## Generate actions in the 'action' folder
# add_action_files(
# FILES
# Action1.action
# Action2.action
# )

## Generate added messages and services with any dependencies listed here
# generate_messages(
# DEPENDENCIES
# std_msgs
# )

################################################
## Declare ROS dynamic reconfigure parameters ##
################################################

## To declare and build dynamic reconfigure parameters within this
## package, follow these steps:
## * In the file package.xml:
## * add a build_depend and a exec_depend tag for "dynamic_reconfigure"
## * In this file (CMakeLists.txt):
## * add "dynamic_reconfigure" to
## find_package(catkin REQUIRED COMPONENTS ...)
## * uncomment the "generate_dynamic_reconfigure_options" section below
## and list every .cfg file to be processed

## Generate dynamic reconfigure parameters in the 'cfg' folder
# generate_dynamic_reconfigure_options(
# cfg/DynReconf1.cfg
# cfg/DynReconf2.cfg
# )

###################################
## catkin specific configuration ##
###################################
## The catkin_package macro generates cmake config files for your package
## Declare things to be passed to dependent projects
## INCLUDE_DIRS: uncomment this if your package contains header files
## LIBRARIES: libraries you create in this project that dependent projects also need
## CATKIN_DEPENDS: catkin_packages dependent projects also need
## DEPENDS: system dependencies of this project that dependent projects also need
catkin_package(
# INCLUDE_DIRS include
# LIBRARIES kashiwagi_kuromitsu
# CATKIN_DEPENDS roscpp rospy std_msgs
# DEPENDS system_lib
)

###########
## Build ##
###########

## Specify additional locations of header files
## Your package locations should be listed before other locations
include_directories(
# include
${catkin_INCLUDE_DIRS}
)

## Declare a C++ library
# add_library(${PROJECT_NAME}
# src/${PROJECT_NAME}/kashiwagi_kuromitsu.cpp
# )

## Add cmake target dependencies of the library
## as an example, code may need to be generated before libraries
## either from message generation or dynamic reconfigure
# add_dependencies(${PROJECT_NAME} ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Declare a C++ executable
## With catkin_make all packages are built within a single CMake context
## The recommended prefix ensures that target names across packages don't collide
# add_executable(${PROJECT_NAME}_node src/kashiwagi_kuromitsu_node.cpp)

## Rename C++ executable without prefix
## The above recommended prefix causes long target names, the following renames the
## target back to the shorter version for ease of user use
## e.g. "rosrun someones_pkg node" instead of "rosrun someones_pkg someones_pkg_node"
# set_target_properties(${PROJECT_NAME}_node PROPERTIES OUTPUT_NAME node PREFIX "")

## Add cmake target dependencies of the executable
## same as for the library above
# add_dependencies(${PROJECT_NAME}_node ${${PROJECT_NAME}_EXPORTED_TARGETS} ${catkin_EXPORTED_TARGETS})

## Specify libraries to link a library or executable target against
# target_link_libraries(${PROJECT_NAME}_node
# ${catkin_LIBRARIES}
# )

#############
## Install ##
#############

# all install targets should use catkin DESTINATION variables
# See http://ros.org/doc/api/catkin/html/adv_user_guide/variables.html

## Mark executable scripts (Python etc.) for installation
## in contrast to setup.py, you can choose the destination
# catkin_install_python(PROGRAMS
# scripts/my_python_script
# DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark executables for installation
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_executables.html
# install(TARGETS ${PROJECT_NAME}_node
# RUNTIME DESTINATION ${CATKIN_PACKAGE_BIN_DESTINATION}
# )

## Mark libraries for installation
## See http://docs.ros.org/melodic/api/catkin/html/howto/format1/building_libraries.html
# install(TARGETS ${PROJECT_NAME}
# ARCHIVE DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# LIBRARY DESTINATION ${CATKIN_PACKAGE_LIB_DESTINATION}
# RUNTIME DESTINATION ${CATKIN_GLOBAL_BIN_DESTINATION}
# )

## Mark cpp header files for installation
# install(DIRECTORY include/${PROJECT_NAME}/
# DESTINATION ${CATKIN_PACKAGE_INCLUDE_DESTINATION}
# FILES_MATCHING PATTERN "*.h"
# PATTERN ".svn" EXCLUDE
# )

## Mark other files for installation (e.g. launch and bag files, etc.)
# install(FILES
# # myfile1
# # myfile2
# DESTINATION ${CATKIN_PACKAGE_SHARE_DESTINATION}
# )

#############
## Testing ##
#############

## Add gtest based cpp test target and link libraries
# catkin_add_gtest(${PROJECT_NAME}-test test/test_kashiwagi_kuromitsu.cpp)
# if(TARGET ${PROJECT_NAME}-test)
# target_link_libraries(${PROJECT_NAME}-test ${PROJECT_NAME})
# endif()

## Add folders to be run by python nosetests
# catkin_add_nosetests(test)
116 changes: 116 additions & 0 deletions jsk_2023_12_codesign/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,116 @@
# 柏木さんとくろみつ(2023年12月のcodesignにより作成)を動かす方法(2025年1月時点)
## 環境構築
```
repositories:
jsk_demos:
type: git
url: git@github.com:sawada10/jsk_demos.git
version: add-codesigned-robot-demos
modular_robot_model_zoo:
type: git
url: git@gitlab.jsk.imi.i.u-tokyo.ac.jp:sawada1/modular_robot_model_zoo.git
version: add-kashiwagi-kuromitsu-models
rcb4:
type: git
url: git@github.com:iory/rcb4.git
version: 930687bdba6f527b366b5cebb3c807ca2c9182e9
```
を repos.yamlとして`<ワークスペース>/src/repos.yaml` に保存する。
その後以下を実行。
```
cd src
source <ワークスペース>/devel/setup.bash
vcs import < repos.yaml
rosdep install -iry --from-paths .
cd ..
catkin build

```
## 任意動作の作成と保存方法
前提:ロボットの電源を入れる(柏木さん/くろみつの場合は7.40v)
### launchファイルを立ち上げる
```
source <ワークスペース>/devel/setup.bash
roslaunch jsk_2023_12_codesign codesigned_robot.launch robot_name:=kuromitsu
```
※launchするときにrobot_nameに動かしたいロボットの名前(kashiwagi/kuromitsu)を指定する。
※joyを使いたいときは、joyをlaunchファイルを立ち上げているPCにUSB接続したうえで、`joy`を`true`に設定する。
e.g.
```
roslaunch jsk_2023_12_codesign codesigned_robot.launch joy:=true
```

### 動作を保存する
```
$ roscd jsk_2023_12_codesign
$ cd scripts
$ ipython -i robot_interface.py
> from save_angle_vector import save_angle_vector_mode
> import os
> save_angle_vector_mode(ri,“path/to/<your file name>.json”) #ここで関節角度列を保存するjsonファイルのpathを指定
> you : save # saveと打つことで動作の記録を開始
> saving angles you: end # endと打つことで動作の記録を終了
> you : playing motions # 動きの自動再生
[ENTER] saving
please input motion name : "保存動作の名前" # jsonファイルの中にshake_headで保存される(ここで保存した名前をact()関数で使える)
```

### 動作を再生する
```
$ roscd jsk_2023_12_codesign
$ cd scripts
$ ipython
> from robotmodel import *
> act("保存動作の名前",“path/to/<your file name>.json”)
```

### サーボのON/OFF
```
$ roscd jsk_2023_12_codesign
$ cd scripts
$ ipython
> from robotmodel import *
> servo_on()
> servo_off()
```

## TODO(2025-01-31)
### 目・ほっぺ・梅の光らせ方
```
source <ワークスペース>/devel/setup.bash
roslaunch jsk_2023_12_codesign codesigned_module.launch
```
した上で、以下の表に示すトピックにpublishすることで変化する

| 箇所 | トピック | 型 | 機能 |
| ------------- | ------------- |---| --- |
| 目 | `/eye_status` |UInt16| 表情変化 |
| ほっぺ | `/cheek/led_blink_time` | UInt16 |点滅回数を指定|
||`/cheek/led_duration`| UInt16 | 点滅時間を秒数で指定|
||`/cheek/led_mode`| UInt16 | 光り方を1,2,3で指定 1:常時 2:点滅 3:虹色|
||`/cheek/led_rainbow_delta_hue`| UInt16 | 虹色の光り方を1-50で指定(数字が大きいほど隣同士が別の色)|
||`/cheek/led_rgb`| ColorRGBA |r:Red, g:Green, b:Blue, a:明るさ (rgbは0-255で指定, aは10くらいでOK) |
| 梅(柏木さんのみ) | `/ume/led_blink_time` |UInt16|点滅回数を指定 |
||`/ume/led_duration`| UInt16 | 点滅時間を秒数で指定|
||`/ume/led_mode`| UInt16 |光り方を1,2,3で指定 1:常時 2:点滅 3:虹色 |
||`/ume/led_rainbow_delta_hue`| UInt16 |虹色の光り方を1-50で指定(数字が大きいほど隣同士が別の色) |
||`/ume/led_rgb`| ColorRGBA |r:Red, g:Green, b:Blue, a:明るさ (rgbは0-255で指定, aは10くらいでOK)|

<表情の対応表>
| 番号 | くろみつ |柏木さん|
|---|---|---|
|0| 通常|通常|
|1| まばたき|まばたき|
|2| キラキラ|おどろき|
|3| 眠い |眠い|
|4| 真剣 |怒る|
|5| 悲しい|悲しい|
|6| 嬉しい |楽しい|
|7|悔しい1|困る|
|8| 悔しい2|嬉しい|
|9| 退屈|期待|
|10| ハート ||
|11| ぐるぐる ||
|12| キラキラ2||

### くろみつでの動作確認
17 changes: 17 additions & 0 deletions jsk_2023_12_codesign/config/dualshock3_teleop_twist_joy.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
axis_linear:
x: 1
y: 0
scale_linear:
x: 0.5
y: 0.3
scale_linear_turbo:
x: 1.2
y: 0.3
axis_angular:
yaw: 3
scale_angular:
yaw: 0.5
scale_angular_turbo:
yaw: 0.7
enable_button: 4
enable_turbo_button: 7
30 changes: 30 additions & 0 deletions jsk_2023_12_codesign/launch/codesigned_module.launch
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<launch>
<!-- Define the robot name argument -->
<arg name="robot_name" default="kashiwagi" />
<arg name="debug" default="false"/>

<!-- Launch serial_node for dual eyes -->
<include file="$(find eye_display)/launch/kashiwagi_dual.launch">
<arg name="port_right" value="/dev/ttyACM-righteye" />
<arg name="port_left" value="/dev/ttyACM-lefteye" />
<arg name="baud" value="57600" />
<arg name="debug" value="true" />
</include>

<!-- Launch serial_node for the ume if robot_name is "kashiwagi" -->
<group if="$(eval robot_name == 'kashiwagi')">
<node pkg="rosserial_python" name="led_ume" type="serial_node.py">
<param name="~port" value="/dev/ttyUSB-ume"/>
<param name="~baud" value="57600"/>
</node>
</group>

<group if="$(arg debug)">
<node
pkg="rosservice"
type="rosservice"
name="set_debug_mode"
args="call --wait /eye_display/set_logger_level rosout DEBUG"
/>
</group>
</launch>
Loading
Loading