From cd4434145ed0cbc65310f4de6d3029e661e563c6 Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Fri, 17 Mar 2023 23:06:43 +0700 Subject: [PATCH 1/6] fix: fix action name and add wide kick action --- include/akushon/action/model/action_name.hpp | 46 +++++++++--------- src/akushon/action/model/action_name.cpp | 49 ++++++++++---------- 2 files changed, 49 insertions(+), 46 deletions(-) diff --git a/include/akushon/action/model/action_name.hpp b/include/akushon/action/model/action_name.hpp index 040fd74..b9feb17 100644 --- a/include/akushon/action/model/action_name.hpp +++ b/include/akushon/action/model/action_name.hpp @@ -27,28 +27,30 @@ namespace akushon { -class ActionName -{ -public: - static const char * INIT; - static const char * WALKREADY; - static const char * SIT_DOWN; - static const char * FORWARD_UP; - static const char * BACKWARD_UP; - static const char * LEFTWARD_UP; - static const char * RIGHTWARD_UP; - static const char * RIGHT_KICK; - static const char * LEFT_KICK; - static const char * RIGHT_KICK_SHORT; - static const char * LEGT_KICK_SHORT; - static const char * LEFT_SIDEKICK; - static const char * RIGHT_SIDEKICK; - static const char * KEEPER_SIT; - static const char * KEEPER_UP; + class ActionName + { + public: + static const char *INIT; + static const char *WALKREADY; + static const char *SIT_DOWN; + static const char *FORWARD_UP; + static const char *BACKWARD_UP; + static const char *LEFTWARD_UP; + static const char *RIGHTWARD_UP; + static const char *RIGHT_KICK; + static const char *LEFT_KICK; + static const char *RIGHT_KICK_SHORT; + static const char *LEFT_KICK_SHORT; + static const char *RIGHT_KICK_WIDE; + static const char *LEFT_KICK_WIDE; + static const char *LEFT_SIDEKICK; + static const char *RIGHT_SIDEKICK; + static const char *KEEPER_SIT; + static const char *KEEPER_UP; - static const std::map map; -}; + static const std::map map; + }; -} // namespace akushon +} // namespace akushon -#endif // AKUSHON__ACTION__MODEL__ACTION_NAME_HPP_ +#endif // AKUSHON__ACTION__MODEL__ACTION_NAME_HPP_ diff --git a/src/akushon/action/model/action_name.cpp b/src/akushon/action/model/action_name.cpp index 4c169a3..fafe24f 100644 --- a/src/akushon/action/model/action_name.cpp +++ b/src/akushon/action/model/action_name.cpp @@ -27,29 +27,30 @@ namespace akushon { -const std::map ActionName::map = { - {"init", 0}, - {"walk_ready", 1}, - {"sit_down", 2}, - {"forward_up", 3}, - {"backward_up", 4}, - {"leftward_up", 5} -}; + const std::map ActionName::map = { + {"init", 0}, + {"walk_ready", 1}, + {"sit_down", 2}, + {"forward_up", 3}, + {"backward_up", 4}, + {"leftward_up", 5}}; -const char * ActionName::INIT = "init"; -const char * ActionName::WALKREADY = "walk_ready"; -const char * ActionName::SIT_DOWN = "sit_down"; -const char * ActionName::FORWARD_UP = "forward_up"; -const char * ActionName::BACKWARD_UP = "backward_up"; -const char * ActionName::LEFTWARD_UP = "leftward_ups"; -const char * ActionName::RIGHTWARD_UP = "rightward_up"; -const char * ActionName::RIGHT_KICK = "right_kick"; -const char * ActionName::LEFT_KICK = "left_kick"; -const char * ActionName::RIGHT_KICK_SHORT = "right_kick_short"; -const char * ActionName::LEGT_KICK_SHORT = "left_kick_short"; -const char * ActionName::LEFT_SIDEKICK = "left_sidekick"; -const char * ActionName::RIGHT_SIDEKICK = "right_sidekick"; -const char * ActionName::KEEPER_SIT = "keeper_sit"; -const char * ActionName::KEEPER_UP = "keeper_up"; + const char *ActionName::INIT = "init"; + const char *ActionName::WALKREADY = "walk_ready"; + const char *ActionName::SIT_DOWN = "sit_down"; + const char *ActionName::FORWARD_UP = "forward_up"; + const char *ActionName::BACKWARD_UP = "backward_up"; + const char *ActionName::LEFTWARD_UP = "leftward_ups"; + const char *ActionName::RIGHTWARD_UP = "rightward_up"; + const char *ActionName::RIGHT_KICK = "right_kick"; + const char *ActionName::LEFT_KICK = "left_kick"; + const char *ActionName::RIGHT_KICK_SHORT = "right_kick_short"; + const char *ActionName::LEFT_KICK_SHORT = "left_kick_short"; + const char *ActionName::RIGHT_KICK_WIDE = "right_kick_wide"; + const char *ActionName::LEFT_KICK_WIDE = "left_kick_wide"; + const char *ActionName::LEFT_SIDEKICK = "left_sidekick"; + const char *ActionName::RIGHT_SIDEKICK = "right_sidekick"; + const char *ActionName::KEEPER_SIT = "keeper_sit"; + const char *ActionName::KEEPER_UP = "keeper_up"; -} // namespace akushon +} // namespace akushon From 83ae9c72d42c2bafaa7a243e1b64fa7711f49331 Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Sat, 18 Mar 2023 19:26:32 +0700 Subject: [PATCH 2/6] chore: fix ubuntu workflow --- .github/workflows/build-and-test-nightly.yml | 2 +- .github/workflows/build-and-test-stable.yml | 2 +- .github/workflows/build-debian-nightly.yml | 2 +- .github/workflows/build-debian-stable.yml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/build-and-test-nightly.yml b/.github/workflows/build-and-test-nightly.yml index c07963d..ccfc193 100644 --- a/.github/workflows/build-and-test-nightly.yml +++ b/.github/workflows/build-and-test-nightly.yml @@ -7,7 +7,7 @@ on: branches: [master] jobs: build-and-test-nightly: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout this repository uses: actions/checkout@v2.3.4 diff --git a/.github/workflows/build-and-test-stable.yml b/.github/workflows/build-and-test-stable.yml index 1bcc021..9707980 100644 --- a/.github/workflows/build-and-test-stable.yml +++ b/.github/workflows/build-and-test-stable.yml @@ -5,7 +5,7 @@ on: branches: [master] jobs: build-and-test-stable: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout this repository uses: actions/checkout@v2.3.4 diff --git a/.github/workflows/build-debian-nightly.yml b/.github/workflows/build-debian-nightly.yml index d96c487..a6e67b1 100644 --- a/.github/workflows/build-debian-nightly.yml +++ b/.github/workflows/build-debian-nightly.yml @@ -5,7 +5,7 @@ on: branches: [master] jobs: deploy-debian-nightly: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout this repository uses: actions/checkout@v2.3.4 diff --git a/.github/workflows/build-debian-stable.yml b/.github/workflows/build-debian-stable.yml index 91030d9..759c49b 100644 --- a/.github/workflows/build-debian-stable.yml +++ b/.github/workflows/build-debian-stable.yml @@ -5,7 +5,7 @@ on: types: [created] jobs: deploy-debian-stable: - runs-on: ubuntu-latest + runs-on: ubuntu-20.04 steps: - name: Checkout this repository uses: actions/checkout@v2.3.4 From e7d6b9d59ac1cdbae574d84d6e212ccf54aba088 Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Sat, 18 Mar 2023 19:42:45 +0700 Subject: [PATCH 3/6] style: fix linter --- include/akushon/action/model/action_name.hpp | 50 +++++++++---------- src/akushon/action/model/action_name.cpp | 51 ++++++++++---------- 2 files changed, 51 insertions(+), 50 deletions(-) diff --git a/include/akushon/action/model/action_name.hpp b/include/akushon/action/model/action_name.hpp index b9feb17..0419c06 100644 --- a/include/akushon/action/model/action_name.hpp +++ b/include/akushon/action/model/action_name.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2021 Ichiro ITS +// Copyright (c) 2023 Ichiro ITS // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal @@ -27,30 +27,30 @@ namespace akushon { - class ActionName - { - public: - static const char *INIT; - static const char *WALKREADY; - static const char *SIT_DOWN; - static const char *FORWARD_UP; - static const char *BACKWARD_UP; - static const char *LEFTWARD_UP; - static const char *RIGHTWARD_UP; - static const char *RIGHT_KICK; - static const char *LEFT_KICK; - static const char *RIGHT_KICK_SHORT; - static const char *LEFT_KICK_SHORT; - static const char *RIGHT_KICK_WIDE; - static const char *LEFT_KICK_WIDE; - static const char *LEFT_SIDEKICK; - static const char *RIGHT_SIDEKICK; - static const char *KEEPER_SIT; - static const char *KEEPER_UP; +class ActionName +{ +public: + static const char * INIT; + static const char * WALKREADY; + static const char * SIT_DOWN; + static const char * FORWARD_UP; + static const char * BACKWARD_UP; + static const char * LEFTWARD_UP; + static const char * RIGHTWARD_UP; + static const char * RIGHT_KICK; + static const char * LEFT_KICK; + static const char * RIGHT_KICK_SHORT; + static const char * LEGT_KICK_SHORT; + static const char *RIGHT_KICK_WIDE; + static const char *LEFT_KICK_WIDE; + static const char * LEFT_SIDEKICK; + static const char * RIGHT_SIDEKICK; + static const char * KEEPER_SIT; + static const char * KEEPER_UP; - static const std::map map; - }; + static const std::map map; +}; -} // namespace akushon +} // namespace akushon -#endif // AKUSHON__ACTION__MODEL__ACTION_NAME_HPP_ +#endif // AKUSHON__ACTION__MODEL__ACTION_NAME_HPP_ diff --git a/src/akushon/action/model/action_name.cpp b/src/akushon/action/model/action_name.cpp index fafe24f..ea2d3a9 100644 --- a/src/akushon/action/model/action_name.cpp +++ b/src/akushon/action/model/action_name.cpp @@ -27,30 +27,31 @@ namespace akushon { - const std::map ActionName::map = { - {"init", 0}, - {"walk_ready", 1}, - {"sit_down", 2}, - {"forward_up", 3}, - {"backward_up", 4}, - {"leftward_up", 5}}; +const std::map ActionName::map = { + {"init", 0}, + {"walk_ready", 1}, + {"sit_down", 2}, + {"forward_up", 3}, + {"backward_up", 4}, + {"leftward_up", 5} +}; - const char *ActionName::INIT = "init"; - const char *ActionName::WALKREADY = "walk_ready"; - const char *ActionName::SIT_DOWN = "sit_down"; - const char *ActionName::FORWARD_UP = "forward_up"; - const char *ActionName::BACKWARD_UP = "backward_up"; - const char *ActionName::LEFTWARD_UP = "leftward_ups"; - const char *ActionName::RIGHTWARD_UP = "rightward_up"; - const char *ActionName::RIGHT_KICK = "right_kick"; - const char *ActionName::LEFT_KICK = "left_kick"; - const char *ActionName::RIGHT_KICK_SHORT = "right_kick_short"; - const char *ActionName::LEFT_KICK_SHORT = "left_kick_short"; - const char *ActionName::RIGHT_KICK_WIDE = "right_kick_wide"; - const char *ActionName::LEFT_KICK_WIDE = "left_kick_wide"; - const char *ActionName::LEFT_SIDEKICK = "left_sidekick"; - const char *ActionName::RIGHT_SIDEKICK = "right_sidekick"; - const char *ActionName::KEEPER_SIT = "keeper_sit"; - const char *ActionName::KEEPER_UP = "keeper_up"; +const char * ActionName::INIT = "init"; +const char * ActionName::WALKREADY = "walk_ready"; +const char * ActionName::SIT_DOWN = "sit_down"; +const char * ActionName::FORWARD_UP = "forward_up"; +const char * ActionName::BACKWARD_UP = "backward_up"; +const char * ActionName::LEFTWARD_UP = "leftward_ups"; +const char * ActionName::RIGHTWARD_UP = "rightward_up"; +const char * ActionName::RIGHT_KICK = "right_kick"; +const char * ActionName::LEFT_KICK = "left_kick"; +const char * ActionName::RIGHT_KICK_SHORT = "right_kick_short"; +const char * ActionName::LEGT_KICK_SHORT = "left_kick_short"; +const char * ActionName::RIGHT_KICK_WIDE = "right_kick_wide"; +const char * ActionName::LEGT_KICK_WIDE = "left_kick_wide"; +const char * ActionName::LEFT_SIDEKICK = "left_sidekick"; +const char * ActionName::RIGHT_SIDEKICK = "right_sidekick"; +const char * ActionName::KEEPER_SIT = "keeper_sit"; +const char * ActionName::KEEPER_UP = "keeper_up"; -} // namespace akushon +} // namespace akushon From dcdd86cd269656113d4f97e11aad1a5331fc1026 Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Sat, 18 Mar 2023 19:46:29 +0700 Subject: [PATCH 4/6] fix: fix typo --- include/akushon/action/model/action_name.hpp | 2 +- src/akushon/action/model/action_name.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/akushon/action/model/action_name.hpp b/include/akushon/action/model/action_name.hpp index 0419c06..2dfeeba 100644 --- a/include/akushon/action/model/action_name.hpp +++ b/include/akushon/action/model/action_name.hpp @@ -40,7 +40,7 @@ class ActionName static const char * RIGHT_KICK; static const char * LEFT_KICK; static const char * RIGHT_KICK_SHORT; - static const char * LEGT_KICK_SHORT; + static const char * LEFT_KICK_SHORT; static const char *RIGHT_KICK_WIDE; static const char *LEFT_KICK_WIDE; static const char * LEFT_SIDEKICK; diff --git a/src/akushon/action/model/action_name.cpp b/src/akushon/action/model/action_name.cpp index ea2d3a9..4661d79 100644 --- a/src/akushon/action/model/action_name.cpp +++ b/src/akushon/action/model/action_name.cpp @@ -46,9 +46,9 @@ const char * ActionName::RIGHTWARD_UP = "rightward_up"; const char * ActionName::RIGHT_KICK = "right_kick"; const char * ActionName::LEFT_KICK = "left_kick"; const char * ActionName::RIGHT_KICK_SHORT = "right_kick_short"; -const char * ActionName::LEGT_KICK_SHORT = "left_kick_short"; +const char * ActionName::LEFT_KICK_SHORT = "left_kick_short"; const char * ActionName::RIGHT_KICK_WIDE = "right_kick_wide"; -const char * ActionName::LEGT_KICK_WIDE = "left_kick_wide"; +const char * ActionName::LEFT_KICK_WIDE = "left_kick_wide"; const char * ActionName::LEFT_SIDEKICK = "left_sidekick"; const char * ActionName::RIGHT_SIDEKICK = "right_sidekick"; const char * ActionName::KEEPER_SIT = "keeper_sit"; From 25a4e07d77cd62ef9d486948b36916a9c0b67d3b Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Sat, 18 Mar 2023 19:51:53 +0700 Subject: [PATCH 5/6] style: fix style --- include/akushon/action/model/action_name.hpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/akushon/action/model/action_name.hpp b/include/akushon/action/model/action_name.hpp index 2dfeeba..370cb0c 100644 --- a/include/akushon/action/model/action_name.hpp +++ b/include/akushon/action/model/action_name.hpp @@ -41,8 +41,8 @@ class ActionName static const char * LEFT_KICK; static const char * RIGHT_KICK_SHORT; static const char * LEFT_KICK_SHORT; - static const char *RIGHT_KICK_WIDE; - static const char *LEFT_KICK_WIDE; + static const char * RIGHT_KICK_WIDE; + static const char * LEFT_KICK_WIDE; static const char * LEFT_SIDEKICK; static const char * RIGHT_SIDEKICK; static const char * KEEPER_SIT; From 4a37ea9f0632a36a1631f88c36b6f69783c0d0e0 Mon Sep 17 00:00:00 2001 From: JayantiTA Date: Mon, 20 Mar 2023 20:06:11 +0700 Subject: [PATCH 6/6] chore: revert copyright --- include/akushon/action/model/action_name.hpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/akushon/action/model/action_name.hpp b/include/akushon/action/model/action_name.hpp index 370cb0c..ac04d30 100644 --- a/include/akushon/action/model/action_name.hpp +++ b/include/akushon/action/model/action_name.hpp @@ -1,4 +1,4 @@ -// Copyright (c) 2023 Ichiro ITS +// Copyright (c) 2021 Ichiro ITS // // Permission is hereby granted, free of charge, to any person obtaining a copy // of this software and associated documentation files (the "Software"), to deal