Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

refactor: place variants in firmware dir #141

Merged
merged 1 commit into from
Aug 12, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactal>
+<variants/bhaptics/tactal>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -24,4 +24,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactglove>
+<variants/bhaptics/tactglove>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -39,7 +39,7 @@
// clang-format on
});

app->getVibroBody()->addTarget(Target::Accessory, new FloatPlane(forearmOutputs));

Check warning on line 42 in firmware/variants/bhaptics/tactosy2/tactosy2.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosy2_forearm_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 42 in firmware/variants/bhaptics/tactosy2/tactosy2.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosy2_forearm_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

app->getVibroBody()->setup();

Expand All @@ -50,7 +50,7 @@
.serialNumber = BH_SERIAL_NUMBER,
},
[](std::string& value) -> void {
Decoder::applyPlain(app->getVibroBody(), value, bhLayout, Effect::Vibro, Target::Accessory);

Check warning on line 53 in firmware/variants/bhaptics/tactosy2/tactosy2.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosy2_forearm_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 53 in firmware/variants/bhaptics/tactosy2/tactosy2.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosy2_forearm_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]
},
app
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,4 +22,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactosy2>
+<variants/bhaptics/tactosy2>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -40,7 +40,7 @@
// clang-format on
});

app->getVibroBody()->addTarget(Target::Accessory, new FloatPlane(footOutputs));

Check warning on line 43 in firmware/variants/bhaptics/tactosyf/tactosyf.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyf_foot_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 43 in firmware/variants/bhaptics/tactosyf/tactosyf.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyf_foot_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

app->getVibroBody()->setup();

Expand All @@ -51,7 +51,7 @@
.serialNumber = BH_SERIAL_NUMBER,
},
[](std::string& value) -> void {
Decoder::applyPlain(app->getVibroBody(), value, bhLayout, Effect::Vibro, Target::Accessory);

Check warning on line 54 in firmware/variants/bhaptics/tactosyf/tactosyf.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyf_foot_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 54 in firmware/variants/bhaptics/tactosyf/tactosyf.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyf_foot_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]
},
app
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,4 +22,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactosyf>
+<variants/bhaptics/tactosyf>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -40,7 +40,7 @@
// clang-format on
});

app->getVibroBody()->addTarget(Target::Accessory, new FloatPlane(handOutputs));

Check warning on line 43 in firmware/variants/bhaptics/tactosyh/tactosyh.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyh_hand_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 43 in firmware/variants/bhaptics/tactosyh/tactosyh.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyh_hand_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

app->getVibroBody()->setup();

Expand All @@ -51,7 +51,7 @@
.serialNumber = BH_SERIAL_NUMBER,
},
[](std::string& value) -> void {
Decoder::applyPlain(app->getVibroBody(), value, bhLayout, Effect::Vibro, Target::Accessory);

Check warning on line 54 in firmware/variants/bhaptics/tactosyh/tactosyh.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyh_hand_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]

Check warning on line 54 in firmware/variants/bhaptics/tactosyh/tactosyh.cpp

View workflow job for this annotation

GitHub Actions / Build bhaptics_tactosyh_hand_right without coverage, -D SS_BATTERY_ENABLED=true

'SenseShift::Body::Haptics::Target::Accessory' is deprecated [-Wdeprecated-declarations]
},
app
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -22,4 +22,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactosyh>
+<variants/bhaptics/tactosyh>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactsuit_x16>
+<variants/bhaptics/tactsuit_x16>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactsuit_x16_pca9685>
+<variants/bhaptics/tactsuit_x16_pca9685>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactsuit_x40>
+<variants/bhaptics/tactsuit_x40>
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/bhaptics/tactvisor>
+<variants/bhaptics/tactvisor>
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/opengloves>
+<variants/opengloves>

lib_deps =
${env.lib_deps}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ build_flags =

build_src_filter =
${env.build_src_filter}
+<../variants/opengloves>
+<variants/opengloves>

lib_deps =
${env.lib_deps}
Expand Down
Original file line number Diff line number Diff line change
@@ -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"

Expand Down
6 changes: 3 additions & 3 deletions platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ lib_dir = ./lib
src_dir = ./firmware

extra_configs =
variants/**/*.ini
firmware/variants/**/*.ini
arch/**/*.ini

[env]
Expand All @@ -38,7 +38,7 @@ build_flags =

build_src_filter =
+<*>
-<mode_configs>
-<variants>

lib_ldf_mode = deep+
lib_deps =
Expand Down Expand Up @@ -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}
Expand Down
Loading