Merge pull request #506 from ut-issl/feature/fix-c2a-command-sender

Fix C2A Command sender
ut-issl · Oct 7, 2023 · 249e701 · 249e701
2 parents 0b29557 + cd3e497
commit 249e701
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/data/sample/initialize_files/components/wings_command_sender_to_c2a/example.ops b/data/sample/initialize_files/components/wings_command_sender_to_c2a/example.ops
@@ -2,11 +2,11 @@
 .#
 .# コメントは読み飛ばされる
 .# 
-.MOBC_RT.Cmd_NOP
+.MOBC_RT.NOP
  wait_sec 5
- MOBC_RT.Cmd_MM_START_TRANSITION 2
+ MOBC_RT.MM_START_TRANSITION 2
  wait_sec 3
  check_value  # check_valueは今は使えず読み飛ばされる
  let mode_id = 2 # letはいまはつかえない
- AOBC_RT.Cmd_MM_START_TRANSITION {mode_id} # letを前提とした{}付きの引数があるとコマンドは送信されない
+ AOBC_RT.MM_START_TRANSITION {mode_id} # letを前提とした{}付きの引数があるとコマンドは送信されない
 .# 
diff --git a/src/library/initialize/c2a_command_database.cpp b/src/library/initialize/c2a_command_database.cpp
@@ -13,6 +13,7 @@
 
 C2aCommandInformation::C2aCommandInformation(const std::string cmd_db_line) {
   if (cmd_db_line.find("*") == 0) return;
+  if (cmd_db_line.find(",") != 0) return;
 
   // CSV
   std::string token;
@@ -24,6 +25,7 @@ C2aCommandInformation::C2aCommandInformation(const std::string cmd_db_line) {
 
   // Command name
   command_name_ = tokens[1];
+  if (command_name_.empty()) return;
 
   // Command ID
   command_id_ = std::stoul(tokens[3], nullptr, 0);