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.

Sign up for GitHub

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

Jump to bottom

feat: upgrade xtensa-esp32 toolchain #99

Draft
wants to merge 3 commits into
base: develop
Choose a base branch
from
+19 −45
Draft

feat: upgrade xtensa-esp32 toolchain #99

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e26ae0
feat: upgrade xtensa-esp32 toolchain
leon0399 Feb 23, 2024
906bde7
refactor(bHaptics): deduct battery templates
leon0399 Feb 23, 2024
d8d9172
feat(bHaptics): deduct update task template
leon0399 Feb 23, 2024
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
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactglove.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,17 +69,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactosy2.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,17 +62,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactosyf.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactosyh.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,17 +63,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactsuit_x16.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,17 +72,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactsuit_x16_pca9685.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,17 +77,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactsuit_x40.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,17 +86,14 @@
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(

Check warning on line 89 in firmware/mode_configs/bhaptics/tactsuit_x40.cpp

View check run for this annotation

Codecov / codecov/patch

firmware/mode_configs/bhaptics/tactsuit_x40.cpp#L89 

Added line #L89 was not covered by tests
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);

Check warning on line 96 in firmware/mode_configs/bhaptics/tactsuit_x40.cpp

View check run for this annotation

Codecov / codecov/patch

firmware/mode_configs/bhaptics/tactsuit_x40.cpp#L96 

Added line #L96 was not covered by tests
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
7 changes: 2 additions & 5 deletions firmware/mode_configs/bhaptics/tactvisor.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,17 +61,14 @@ void setupMode()
new MultiplyFilter(3.3F), // Convert to raw pin voltage
new VoltageDividerFilter(27000.0F, 100000.0F), // Convert to voltage divider voltage
});
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask<SimpleSensorDecorator<float>>(
auto* batteryTask = new ::SenseShift::FreeRTOS::ComponentUpdateTask(
batteryVoltageSensor,
SS_BATTERY_SAMPLE_RATE,
{ "ADC Battery", 4096, SS_BATTERY_TASK_PRIORITY, tskNO_AFFINITY }
);
batteryTask->begin();

auto* batterySensor = new LookupTableInterpolateBatterySensor<const frozen::map<float, float, 21>>(
batteryVoltageSensor,
&VoltageMap::LiPO_1S_42
);
auto* batterySensor = new LookupTableInterpolateBatterySensor(batteryVoltageSensor, &VoltageMap::LiPO_1S_42);
batterySensor->addValueCallback([](BatteryState value) -> void {
app->postEvent(new BatteryLevelEvent(value));
});
Expand Down
1 change: 1 addition & 0 deletions ini/bhaptics.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
[bhaptics]
platform = platformio/espressif32@^6.1.0
platform_packages =
toolchain-xtensa-esp32@12.2.0+20230208
platformio/framework-arduinoespressif32@^3.20014.231204
framework = arduino
board = esp32doit-devkit-v1
Expand Down
Loading