refactor: place variants in firmware dir (#141)

senseshift · Aug 12, 2024 · 7a3ca68 · 7a3ca68
1 parent e99d09c
commit 7a3ca68
Show file tree

Hide file tree

Showing 24 changed files with 85 additions and 85 deletions.
diff --git a/variants/bhaptics/bhaptics.ini → firmware/variants/bhaptics/bhaptics.ini b/variants/bhaptics/bhaptics.ini → firmware/variants/bhaptics/bhaptics.ini
diff --git a/variants/bhaptics/tactal/tactal.cpp → firmware/variants/bhaptics/tactal/tactal.cpp b/variants/bhaptics/tactal/tactal.cpp → firmware/variants/bhaptics/tactal/tactal.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactal/tactal.ini → firmware/variants/bhaptics/tactal/tactal.ini b/variants/bhaptics/tactal/tactal.ini → firmware/variants/bhaptics/tactal/tactal.ini
@@ -9,4 +9,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactal>
+    +<variants/bhaptics/tactal>
diff --git a/variants/bhaptics/tactglove/tactglove.cpp → ...variants/bhaptics/tactglove/tactglove.cpp b/variants/bhaptics/tactglove/tactglove.cpp → ...variants/bhaptics/tactglove/tactglove.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactglove/tactglove.ini → ...variants/bhaptics/tactglove/tactglove.ini b/variants/bhaptics/tactglove/tactglove.ini → ...variants/bhaptics/tactglove/tactglove.ini
@@ -10,7 +10,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactal>
+    +<variants/bhaptics/tactal>
 
 [env:bhaptics_tactglove_right]
 extends = base:bhaptics
@@ -24,4 +24,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactglove>
+    +<variants/bhaptics/tactglove>
diff --git a/variants/bhaptics/tactosy2/tactosy2.cpp → ...e/variants/bhaptics/tactosy2/tactosy2.cpp b/variants/bhaptics/tactosy2/tactosy2.cpp → ...e/variants/bhaptics/tactosy2/tactosy2.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactosy2/tactosy2.ini → ...e/variants/bhaptics/tactosy2/tactosy2.ini b/variants/bhaptics/tactosy2/tactosy2.ini → ...e/variants/bhaptics/tactosy2/tactosy2.ini
@@ -9,7 +9,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosy2>
+    +<variants/bhaptics/tactosy2>
 
 [env:bhaptics_tactosy2_forearm_right]
 extends = base:bhaptics
@@ -22,4 +22,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosy2>
+    +<variants/bhaptics/tactosy2>
diff --git a/variants/bhaptics/tactosyf/tactosyf.cpp → ...e/variants/bhaptics/tactosyf/tactosyf.cpp b/variants/bhaptics/tactosyf/tactosyf.cpp → ...e/variants/bhaptics/tactosyf/tactosyf.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactosyf/tactosyf.ini → ...e/variants/bhaptics/tactosyf/tactosyf.ini b/variants/bhaptics/tactosyf/tactosyf.ini → ...e/variants/bhaptics/tactosyf/tactosyf.ini
@@ -9,7 +9,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosyf>
+    +<variants/bhaptics/tactosyf>
 
 [env:bhaptics_tactosyf_foot_right]
 extends = base:bhaptics
@@ -22,4 +22,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosyf>
+    +<variants/bhaptics/tactosyf>
diff --git a/variants/bhaptics/tactosyh/tactosyh.cpp → ...e/variants/bhaptics/tactosyh/tactosyh.cpp b/variants/bhaptics/tactosyh/tactosyh.cpp → ...e/variants/bhaptics/tactosyh/tactosyh.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactosyh/tactosyh.ini → ...e/variants/bhaptics/tactosyh/tactosyh.ini b/variants/bhaptics/tactosyh/tactosyh.ini → ...e/variants/bhaptics/tactosyh/tactosyh.ini
@@ -9,7 +9,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosyh>
+    +<variants/bhaptics/tactosyh>
 
 [env:bhaptics_tactosyh_hand_right]
 extends = base:bhaptics
@@ -22,4 +22,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactosyh>
+    +<variants/bhaptics/tactosyh>
diff --git a/...ts/bhaptics/tactsuit_x16/tactsuit_x16.cpp → ...ts/bhaptics/tactsuit_x16/tactsuit_x16.cpp b/...ts/bhaptics/tactsuit_x16/tactsuit_x16.cpp → ...ts/bhaptics/tactsuit_x16/tactsuit_x16.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/...ts/bhaptics/tactsuit_x16/tactsuit_x16.ini → ...ts/bhaptics/tactsuit_x16/tactsuit_x16.ini b/...ts/bhaptics/tactsuit_x16/tactsuit_x16.ini → ...ts/bhaptics/tactsuit_x16/tactsuit_x16.ini
@@ -9,4 +9,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactsuit_x16>
+    +<variants/bhaptics/tactsuit_x16>
diff --git a/...suit_x16_pca9685/tactsuit_x16_pca9685.cpp → ...suit_x16_pca9685/tactsuit_x16_pca9685.cpp b/...suit_x16_pca9685/tactsuit_x16_pca9685.cpp → ...suit_x16_pca9685/tactsuit_x16_pca9685.cpp
@@ -9,13 +9,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
-#include <senseshift/output/i2cdevlib_pwm.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
+#include "senseshift/output/i2cdevlib_pwm.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/...suit_x16_pca9685/tactsuit_x16_pca9685.ini → ...suit_x16_pca9685/tactsuit_x16_pca9685.ini b/...suit_x16_pca9685/tactsuit_x16_pca9685.ini → ...suit_x16_pca9685/tactsuit_x16_pca9685.ini
@@ -9,4 +9,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactsuit_x16_pca9685>
+    +<variants/bhaptics/tactsuit_x16_pca9685>
diff --git a/...ts/bhaptics/tactsuit_x40/tactsuit_x40.cpp → ...ts/bhaptics/tactsuit_x40/tactsuit_x40.cpp b/...ts/bhaptics/tactsuit_x40/tactsuit_x40.cpp → ...ts/bhaptics/tactsuit_x40/tactsuit_x40.cpp
@@ -9,14 +9,14 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
-#include <senseshift/output/i2cdevlib_pwm.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
+#include "senseshift/output/i2cdevlib_pwm.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/...ts/bhaptics/tactsuit_x40/tactsuit_x40.ini → ...ts/bhaptics/tactsuit_x40/tactsuit_x40.ini b/...ts/bhaptics/tactsuit_x40/tactsuit_x40.ini → ...ts/bhaptics/tactsuit_x40/tactsuit_x40.ini
@@ -9,4 +9,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactsuit_x40>
+    +<variants/bhaptics/tactsuit_x40>
diff --git a/variants/bhaptics/tactvisor/tactvisor.cpp → ...variants/bhaptics/tactvisor/tactvisor.cpp b/variants/bhaptics/tactvisor/tactvisor.cpp → ...variants/bhaptics/tactvisor/tactvisor.cpp
@@ -6,13 +6,13 @@
 
 #include "senseshift.h"
 
-#include <senseshift/arduino/input/sensor/analog.hpp>
-#include <senseshift/arduino/output/ledc.hpp>
-#include <senseshift/battery/input/battery_sensor.hpp>
-#include <senseshift/bh/ble/connection.hpp>
-#include <senseshift/bh/devices.hpp>
-#include <senseshift/bh/encoding.hpp>
-#include <senseshift/freertos/task.hpp>
+#include "senseshift/arduino/input/sensor/analog.hpp"
+#include "senseshift/arduino/output/ledc.hpp"
+#include "senseshift/battery/input/battery_sensor.hpp"
+#include "senseshift/bh/ble/connection.hpp"
+#include "senseshift/bh/devices.hpp"
+#include "senseshift/bh/encoding.hpp"
+#include "senseshift/freertos/task.hpp"
 
 using namespace SenseShift;
 using namespace SenseShift::Input;

diff --git a/variants/bhaptics/tactvisor/tactvisor.ini → ...variants/bhaptics/tactvisor/tactvisor.ini b/variants/bhaptics/tactvisor/tactvisor.ini → ...variants/bhaptics/tactvisor/tactvisor.ini
@@ -9,4 +9,4 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/bhaptics/tactvisor>
+    +<variants/bhaptics/tactvisor>
diff --git a/variants/opengloves/indexer.ini → firmware/variants/opengloves/indexer.ini b/variants/opengloves/indexer.ini → firmware/variants/opengloves/indexer.ini
@@ -20,7 +20,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/opengloves>
+    +<variants/opengloves>
 
 lib_deps =
     ${env.lib_deps}

diff --git a/variants/opengloves/lucidgloves.ini → firmware/variants/opengloves/lucidgloves.ini b/variants/opengloves/lucidgloves.ini → firmware/variants/opengloves/lucidgloves.ini
@@ -23,7 +23,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<../variants/opengloves>
+    +<variants/opengloves>
 
 lib_deps =
     ${env.lib_deps}

diff --git a/variants/opengloves/opengloves.cpp → firmware/variants/opengloves/opengloves.cpp b/variants/opengloves/opengloves.cpp → firmware/variants/opengloves/opengloves.cpp
@@ -1,6 +1,6 @@
-#include <senseshift/freertos/task.hpp>
-#include <senseshift/opengloves/autoconfig.hpp>
-#include <senseshift/opengloves/opengloves_component.hpp>
+#include "senseshift/freertos/task.hpp"
+#include "senseshift/opengloves/autoconfig.hpp"
+#include "senseshift/opengloves/opengloves_component.hpp"
 
 #include "opengloves/alpha.hpp"
 

diff --git a/variants/opengloves/opengloves.ini → firmware/variants/opengloves/opengloves.ini b/variants/opengloves/opengloves.ini → firmware/variants/opengloves/opengloves.ini
diff --git a/platformio.ini b/platformio.ini
@@ -17,7 +17,7 @@ lib_dir = ./lib
 src_dir = ./firmware
 
 extra_configs =
-    variants/**/*.ini
+    firmware/variants/**/*.ini
     arch/**/*.ini
 
 [env]
@@ -38,7 +38,7 @@ build_flags =
 
 build_src_filter =
     +<*>
-    -<mode_configs>
+    -<variants>
 
 lib_ldf_mode = deep+
 lib_deps =
@@ -74,7 +74,7 @@ build_flags =
 
 build_src_filter =
     ${env.build_src_filter}
-    +<mode_configs/test.cpp>
+    +<variants/test.cpp>
 
 lib_deps =
     ${env.lib_deps}