thomas/CelloEffects
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: thomas/CelloEffects:bf2ef0ab16cd3af163283227a84bb1df54e33bd6
thomas/CelloEffects:main thomas/CelloEffects:cubemx-sd-spi4-st67-prep thomas/CelloEffects:master
...
compare: thomas/CelloEffects:faef8f36738c8a79e1e24435b1d917290b725505
thomas/CelloEffects:cubemx-sd-spi4-st67-prep thomas/CelloEffects:main thomas/CelloEffects:master
2 Commits
bf2ef0ab16 ... faef8f3673
Author SHA1 Message Date
thomas faef8f3673 Ajout an off 2026-09-05 18:12:47 +02:00
thomas 5a0106a9a4 maj eq ihm 2026-09-05 18:01:07 +02:00
24 changed files with 278 additions and 175 deletions
Expand all files Collapse all files

No files matched your search

Appli/Core/Inc/audio_effects.h
+2
View File
@@ -1,6 +1,7 @@
#ifndef AUDIO_EFFECTS_H #ifndef AUDIO_EFFECTS_H
#define AUDIO_EFFECTS_H #define AUDIO_EFFECTS_H
#include <stdbool.h>
#include "fx_equalizer.h" #include "fx_equalizer.h"
#include "fx_overdrive.h" #include "fx_overdrive.h"
#include "fx_saturation.h" #include "fx_saturation.h"
@@ -16,6 +17,7 @@ extern "C" {
* egaliseur -> overdrive -> saturation -> echo -> reverberation. */ * egaliseur -> overdrive -> saturation -> echo -> reverberation. */
typedef struct typedef struct
{ {
bool audio_on_off;
FxEqualizerParams equalizer; FxEqualizerParams equalizer;
FxOverdriveParams overdrive; FxOverdriveParams overdrive;
FxSaturationParams saturation; FxSaturationParams saturation;
Appli/Core/Src/audio_effects.c
+9
View File
@@ -10,6 +10,7 @@ static FxReverbState g_reverbState;
void AudioEffects_Init(void) void AudioEffects_Init(void)
{ {
g_params.audio_on_off = false;
FxEqualizer_Init(&g_eqState, &g_params.equalizer); FxEqualizer_Init(&g_eqState, &g_params.equalizer);
FxOverdrive_Init(&g_overdriveState, &g_params.overdrive); FxOverdrive_Init(&g_overdriveState, &g_params.overdrive);
FxSaturation_Init(&g_saturationState, &g_params.saturation); FxSaturation_Init(&g_saturationState, &g_params.saturation);
@@ -25,6 +26,14 @@ float AudioEffects_Process(float input)
sample = FxSaturation_Process(&g_saturationState, &g_params.saturation, sample); sample = FxSaturation_Process(&g_saturationState, &g_params.saturation, sample);
sample = FxEcho_Process(&g_echoState, &g_params.echo, sample); sample = FxEcho_Process(&g_echoState, &g_params.echo, sample);
sample = FxReverb_Process(&g_reverbState, &g_params.reverb, sample); sample = FxReverb_Process(&g_reverbState, &g_params.reverb, sample);
/* Coupure de sortie : les effets continuent de tourner (pas de discontinuite
* d'etat au reactivation), seule la sortie audible est reduite au silence. */
if (!g_params.audio_on_off)
{
return 0.0f;
}
return sample; return sample;
} }
Appli/TouchGFX/CelloEffects.touchgfx
+223 -155
View File
@@ -7,26 +7,27 @@
{ {
"Type": "Image", "Type": "Image",
"Name": "image1", "Name": "image1",
"Y": -1,
"Width": 800, "Width": 800,
"Height": 480, "Height": 483,
"RelativeFilename": "__generated\\glass_theme_images_backgrounds_800x480_gradient_summer.png" "RelativeFilename": "fondHorlogerie1.png"
}, },
{ {
"Type": "ButtonWithIcon", "Type": "ButtonWithIcon",
"Name": "buttonWithIcon1", "Name": "buttonWithIcon1",
"X": 233, "X": 329,
"Y": 79, "Y": 91,
"Width": 334, "Width": 334,
"Height": 322, "Height": 322,
"Pressed": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png", "Pressed": "__generated\\glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png",
"Released": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png", "Released": "__generated\\glass_theme_images_widgets_button_icon_round_huge_fill_normal.png",
"IconPressed": "__generated\\icon_theme_images_action_done_50_50_E8F6FB.svg.png", "IconPressed": "__generated\\icon_theme_images_action_done_50_50_B5241F.svg.png",
"IconReleased": "__generated\\icon_theme_images_av_music_video_50_50_E8F6FB.svg.png", "IconReleased": "__generated\\icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png",
"IconX": 142, "IconX": 142,
"IconY": 136, "IconY": 136,
"IconHeight": 50, "IconHeight": 50,
"IconWidth": 50, "IconWidth": 50,
"Preset": "glass_theme\\presets\\button\\icon\\rounded\\huge_fill_normal.json" "Preset": "glass_theme\\presets\\button\\icon\\round\\huge_fill_normal.json"
} }
], ],
"Interactions": [ "Interactions": [
@@ -47,6 +48,14 @@
{ {
"Name": "Overview", "Name": "Overview",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -56,7 +65,8 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 182
}, },
{ {
"Type": "ButtonWithLabel", "Type": "ButtonWithLabel",
@@ -171,6 +181,17 @@
}, },
"TextRotation": "0", "TextRotation": "0",
"Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json" "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
},
{
"Type": "ToggleButton",
"Name": "toggleButton1",
"X": 118,
"Y": 22,
"Width": 170,
"Height": 60,
"Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png",
"Released": "__generated\\glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png",
"Preset": "glass_theme\\presets\\togglebutton\\large\\rounded_active_text.json"
} }
], ],
"Interactions": [ "Interactions": [
@@ -233,12 +254,31 @@
"ScreenTransitionType": "ScreenTransitionNone", "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Reverb" "ActionComponent": "Reverb"
} }
},
{
"InteractionName": "Interaction6",
"Trigger": {
"Type": "TriggerClicked",
"TriggerComponent": "toggleButton1"
},
"Action": {
"Type": "ActionCustom",
"FunctionName": "toggleAudioOnOFF"
}
} }
] ]
}, },
{ {
"Name": "Overdrive", "Name": "Overdrive",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -248,7 +288,8 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 241
}, },
{ {
"Type": "ToggleButton", "Type": "ToggleButton",
@@ -460,6 +501,14 @@
{ {
"Name": "Saturation", "Name": "Saturation",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -469,7 +518,8 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 240
}, },
{ {
"Type": "TextArea", "Type": "TextArea",
@@ -637,6 +687,14 @@
{ {
"Name": "Echo", "Name": "Echo",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -646,7 +704,9 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 240,
"Draggable": true
}, },
{ {
"Type": "TextArea", "Type": "TextArea",
@@ -858,6 +918,14 @@
{ {
"Name": "Reverb", "Name": "Reverb",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -867,7 +935,8 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 240
}, },
{ {
"Type": "TextArea", "Type": "TextArea",
@@ -1079,6 +1148,14 @@
{ {
"Name": "Equalizer", "Name": "Equalizer",
"Components": [ "Components": [
{
"Type": "Image",
"Name": "image1",
"Y": -1,
"Width": 800,
"Height": 483,
"RelativeFilename": "fondHorlogerie1.png"
},
{ {
"Type": "Box", "Type": "Box",
"Name": "box1", "Name": "box1",
@@ -1088,58 +1165,56 @@
"Red": 35, "Red": 35,
"Green": 24, "Green": 24,
"Blue": 15 "Blue": 15
} },
"Alpha": 240
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider1", "Name": "bandSlider1",
"X": 120, "X": 30,
"Y": 90, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider2", "Name": "bandSlider2",
"X": 120, "X": 105,
"Y": 160, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider3", "Name": "bandSlider3",
"X": 120, "X": 180,
"Y": 230, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "ButtonWithLabel", "Type": "ButtonWithLabel",
@@ -1165,121 +1240,114 @@
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider4", "Name": "bandSlider4",
"X": 120, "X": 255,
"Y": 300, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider5", "Name": "bandSlider5",
"X": 120, "X": 330,
"Y": 370, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider6", "Name": "bandSlider6",
"X": 500, "X": 420,
"Y": 90, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider7", "Name": "bandSlider7",
"X": 500, "X": 495,
"Y": 160, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider8", "Name": "bandSlider8",
"X": 500, "X": 570,
"Y": 230, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider9", "Name": "bandSlider9",
"X": 500, "X": 645,
"Y": 300, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "Slider", "Type": "Slider",
"Name": "bandSlider10", "Name": "bandSlider10",
"X": 500, "X": 720,
"Y": 370, "Y": 80,
"Width": 256, "Width": 56,
"Height": 52, "Height": 352,
"IsHorizontalSlider": true, "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_track_medium.png",
"BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_small.png", "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_vertical_thick_filler_medium.png",
"BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_small.png", "Indicator": "__generated\\glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png",
"Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png", "BackgroundX": 23,
"BackgroundX": 28, "BackgroundY": 26,
"BackgroundY": 21, "IndicatorMax": 300,
"IndicatorMax": 200,
"ValueMax": 100, "ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json" "Preset": "glass_theme\\presets\\slider\\vertical\\thick\\medium_rounded_dark.json"
}, },
{ {
"Type": "TextArea", "Type": "TextArea",
@@ -1300,8 +1368,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2", "Name": "textArea2",
"X": 74, "X": 47,
"Y": 106, "Y": 440,
"Width": 22, "Width": 22,
"Height": 20, "Height": 20,
"TextId": "EQ_31", "TextId": "EQ_31",
@@ -1316,8 +1384,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_1", "Name": "textArea2_1",
"X": 74, "X": 122,
"Y": 176, "Y": 440,
"Width": 22, "Width": 22,
"Height": 20, "Height": 20,
"TextId": "EQ_62", "TextId": "EQ_62",
@@ -1332,8 +1400,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_2", "Name": "textArea2_2",
"X": 69, "X": 192,
"Y": 246, "Y": 440,
"Width": 33, "Width": 33,
"Height": 20, "Height": 20,
"TextId": "EQ_125", "TextId": "EQ_125",
@@ -1348,8 +1416,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_3", "Name": "textArea2_3",
"X": 69, "X": 267,
"Y": 316, "Y": 440,
"Width": 33, "Width": 33,
"Height": 20, "Height": 20,
"TextId": "EQ_250", "TextId": "EQ_250",
@@ -1364,8 +1432,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_4", "Name": "textArea2_4",
"X": 69, "X": 342,
"Y": 386, "Y": 440,
"Width": 33, "Width": 33,
"Height": 20, "Height": 20,
"TextId": "EQ_500", "TextId": "EQ_500",
@@ -1380,8 +1448,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_5", "Name": "textArea2_5",
"X": 449, "X": 436,
"Y": 106, "Y": 440,
"Width": 24, "Width": 24,
"Height": 20, "Height": 20,
"TextId": "EQ_1K", "TextId": "EQ_1K",
@@ -1396,8 +1464,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_6", "Name": "textArea2_6",
"X": 449, "X": 511,
"Y": 176, "Y": 440,
"Width": 24, "Width": 24,
"Height": 20, "Height": 20,
"TextId": "EQ_2K", "TextId": "EQ_2K",
@@ -1412,8 +1480,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_7", "Name": "textArea2_7",
"X": 449, "X": 586,
"Y": 246, "Y": 440,
"Width": 24, "Width": 24,
"Height": 20, "Height": 20,
"TextId": "EQ_4K", "TextId": "EQ_4K",
@@ -1428,8 +1496,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_8", "Name": "textArea2_8",
"X": 449, "X": 661,
"Y": 316, "Y": 440,
"Width": 24, "Width": 24,
"Height": 20, "Height": 20,
"TextId": "EQ_8K", "TextId": "EQ_8K",
@@ -1444,8 +1512,8 @@
{ {
"Type": "TextArea", "Type": "TextArea",
"Name": "textArea2_9", "Name": "textArea2_9",
"X": 444, "X": 731,
"Y": 386, "Y": 440,
"Width": 35, "Width": 35,
"Height": 20, "Height": 20,
"TextId": "EQ_16K", "TextId": "EQ_16K",
Appli/TouchGFX/assets/images/__generated/glass_theme_images_backgrounds_800x480_gradient_summer.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 389 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_normal.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 90 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_round_huge_fill_pressed.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 81 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 96 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 88 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_filler_small.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 228 B

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_horizontal_thick_track_small.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 369 B

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_filler_medium.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_rounded_dark.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.7 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_slider_vertical_thick_track_medium.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 461 B

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1.4 KiB

Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 2.6 KiB

Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_B5241F.svg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 301 B

Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_done_50_50_E8F6FB.svg.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 301 B

Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 315 B

Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png
BIN
View File
Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 288 B

Appli/TouchGFX/assets/images/fondHorlogerie1.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 564 KiB

Appli/TouchGFX/gui/include/gui/overview_screen/OverviewView.hpp
+2
View File
@@ -11,6 +11,8 @@ public:
virtual ~OverviewView() {} virtual ~OverviewView() {}
virtual void setupScreen(); virtual void setupScreen();
virtual void tearDownScreen(); virtual void tearDownScreen();
virtual void toggleAudioOnOFF();
protected: protected:
}; };
Appli/TouchGFX/gui/src/.DS_Store
Vendored
BIN
View File
Binary file not shown.
Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp
+7
View File
@@ -1,4 +1,5 @@
#include <gui/overview_screen/OverviewView.hpp> #include <gui/overview_screen/OverviewView.hpp>
#include <audio_effects.h>
OverviewView::OverviewView() OverviewView::OverviewView()
{ {
@@ -8,9 +9,15 @@ OverviewView::OverviewView()
void OverviewView::setupScreen() void OverviewView::setupScreen()
{ {
OverviewViewBase::setupScreen(); OverviewViewBase::setupScreen();
toggleButton1.forceState(AudioEffects_GetParams()->audio_on_off);
} }
void OverviewView::tearDownScreen() void OverviewView::tearDownScreen()
{ {
OverviewViewBase::tearDownScreen(); OverviewViewBase::tearDownScreen();
} }
void OverviewView::toggleAudioOnOFF()
{
AudioEffects_GetParams()->audio_on_off = toggleButton1.getState();
}
STM32CubeIDE/Appli/.project
+35 -20
View File
@@ -596,19 +596,14 @@
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/SVGDatabase.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/SVGDatabase.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_backgrounds_800x480_gradient_summer.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_normal.cpp</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_backgrounds_800x480_gradient_summer.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_normal.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed.cpp</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_round_huge_fill_pressed.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp</name>
@@ -635,11 +630,6 @@
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_large.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_large.cpp</locationURI>
</link> </link>
<link>
<name>Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_small.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_small.cpp</locationURI>
</link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.cpp</name>
<type>1</type> <type>1</type>
@@ -651,9 +641,19 @@
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_large.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_large.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_small.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_filler_medium.cpp</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_small.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_filler_medium.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_rounded_dark.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_glass_theme_images_widgets_slider_vertical_thick_track_medium.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_vertical_thick_track_medium.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp</name>
@@ -666,14 +666,29 @@
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.cpp</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_off_normal.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp</name> <name>Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.cpp</name>
<type>1</type> <type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp</locationURI> <locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_rounded_text_on_active.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_icon_theme_images_action_done_50_50_B5241F.svg.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_B5241F.svg.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_fiber_manual_record_50_50_5E3E10.svg.cpp</locationURI>
</link>
<link>
<name>Application/User/generated/image_fondHorlogerie1.cpp</name>
<type>1</type>
<locationURI>PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/image_fondHorlogerie1.cpp</locationURI>
</link> </link>
<link> <link>
<name>Application/User/generated/LanguageGb.cpp</name> <name>Application/User/generated/LanguageGb.cpp</name>