chore: various code move to match architecture diagram

arcadien · Nov 1, 2023 · 9b2fbfc · 9b2fbfc
1 parent a9f1089
commit 9b2fbfc
Show file tree

Hide file tree

Showing 17 changed files with 217 additions and 212 deletions.
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -21,6 +21,7 @@ RUN apt-get update \
     python3-setuptools \
     srecord \
     udev \
+    socat \
     xz-utils \
     && apt-get autoremove -y \
     && apt-get clean -y \

diff --git a/lib/Gui/BTEGui.cpp → lib/Domain/BTEGui.cpp b/lib/Gui/BTEGui.cpp → lib/Domain/BTEGui.cpp
diff --git a/lib/Gui/BTEGui.hpp → lib/Domain/BTEGui.hpp b/lib/Gui/BTEGui.hpp → lib/Domain/BTEGui.hpp
@@ -19,9 +19,7 @@
 #include <ITargetGui.hpp>
 #include <stdint.h>
 
-#if defined(AVR)
-#include <Arduino.h>
-#else
+#if not defined(AVR)
 #include <ostream>
 #endif
 

diff --git a/lib/Game/Game.cpp → lib/Domain/Game.cpp b/lib/Game/Game.cpp → lib/Domain/Game.cpp
diff --git a/lib/Game/Game.hpp → lib/Domain/Game.hpp b/lib/Game/Game.hpp → lib/Domain/Game.hpp
diff --git a/lib/Gun/Gun.cpp → lib/Domain/Gun.cpp b/lib/Gun/Gun.cpp → lib/Domain/Gun.cpp
diff --git a/lib/Gun/Gun.hpp → lib/Domain/Gun.hpp b/lib/Gun/Gun.hpp → lib/Domain/Gun.hpp
diff --git a/lib/Gun/IGunHal.hpp → lib/Domain/IGunHal.hpp b/lib/Gun/IGunHal.hpp → lib/Domain/IGunHal.hpp
diff --git a/lib/Gui/ITargetGui.hpp → lib/Domain/ITargetGui.hpp b/lib/Gui/ITargetGui.hpp → lib/Domain/ITargetGui.hpp
diff --git a/lib/Player/Player.cpp → lib/Domain/Player.cpp b/lib/Player/Player.cpp → lib/Domain/Player.cpp
diff --git a/lib/Player/Player.hpp → lib/Domain/Player.hpp b/lib/Player/Player.hpp → lib/Domain/Player.hpp
diff --git a/lib/Gui/TestGui.hpp → lib/Native/TestGui.hpp b/lib/Gui/TestGui.hpp → lib/Native/TestGui.hpp
@@ -16,7 +16,7 @@
  */
 #pragma once
 #include <ITargetGui.hpp>
-#include <cstdint>
+#include <stdint.h>
 
 class TestGui : public ITargetGui {
 
@@ -28,7 +28,7 @@ class TestGui : public ITargetGui {
   void hitTarget(ITargetGui::TARGET target) override { targetState |= (1 << target); }
 
   bool isTargetHit(ITargetGui::TARGET target) override {
-    return (targetState & (1 << target) == (1 << target));
+    return ( (targetState & (1 << target)) == (1 << target));
   }
 
   void setCurrentPlayer(uint8_t playerId) override {}

diff --git a/platformio.ini b/platformio.ini
@@ -5,7 +5,7 @@ lib_compat_mode=off
 ; these libraries are for AVR and simulation
 ; targets only, so a reset of this property
 ; is needed in the `native` configuration
-lib_deps =
+lib_deps = 
 
 #upload_protocol=custom
 #upload_flags =
@@ -41,7 +41,7 @@ upload_command = avrdude -vv -pm328p -c avrisp -P/dev/ttyS0 $UPLOAD_FLAGS -U fla
   test_ignore = cross/*
   build_flags = -DNATIVE
   debug_test = noarch/test_gun
-  build_src_filter = ${env.src_filter} -<target.cpp> -<gun.cpp>
+  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
 
 [env:native_debug]
   lib_deps =  ${env.lib_deps}
@@ -51,21 +51,22 @@ upload_command = avrdude -vv -pm328p -c avrisp -P/dev/ttyS0 $UPLOAD_FLAGS -U fla
   debug_build_flags = -Og -ggdb3 -g3 -DNATIVE -UAVR
   test_ignore = cross/*
   debug_test = noarch/test_gun
-  build_src_filter = ${env.src_filter} -<target.cpp> -<gun.cpp>
+  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<GunApp.cpp>
 
 [env:cross]
   lib_deps =  ${env.lib_deps} 
   test_framework = unity
   platform = atmelavr
+  framework = arduino
   board = ATmega328P
   build_type = release
   test_ignore = native/*
   build_flags = -O0
-  build_src_filter = ${env.src_filter} -<consoleApp.cpp>
+  build_src_filter = ${env.src_filter} -<ConsoleTargets.cpp>
 
   [env:target]
   lib_deps =  
-    ${env.lib_deps} 
+    ${env.lib_deps}
     SerialCommands
   framework = arduino
   platform = atmelavr
@@ -74,12 +75,17 @@ upload_command = avrdude -vv -pm328p -c avrisp -P/dev/ttyS0 $UPLOAD_FLAGS -U fla
   board_build.f_cpu = 16000000L
   build_type = release
   build_flags = -DAVR
-  build_src_filter = ${env.src_filter} -<gun.cpp> -<consoleApp.cpp>
+  test_ignore =
+    native/*
+  build_src_filter = ${env.src_filter} -<GunApp.cpp> -<ConsoleTargets.cpp>
 
   [env:gun]
   lib_deps =
   platform = atmelavr
   board = attiny84
   build_type = release
   build_flags = -DAVR
-  build_src_filter = ${env.src_filter} -<target.cpp> -<consoleApp.cpp>
+  test_ignore = 
+    native/*
+    noarch/*
+  build_src_filter = ${env.src_filter} -<TargetApp.cpp> -<ConsoleTargets.cpp>
diff --git a/src/consoleApp.cpp → src/ConsoleTargets.cpp b/src/consoleApp.cpp → src/ConsoleTargets.cpp
diff --git a/src/gun.cpp → src/GunApp.cpp b/src/gun.cpp → src/GunApp.cpp
@@ -1,23 +1,23 @@
-/*
- *
- * Copyright (c) 2023 Aurelien Labrosse
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, version 3.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see <http://www.gnu.org/licenses/>.
- */
-
-int main(void)
-{
-  while (1)
-  {
-  }
-}
+/*
+ *
+ * Copyright (c) 2023 Aurelien Labrosse
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, version 3.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+int main(void)
+{
+  while (1)
+  {
+  }
+}