diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
index ca32736..bb8175f 100644
--- a/.vscode/c_cpp_properties.json
+++ b/.vscode/c_cpp_properties.json
@@ -33,6 +33,7 @@
"${workspaceFolder}/Drivers/STM32H7RSxx_BSP/STM32H7S78-DK",
"${workspaceFolder}/Drivers/STM32H7RSxx_BSP/Components/wm8904",
"${workspaceFolder}/Appli/Core/Inc",
+ "${workspaceFolder}/Appli/Core/Src",
"${workspaceFolder}/Appli/Middlewares/ST/touchgfx_components/gpu2d/TouchGFXNema/include",
"${workspaceFolder}/Appli/Middlewares/ST/touchgfx_components/gpu2d/NemaGFX/include",
"${workspaceFolder}/Middlewares/Third_Party/FreeRTOS/Source/include",
diff --git a/.vscode/settings.json b/.vscode/settings.json
new file mode 100644
index 0000000..4302e07
--- /dev/null
+++ b/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+ "cortex-debug.variableUseNaturalFormat": true
+}
\ No newline at end of file
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index dbdf8fa..7bd39be 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -5,18 +5,35 @@
"label": "Build (Boot + Appli)",
"type": "shell",
"command": "/usr/local/opt/make/libexec/gnubin/make",
- "args": ["-j8"],
- "options": { "cwd": "${workspaceFolder}/gcc" },
- "group": { "kind": "build", "isDefault": true },
- "problemMatcher": ["$gcc"],
- "presentation": { "reveal": "always", "panel": "shared", "clear": true }
+ "args": [
+ "-j8"
+ ],
+ "options": {
+ "cwd": "${workspaceFolder}/gcc"
+ },
+ "group": {
+ "kind": "build",
+ "isDefault": true
+ },
+ "problemMatcher": [
+ "$gcc"
+ ],
+ "presentation": {
+ "reveal": "always",
+ "panel": "shared",
+ "clear": true
+ }
},
{
"label": "Clean",
"type": "shell",
"command": "/usr/local/opt/make/libexec/gnubin/make",
- "args": ["clean"],
- "options": { "cwd": "${workspaceFolder}/gcc" },
+ "args": [
+ "clean"
+ ],
+ "options": {
+ "cwd": "${workspaceFolder}/gcc"
+ },
"group": "build",
"problemMatcher": []
},
@@ -25,9 +42,12 @@
"type": "shell",
"command": "/Applications/STMicroelectronics/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.cubeprogrammer.macos64_2.2.500.202603051304/tools/bin/STM32_Programmer_CLI",
"args": [
- "-c", "port=SWD",
- "-el", "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
- "-w", "${workspaceFolder}/Boot/TouchGFX/build/bin/target.hex",
+ "-c",
+ "port=SWD",
+ "-el",
+ "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
+ "-w",
+ "${workspaceFolder}/Boot/TouchGFX/build/bin/target.hex",
"-v",
"-rst"
],
@@ -39,9 +59,12 @@
"type": "shell",
"command": "/Applications/STMicroelectronics/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.cubeprogrammer.macos64_2.2.500.202603051304/tools/bin/STM32_Programmer_CLI",
"args": [
- "-c", "port=SWD",
- "-el", "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
- "-w", "${workspaceFolder}/Appli/TouchGFX/build/bin/target.hex",
+ "-c",
+ "port=SWD",
+ "-el",
+ "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
+ "-w",
+ "${workspaceFolder}/Appli/TouchGFX/build/bin/target.hex",
"-v",
"-rst"
],
@@ -51,7 +74,10 @@
{
"label": "Flash All (Boot + Appli)",
"dependsOrder": "sequence",
- "dependsOn": ["Flash Boot", "Flash Appli"],
+ "dependsOn": [
+ "Flash Boot",
+ "Flash Appli"
+ ],
"problemMatcher": []
},
{
@@ -59,12 +85,17 @@
"type": "shell",
"command": "/Applications/STMicroelectronics/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.stlink-gdb-server.macos64_2.2.500.202604010938/tools/bin/ST-LINK_gdbserver",
"args": [
- "-p", "61234",
- "-l", "1",
+ "-p",
+ "61234",
+ "-l",
+ "1",
"-d",
- "-cp", "/Applications/STMicroelectronics/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.cubeprogrammer.macos64_2.2.500.202603051304/tools/bin",
- "-el", "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
- "-m", "1",
+ "-cp",
+ "/Applications/STMicroelectronics/STM32CubeIDE.app/Contents/Eclipse/plugins/com.st.stm32cube.ide.mcu.externaltools.cubeprogrammer.macos64_2.2.500.202603051304/tools/bin",
+ "-el",
+ "${workspaceFolder}/gcc/MX66UW1G45G_STM32H7S78-DK.stldr",
+ "-m",
+ "1",
"-k"
],
"isBackground": true,
@@ -78,14 +109,19 @@
"endsPattern": "Waiting for debugger connection|Error in initializing ST-LINK device"
}
},
- "presentation": { "reveal": "always", "panel": "dedicated" }
+ "presentation": {
+ "reveal": "always",
+ "panel": "dedicated"
+ }
},
{
"label": "Stop ST-LINK GDB Server",
"type": "shell",
"command": "pkill -f ST-LINK_gdbserver || true",
"problemMatcher": [],
- "presentation": { "reveal": "silent" }
+ "presentation": {
+ "reveal": "silent"
+ }
}
]
}
diff --git a/Appli/Core/Src/main.c b/Appli/Core/Src/main.c
index e4ee3aa..6950a45 100644
--- a/Appli/Core/Src/main.c
+++ b/Appli/Core/Src/main.c
@@ -312,7 +312,7 @@ static void MX_ADF1_Init(void)
AdfFilterConfig0.Delay = 0;
AdfFilterConfig0.CicMode = MDF_ONE_FILTER_SINC4;
AdfFilterConfig0.DecimationRatio = 16;
- AdfFilterConfig0.Gain = 10;
+ AdfFilterConfig0.Gain = 24;
AdfFilterConfig0.ReshapeFilter.Activation = ENABLE;
AdfFilterConfig0.ReshapeFilter.DecimationRatio = MDF_RSF_DECIMATION_RATIO_4;
AdfFilterConfig0.HighPassFilter.Activation = ENABLE;
diff --git a/Appli/TouchGFX/.DS_Store b/Appli/TouchGFX/.DS_Store
index 4442d60..37d0146 100644
Binary files a/Appli/TouchGFX/.DS_Store and b/Appli/TouchGFX/.DS_Store differ
diff --git a/Appli/TouchGFX/CelloEffects.touchgfx b/Appli/TouchGFX/CelloEffects.touchgfx
index 3b010d3..2ae7f8e 100644
--- a/Appli/TouchGFX/CelloEffects.touchgfx
+++ b/Appli/TouchGFX/CelloEffects.touchgfx
@@ -14,19 +14,19 @@
{
"Type": "ButtonWithIcon",
"Name": "buttonWithIcon1",
- "X": 316,
- "Y": 162,
- "Width": 168,
- "Height": 156,
- "Pressed": "__generated\\glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_icon_rounded_small_fill_normal.png",
+ "X": 233,
+ "Y": 79,
+ "Width": 334,
+ "Height": 322,
+ "Pressed": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png",
"IconPressed": "__generated\\icon_theme_images_action_done_50_50_E8F6FB.svg.png",
- "IconReleased": "__generated\\icon_theme_images_action_input_50_50_E8F6FB.svg.png",
- "IconX": 59,
- "IconY": 53,
+ "IconReleased": "__generated\\icon_theme_images_av_music_video_50_50_E8F6FB.svg.png",
+ "IconX": 142,
+ "IconY": 136,
"IconHeight": 50,
"IconWidth": 50,
- "Preset": "glass_theme\\presets\\button\\icon\\rounded\\small_fill_normal.json"
+ "Preset": "glass_theme\\presets\\button\\icon\\rounded\\huge_fill_normal.json"
}
],
"Interactions": [
@@ -38,7 +38,7 @@
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overview"
}
}
@@ -49,7 +49,7 @@
"Components": [
{
"Type": "Box",
- "Name": "__background",
+ "Name": "box1",
"Width": 800,
"Height": 480,
"Color": {
@@ -58,28 +58,15 @@
"Blue": 15
}
},
- {
- "Type": "TextArea",
- "Name": "titleText",
- "Y": 20,
- "Width": 800,
- "Height": 50,
- "TextId": "PEDALBOARD",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "ButtonWithLabel",
- "Name": "tile1",
- "Y": 100,
- "Width": 225,
+ "Name": "buttonWithLabel1",
+ "X": 6,
+ "Y": 93,
+ "Width": 420,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png",
"TextId": "EQUALIZER",
"ReleasedColor": {
"Red": 230,
@@ -87,22 +74,21 @@
"Blue": 170
},
"PressedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
+ "Red": 255,
+ "Green": 255,
+ "Blue": 255
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
},
{
"Type": "ButtonWithLabel",
- "Name": "tile2",
- "X": 113,
+ "Name": "buttonWithLabel2",
"Y": 281,
- "Width": 225,
+ "Width": 420,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png",
"TextId": "OVERDRIVE",
"ReleasedColor": {
"Red": 230,
@@ -115,17 +101,17 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
},
{
"Type": "ButtonWithLabel",
- "Name": "tile3",
- "X": 288,
- "Y": 100,
- "Width": 225,
+ "Name": "buttonWithLabel3",
+ "X": 380,
+ "Y": -1,
+ "Width": 420,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png",
"TextId": "SATURATION",
"ReleasedColor": {
"Red": 230,
@@ -138,17 +124,17 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
},
{
"Type": "ButtonWithLabel",
- "Name": "tile4",
- "X": 463,
- "Y": 281,
- "Width": 225,
+ "Name": "buttonWithLabel4",
+ "X": 380,
+ "Y": 375,
+ "Width": 420,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png",
"TextId": "ECHO",
"ReleasedColor": {
"Red": 230,
@@ -161,17 +147,17 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
},
{
"Type": "ButtonWithLabel",
- "Name": "tile5",
- "X": 575,
- "Y": 100,
- "Width": 225,
+ "Name": "buttonWithLabel5",
+ "X": 380,
+ "Y": 187,
+ "Width": 420,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png",
"TextId": "REVERB",
"ReleasedColor": {
"Red": 230,
@@ -184,67 +170,67 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\large_rounded_normal.json"
}
],
"Interactions": [
{
- "InteractionName": "Interaction_tile1",
+ "InteractionName": "Interaction1",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "tile1"
+ "TriggerComponent": "buttonWithLabel1"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Equalizer"
}
},
{
- "InteractionName": "Interaction_tile2",
+ "InteractionName": "Interaction2",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "tile2"
+ "TriggerComponent": "buttonWithLabel2"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overdrive"
}
},
{
- "InteractionName": "Interaction_tile3",
+ "InteractionName": "Interaction3",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "tile3"
+ "TriggerComponent": "buttonWithLabel3"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Saturation"
}
},
{
- "InteractionName": "Interaction_tile4",
+ "InteractionName": "Interaction4",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "tile4"
+ "TriggerComponent": "buttonWithLabel4"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Echo"
}
},
{
- "InteractionName": "Interaction_tile5",
+ "InteractionName": "Interaction5",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "tile5"
+ "TriggerComponent": "buttonWithLabel5"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Reverb"
}
}
@@ -255,7 +241,7 @@
"Components": [
{
"Type": "Box",
- "Name": "__background",
+ "Name": "box1",
"Width": 800,
"Height": 480,
"Color": {
@@ -265,27 +251,74 @@
}
},
{
- "Type": "TextArea",
- "Name": "titleText",
- "X": 150,
+ "Type": "ToggleButton",
+ "Name": "toggleButton1",
+ "X": 576,
"Y": 20,
- "Width": 500,
- "Height": 50,
- "TextId": "OVERDRIVE",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
+ "Width": 170,
+ "Height": 60,
+ "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_on_active.png",
+ "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png",
+ "Preset": "glass_theme\\presets\\togglebutton\\large\\round_active_text.json"
+ },
+ {
+ "Type": "Slider",
+ "Name": "slider1",
+ "X": 290,
+ "Y": 134,
+ "Width": 456,
+ "Height": 52,
+ "IsHorizontalSlider": true,
+ "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
+ "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
+ "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
+ "BackgroundX": 28,
+ "BackgroundY": 21,
+ "IndicatorMax": 400,
+ "ValueMax": 100,
+ "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ {
+ "Type": "Slider",
+ "Name": "slider2",
+ "X": 290,
+ "Y": 244,
+ "Width": 456,
+ "Height": 52,
+ "IsHorizontalSlider": true,
+ "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
+ "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
+ "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
+ "BackgroundX": 28,
+ "BackgroundY": 21,
+ "IndicatorMax": 400,
+ "ValueMax": 100,
+ "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ {
+ "Type": "Slider",
+ "Name": "slider3",
+ "X": 290,
+ "Y": 354,
+ "Width": 456,
+ "Height": 52,
+ "IsHorizontalSlider": true,
+ "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
+ "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
+ "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
+ "BackgroundX": 28,
+ "BackgroundY": 21,
+ "IndicatorMax": 400,
+ "ValueMax": 100,
+ "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
{
"Type": "ButtonWithLabel",
- "Name": "backButton",
+ "Name": "buttonWithLabel1",
"Width": 225,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
"TextId": "BACK",
"ReleasedColor": {
"Red": 230,
@@ -298,185 +331,128 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_round_normal.json"
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "enableToggle",
- "X": 640,
- "Width": 160,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png",
- "TextId": "OFF",
- "ReleasedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "PressedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\tiny_round_active.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
},
{
"Type": "TextArea",
- "Name": "paramLabel1",
- "X": 60,
- "Y": 140,
- "Width": 200,
- "Height": 40,
+ "Name": "textArea1",
+ "X": 282,
+ "Y": 24,
+ "Width": 237,
+ "Height": 42,
+ "TextId": "OVERDRIVE",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2",
+ "X": 130,
+ "Y": 150,
+ "Width": 60,
+ "Height": 20,
"TextId": "DRIVE",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
- },
- {
- "Type": "Slider",
- "Name": "slider1",
- "X": 280,
- "Y": 145,
- "Width": 456,
- "Height": 52,
- "IsHorizontalSlider": true,
- "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
- "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
- "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
- "BackgroundX": 28,
- "BackgroundY": 21,
- "IndicatorMax": 400,
- "ValueMax": 100,
- "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ "AutoSize": true
},
{
"Type": "TextArea",
- "Name": "paramLabel2",
- "X": 60,
- "Y": 250,
- "Width": 200,
- "Height": 40,
+ "Name": "textArea2_1",
+ "X": 130,
+ "Y": 260,
+ "Width": 55,
+ "Height": 20,
"TextId": "TONE",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
- },
- {
- "Type": "Slider",
- "Name": "slider2",
- "X": 280,
- "Y": 255,
- "Width": 456,
- "Height": 52,
- "IsHorizontalSlider": true,
- "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
- "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
- "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
- "BackgroundX": 28,
- "BackgroundY": 21,
- "IndicatorMax": 400,
- "ValueMax": 100,
- "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ "AutoSize": true
},
{
"Type": "TextArea",
- "Name": "paramLabel3",
- "X": 60,
- "Y": 360,
- "Width": 200,
- "Height": 40,
+ "Name": "textArea2_2",
+ "X": 130,
+ "Y": 370,
+ "Width": 61,
+ "Height": 20,
"TextId": "LEVEL",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
- },
- {
- "Type": "Slider",
- "Name": "slider3",
- "X": 280,
- "Y": 365,
- "Width": 456,
- "Height": 52,
- "IsHorizontalSlider": true,
- "BackgroundUnselected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_track_large.png",
- "BackgroundSelected": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_filler_large.png",
- "Indicator": "__generated\\glass_theme_images_widgets_slider_horizontal_thick_rounded_dark.png",
- "BackgroundX": 28,
- "BackgroundY": 21,
- "IndicatorMax": 400,
- "ValueMax": 100,
- "Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ "AutoSize": true
}
],
"Interactions": [
{
- "InteractionName": "Interaction_back",
+ "InteractionName": "Interaction1",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "backButton"
+ "TriggerComponent": "buttonWithLabel1"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overview"
}
},
{
- "InteractionName": "Interaction_toggle",
+ "InteractionName": "Interaction2",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "enableToggle"
+ "TriggerComponent": "toggleButton1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "toggleEnabled"
+ "FunctionName": "toggleClicked"
}
},
{
- "InteractionName": "Interaction_slider1",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction3",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param1Changed"
+ "FunctionName": "sliderDriveChanged"
}
},
{
- "InteractionName": "Interaction_slider2",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction4",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider2"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param2Changed"
+ "FunctionName": "sliderToneChanged"
}
},
{
- "InteractionName": "Interaction_slider3",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction5",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider3"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param3Changed"
+ "FunctionName": "sliderLevelChanged"
}
}
]
@@ -486,7 +462,7 @@
"Components": [
{
"Type": "Box",
- "Name": "__background",
+ "Name": "box1",
"Width": 800,
"Height": 480,
"Color": {
@@ -497,76 +473,35 @@
},
{
"Type": "TextArea",
- "Name": "titleText",
- "X": 150,
- "Y": 20,
- "Width": 500,
- "Height": 50,
- "TextId": "SATURATION",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "backButton",
- "Width": 225,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_normal.png",
- "TextId": "BACK",
- "ReleasedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- },
- "PressedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_round_normal.json"
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "enableToggle",
- "X": 640,
- "Width": 160,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png",
- "TextId": "OFF",
- "ReleasedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "PressedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\tiny_round_active.json"
- },
- {
- "Type": "TextArea",
- "Name": "paramLabel1",
- "X": 60,
- "Y": 140,
- "Width": 200,
- "Height": 40,
+ "Name": "textArea2",
+ "X": 130,
+ "Y": 161,
+ "Width": 60,
+ "Height": 20,
"TextId": "DRIVE",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_1",
+ "X": 130,
+ "Y": 270,
+ "Width": 61,
+ "Height": 20,
+ "TextId": "LEVEL",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
},
{
"Type": "Slider",
@@ -585,21 +520,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "paramLabel2",
- "X": 60,
- "Y": 250,
- "Width": 200,
- "Height": 40,
- "TextId": "LEVEL",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "slider2",
@@ -616,54 +536,100 @@
"IndicatorMax": 400,
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea1",
+ "X": 274,
+ "Y": 24,
+ "Width": 252,
+ "Height": 42,
+ "TextId": "SATURATION",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "ToggleButton",
+ "Name": "toggleButton1",
+ "X": 576,
+ "Y": 20,
+ "Width": 170,
+ "Height": 60,
+ "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_on_active.png",
+ "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png",
+ "Preset": "glass_theme\\presets\\togglebutton\\large\\round_active_text.json"
+ },
+ {
+ "Type": "ButtonWithLabel",
+ "Name": "buttonWithLabel1",
+ "Width": 225,
+ "Height": 94,
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "TextId": "BACK",
+ "ReleasedColor": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "PressedColor": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "TextRotation": "0",
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
}
],
"Interactions": [
{
- "InteractionName": "Interaction_back",
+ "InteractionName": "Interaction1",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "backButton"
+ "TriggerComponent": "buttonWithLabel1"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overview"
}
},
{
- "InteractionName": "Interaction_toggle",
+ "InteractionName": "Interaction2",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "enableToggle"
+ "TriggerComponent": "toggleButton1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "toggleEnabled"
+ "FunctionName": "toggleClicked"
}
},
{
- "InteractionName": "Interaction_slider1",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction3",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param1Changed"
+ "FunctionName": "sliderDriveClicked"
}
},
{
- "InteractionName": "Interaction_slider2",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction4",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider2"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param2Changed"
+ "FunctionName": "sliderLevelClicked"
}
}
]
@@ -673,7 +639,7 @@
"Components": [
{
"Type": "Box",
- "Name": "__background",
+ "Name": "box1",
"Width": 800,
"Height": 480,
"Color": {
@@ -684,76 +650,51 @@
},
{
"Type": "TextArea",
- "Name": "titleText",
- "X": 150,
- "Y": 20,
- "Width": 500,
- "Height": 50,
- "TextId": "ECHO",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "backButton",
- "Width": 225,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_normal.png",
- "TextId": "BACK",
- "ReleasedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- },
- "PressedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_round_normal.json"
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "enableToggle",
- "X": 640,
- "Width": 160,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png",
- "TextId": "OFF",
- "ReleasedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "PressedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\tiny_round_active.json"
- },
- {
- "Type": "TextArea",
- "Name": "paramLabel1",
- "X": 60,
- "Y": 140,
- "Width": 200,
- "Height": 40,
+ "Name": "textArea2",
+ "X": 130,
+ "Y": 161,
+ "Width": 57,
+ "Height": 20,
"TextId": "DELAY",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_1",
+ "X": 112,
+ "Y": 271,
+ "Width": 105,
+ "Height": 20,
+ "TextId": "FEEDBACK",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_2",
+ "X": 142,
+ "Y": 371,
+ "Width": 36,
+ "Height": 20,
+ "TextId": "MIX",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
},
{
"Type": "Slider",
@@ -772,21 +713,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "paramLabel2",
- "X": 60,
- "Y": 250,
- "Width": 200,
- "Height": 40,
- "TextId": "FEEDBACK",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "slider2",
@@ -805,19 +731,25 @@
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
{
- "Type": "TextArea",
- "Name": "paramLabel3",
- "X": 60,
- "Y": 360,
- "Width": 200,
- "Height": 40,
- "TextId": "MIX",
- "TextRotation": "0",
- "Color": {
+ "Type": "ButtonWithLabel",
+ "Name": "buttonWithLabel1",
+ "Width": 225,
+ "Height": 94,
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "TextId": "BACK",
+ "ReleasedColor": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "PressedColor": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "TextRotation": "0",
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
},
{
"Type": "Slider",
@@ -835,66 +767,90 @@
"IndicatorMax": 400,
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
+ },
+ {
+ "Type": "ToggleButton",
+ "Name": "toggleButton1",
+ "X": 576,
+ "Y": 20,
+ "Width": 170,
+ "Height": 60,
+ "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_on_active.png",
+ "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png",
+ "Preset": "glass_theme\\presets\\togglebutton\\large\\round_active_text.json"
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea1",
+ "X": 342,
+ "Y": 27,
+ "Width": 116,
+ "Height": 42,
+ "TextId": "ECHO",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
}
],
"Interactions": [
{
- "InteractionName": "Interaction_back",
+ "InteractionName": "Interaction1",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "backButton"
+ "TriggerComponent": "buttonWithLabel1"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overview"
}
},
{
- "InteractionName": "Interaction_toggle",
+ "InteractionName": "Interaction2",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "enableToggle"
+ "TriggerComponent": "toggleButton1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "toggleEnabled"
+ "FunctionName": "toggleClicked"
}
},
{
- "InteractionName": "Interaction_slider1",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction3",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param1Changed"
+ "FunctionName": "sliderDelaiChanged"
}
},
{
- "InteractionName": "Interaction_slider2",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction4",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider2"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param2Changed"
+ "FunctionName": "sliderFeedbackChanged"
}
},
{
- "InteractionName": "Interaction_slider3",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction5",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "slider3"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "param3Changed"
+ "FunctionName": "sliderMixChanged"
}
}
]
@@ -904,7 +860,7 @@
"Components": [
{
"Type": "Box",
- "Name": "__background",
+ "Name": "box1",
"Width": 800,
"Height": 480,
"Color": {
@@ -915,76 +871,51 @@
},
{
"Type": "TextArea",
- "Name": "titleText",
- "X": 150,
- "Y": 20,
- "Width": 500,
- "Height": 50,
- "TextId": "REVERB",
+ "Name": "textArea2",
+ "X": 142,
+ "Y": 380,
+ "Width": 36,
+ "Height": 20,
+ "TextId": "MIX",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "backButton",
- "Width": 225,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_normal.png",
- "TextId": "BACK",
- "ReleasedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
},
- "PressedColor": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_round_normal.json"
- },
- {
- "Type": "ButtonWithLabel",
- "Name": "enableToggle",
- "X": 640,
- "Width": 160,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png",
- "TextId": "OFF",
- "ReleasedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "PressedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\tiny_round_active.json"
+ "AutoSize": true
},
{
"Type": "TextArea",
- "Name": "paramLabel1",
- "X": 60,
- "Y": 140,
- "Width": 200,
- "Height": 40,
- "TextId": "ROOMSIZE",
+ "Name": "textArea2_1",
+ "X": 130,
+ "Y": 271,
+ "Width": 78,
+ "Height": 20,
+ "TextId": "DAMPING",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_2",
+ "X": 130,
+ "Y": 161,
+ "Width": 60,
+ "Height": 20,
+ "TextId": "DRIVE",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
},
{
"Type": "Slider",
@@ -1003,21 +934,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "paramLabel2",
- "X": 60,
- "Y": 250,
- "Width": 200,
- "Height": 40,
- "TextId": "DAMPING",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "slider2",
@@ -1035,21 +951,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "paramLabel3",
- "X": 60,
- "Y": 360,
- "Width": 200,
- "Height": 40,
- "TextId": "MIX",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "slider3",
@@ -1066,106 +967,30 @@
"IndicatorMax": 400,
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\large_rounded_dark.json"
- }
- ],
- "Interactions": [
- {
- "InteractionName": "Interaction_back",
- "Trigger": {
- "Type": "TriggerClicked",
- "TriggerComponent": "backButton"
- },
- "Action": {
- "Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
- "ActionComponent": "Overview"
- }
- },
- {
- "InteractionName": "Interaction_toggle",
- "Trigger": {
- "Type": "TriggerClicked",
- "TriggerComponent": "enableToggle"
- },
- "Action": {
- "Type": "ActionCustom",
- "FunctionName": "toggleEnabled"
- }
- },
- {
- "InteractionName": "Interaction_slider1",
- "HasCompletedTrigger": true,
- "Trigger": {
- "Type": "TriggerSliderValueChanged",
- "TriggerComponent": "slider1"
- },
- "Action": {
- "Type": "ActionCustom",
- "FunctionName": "param1Changed"
- }
- },
- {
- "InteractionName": "Interaction_slider2",
- "HasCompletedTrigger": true,
- "Trigger": {
- "Type": "TriggerSliderValueChanged",
- "TriggerComponent": "slider2"
- },
- "Action": {
- "Type": "ActionCustom",
- "FunctionName": "param2Changed"
- }
- },
- {
- "InteractionName": "Interaction_slider3",
- "HasCompletedTrigger": true,
- "Trigger": {
- "Type": "TriggerSliderValueChanged",
- "TriggerComponent": "slider3"
- },
- "Action": {
- "Type": "ActionCustom",
- "FunctionName": "param3Changed"
- }
- }
- ]
- },
- {
- "Name": "Equalizer",
- "Components": [
- {
- "Type": "Box",
- "Name": "__background",
- "Width": 800,
- "Height": 480,
- "Color": {
- "Red": 35,
- "Green": 24,
- "Blue": 15
- }
},
{
"Type": "TextArea",
- "Name": "titleText",
- "X": 150,
- "Y": 20,
- "Width": 500,
- "Height": 50,
- "TextId": "EQUALIZER",
+ "Name": "textArea1",
+ "X": 317,
+ "Y": 27,
+ "Width": 166,
+ "Height": 42,
+ "TextId": "REVERB",
"TextRotation": "0",
"Color": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "AutoSize": true
},
{
"Type": "ButtonWithLabel",
- "Name": "backButton",
+ "Name": "buttonWithLabel1",
"Width": 225,
"Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_round_normal.png",
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
"TextId": "BACK",
"ReleasedColor": {
"Red": 230,
@@ -1178,43 +1003,91 @@
"Blue": 170
},
"TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_round_normal.json"
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
},
{
- "Type": "ButtonWithLabel",
- "Name": "enableToggle",
- "X": 640,
- "Width": 160,
- "Height": 94,
- "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png",
- "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png",
- "TextId": "OFF",
- "ReleasedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
+ "Type": "ToggleButton",
+ "Name": "toggleButton1",
+ "X": 576,
+ "Y": 20,
+ "Width": 170,
+ "Height": 60,
+ "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_on_active.png",
+ "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png",
+ "Preset": "glass_theme\\presets\\togglebutton\\large\\round_active_text.json"
+ }
+ ],
+ "Interactions": [
+ {
+ "InteractionName": "Interaction1",
+ "Trigger": {
+ "Type": "TriggerClicked",
+ "TriggerComponent": "buttonWithLabel1"
},
- "PressedColor": {
- "Red": 200,
- "Green": 90,
- "Blue": 70
- },
- "TextRotation": "0",
- "Preset": "glass_theme\\presets\\button\\regular\\height_50\\tiny_round_active.json"
+ "Action": {
+ "Type": "ActionGotoScreen",
+ "ScreenTransitionType": "ScreenTransitionNone",
+ "ActionComponent": "Overview"
+ }
},
{
- "Type": "TextArea",
- "Name": "bandLabel1",
- "X": 40,
- "Y": 90,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_31",
- "TextRotation": "0",
+ "InteractionName": "Interaction2",
+ "Trigger": {
+ "Type": "TriggerClicked",
+ "TriggerComponent": "toggleButton1"
+ },
+ "Action": {
+ "Type": "ActionCustom",
+ "FunctionName": "toggleClicked"
+ }
+ },
+ {
+ "InteractionName": "Interaction3",
+ "Trigger": {
+ "Type": "TriggerSliderValueChanged",
+ "TriggerComponent": "slider1"
+ },
+ "Action": {
+ "Type": "ActionCustom",
+ "FunctionName": "sliderTailleChanged"
+ }
+ },
+ {
+ "InteractionName": "Interaction4",
+ "Trigger": {
+ "Type": "TriggerSliderValueChanged",
+ "TriggerComponent": "slider2"
+ },
+ "Action": {
+ "Type": "ActionCustom",
+ "FunctionName": "sliderAmortiChanged"
+ }
+ },
+ {
+ "InteractionName": "Interaction5",
+ "Trigger": {
+ "Type": "TriggerSliderValueChanged",
+ "TriggerComponent": "slider3"
+ },
+ "Action": {
+ "Type": "ActionCustom",
+ "FunctionName": "sliderMixChanged"
+ }
+ }
+ ]
+ },
+ {
+ "Name": "Equalizer",
+ "Components": [
+ {
+ "Type": "Box",
+ "Name": "box1",
+ "Width": 800,
+ "Height": 480,
"Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
+ "Red": 35,
+ "Green": 24,
+ "Blue": 15
}
},
{
@@ -1234,21 +1107,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel2",
- "X": 40,
- "Y": 160,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_62",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider2",
@@ -1266,21 +1124,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel3",
- "X": 40,
- "Y": 230,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_125",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider3",
@@ -1299,19 +1142,25 @@
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
{
- "Type": "TextArea",
- "Name": "bandLabel4",
- "X": 40,
- "Y": 300,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_250",
- "TextRotation": "0",
- "Color": {
+ "Type": "ButtonWithLabel",
+ "Name": "buttonWithLabel1",
+ "Width": 225,
+ "Height": 94,
+ "Pressed": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.png",
+ "Released": "__generated\\glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.png",
+ "TextId": "BACK",
+ "ReleasedColor": {
"Red": 230,
"Green": 214,
"Blue": 170
- }
+ },
+ "PressedColor": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "TextRotation": "0",
+ "Preset": "glass_theme\\presets\\button\\regular\\height_50\\small_rounded_normal.json"
},
{
"Type": "Slider",
@@ -1330,21 +1179,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel5",
- "X": 40,
- "Y": 370,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_500",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider5",
@@ -1362,21 +1196,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel6",
- "X": 420,
- "Y": 90,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_1K",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider6",
@@ -1394,21 +1213,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel7",
- "X": 420,
- "Y": 160,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_2K",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider7",
@@ -1426,21 +1230,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel8",
- "X": 420,
- "Y": 230,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_4K",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider8",
@@ -1458,21 +1247,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel9",
- "X": 420,
- "Y": 300,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_8K",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider9",
@@ -1490,21 +1264,6 @@
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
},
- {
- "Type": "TextArea",
- "Name": "bandLabel10",
- "X": 420,
- "Y": 370,
- "Width": 80,
- "Height": 30,
- "TextId": "EQ_16K",
- "TextRotation": "0",
- "Color": {
- "Red": 230,
- "Green": 214,
- "Blue": 170
- }
- },
{
"Type": "Slider",
"Name": "bandSlider10",
@@ -1521,150 +1280,327 @@
"IndicatorMax": 200,
"ValueMax": 100,
"Preset": "glass_theme\\presets\\slider\\horizontal\\thick\\small_rounded_dark.json"
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea1",
+ "X": 287,
+ "Y": 24,
+ "Width": 227,
+ "Height": 42,
+ "TextId": "EQUALIZER",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2",
+ "X": 74,
+ "Y": 106,
+ "Width": 22,
+ "Height": 20,
+ "TextId": "EQ_31",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_1",
+ "X": 74,
+ "Y": 176,
+ "Width": 22,
+ "Height": 20,
+ "TextId": "EQ_62",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_2",
+ "X": 69,
+ "Y": 246,
+ "Width": 33,
+ "Height": 20,
+ "TextId": "EQ_125",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_3",
+ "X": 69,
+ "Y": 316,
+ "Width": 33,
+ "Height": 20,
+ "TextId": "EQ_250",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_4",
+ "X": 69,
+ "Y": 386,
+ "Width": 33,
+ "Height": 20,
+ "TextId": "EQ_500",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_5",
+ "X": 449,
+ "Y": 106,
+ "Width": 24,
+ "Height": 20,
+ "TextId": "EQ_1K",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_6",
+ "X": 449,
+ "Y": 176,
+ "Width": 24,
+ "Height": 20,
+ "TextId": "EQ_2K",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_7",
+ "X": 449,
+ "Y": 246,
+ "Width": 24,
+ "Height": 20,
+ "TextId": "EQ_4K",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_8",
+ "X": 449,
+ "Y": 316,
+ "Width": 24,
+ "Height": 20,
+ "TextId": "EQ_8K",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "TextArea",
+ "Name": "textArea2_9",
+ "X": 444,
+ "Y": 386,
+ "Width": 35,
+ "Height": 20,
+ "TextId": "EQ_16K",
+ "TextRotation": "0",
+ "Color": {
+ "Red": 230,
+ "Green": 214,
+ "Blue": 170
+ },
+ "AutoSize": true
+ },
+ {
+ "Type": "ToggleButton",
+ "Name": "toggleButton1",
+ "X": 576,
+ "Y": 20,
+ "Width": 170,
+ "Height": 60,
+ "Pressed": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_on_active.png",
+ "Released": "__generated\\glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png",
+ "Preset": "glass_theme\\presets\\togglebutton\\large\\round_active_text.json"
}
],
"Interactions": [
{
- "InteractionName": "Interaction_back",
+ "InteractionName": "Interaction1",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "backButton"
+ "TriggerComponent": "buttonWithLabel1"
},
"Action": {
"Type": "ActionGotoScreen",
- "ScreenTransitionType": "ScreenTransitionBlock",
+ "ScreenTransitionType": "ScreenTransitionNone",
"ActionComponent": "Overview"
}
},
{
- "InteractionName": "Interaction_toggle",
+ "InteractionName": "Interaction2",
"Trigger": {
"Type": "TriggerClicked",
- "TriggerComponent": "enableToggle"
+ "TriggerComponent": "toggleButton1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "toggleEnabled"
+ "FunctionName": "toggleClicked"
}
},
{
- "InteractionName": "Interaction_bandSlider1",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction3",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider1"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band1Changed"
+ "FunctionName": "sliderBand1Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider2",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction4",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider2"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band2Changed"
+ "FunctionName": "sliderBand2Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider3",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction5",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider3"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band3Changed"
+ "FunctionName": "sliderBand3Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider4",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction6",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider4"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band4Changed"
+ "FunctionName": "sliderBand4Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider5",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction7",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider5"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band5Changed"
+ "FunctionName": "sliderBand5Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider6",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction8",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider6"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band6Changed"
+ "FunctionName": "sliderBand6Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider7",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction9",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider7"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band7Changed"
+ "FunctionName": "sliderBand7Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider8",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction10",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider8"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band8Changed"
+ "FunctionName": "sliderBand8Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider9",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction11",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider9"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band9Changed"
+ "FunctionName": "sliderBand9Changed"
}
},
{
- "InteractionName": "Interaction_bandSlider10",
- "HasCompletedTrigger": true,
+ "InteractionName": "Interaction12",
"Trigger": {
"Type": "TriggerSliderValueChanged",
"TriggerComponent": "bandSlider10"
},
"Action": {
"Type": "ActionCustom",
- "FunctionName": "band10Changed"
+ "FunctionName": "sliderBand10Changed"
}
}
]
diff --git a/Appli/TouchGFX/MATERIAL-ICONS-LICENSE b/Appli/TouchGFX/MATERIAL-ICONS-LICENSE
new file mode 100644
index 0000000..7a4a3ea
--- /dev/null
+++ b/Appli/TouchGFX/MATERIAL-ICONS-LICENSE
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
\ No newline at end of file
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png
new file mode 100644
index 0000000..4916974
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png
new file mode 100644
index 0000000..272a734
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_normal.png
deleted file mode 100644
index 8da44e5..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_normal.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.png
deleted file mode 100644
index 11a11a5..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png
new file mode 100644
index 0000000..ad58122
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png
new file mode 100644
index 0000000..d04356b
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_normal.png
deleted file mode 100644
index bd6dcee..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_normal.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png
deleted file mode 100644
index b7012a6..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_small_round_pressed.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png
deleted file mode 100644
index 94732f1..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_active.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png
deleted file mode 100644
index 975219d..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png
new file mode 100644
index 0000000..a061075
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_off_normal.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_on_active.png b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_on_active.png
new file mode 100644
index 0000000..56b2976
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/glass_theme_images_widgets_togglebutton_large_round_text_on_active.png differ
diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_input_50_50_E8F6FB.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_input_50_50_E8F6FB.svg.png
deleted file mode 100644
index 0d55a68..0000000
Binary files a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_action_input_50_50_E8F6FB.svg.png and /dev/null differ
diff --git a/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png
new file mode 100644
index 0000000..fd47706
Binary files /dev/null and b/Appli/TouchGFX/assets/images/__generated/icon_theme_images_av_music_video_50_50_E8F6FB.svg.png differ
diff --git a/Appli/TouchGFX/assets/texts/texts.xml b/Appli/TouchGFX/assets/texts/texts.xml
index 3b3d674..5131661 100644
--- a/Appli/TouchGFX/assets/texts/texts.xml
+++ b/Appli/TouchGFX/assets/texts/texts.xml
@@ -8,19 +8,19 @@
PEDALBOARD
-
+
EQUALIZER
-
+
OVERDRIVE
-
+
SATURATION
-
+
ECHO
-
+
REVERB
@@ -87,6 +87,7 @@
16K
+
diff --git a/Appli/TouchGFX/gui/.DS_Store b/Appli/TouchGFX/gui/.DS_Store
new file mode 100644
index 0000000..e0d9c9e
Binary files /dev/null and b/Appli/TouchGFX/gui/.DS_Store differ
diff --git a/Appli/TouchGFX/gui/include/.DS_Store b/Appli/TouchGFX/gui/include/.DS_Store
new file mode 100644
index 0000000..d29525a
Binary files /dev/null and b/Appli/TouchGFX/gui/include/.DS_Store differ
diff --git a/Appli/TouchGFX/gui/include/gui/.DS_Store b/Appli/TouchGFX/gui/include/gui/.DS_Store
new file mode 100644
index 0000000..5008ddf
Binary files /dev/null and b/Appli/TouchGFX/gui/include/gui/.DS_Store differ
diff --git a/Appli/TouchGFX/gui/include/gui/echo_screen/EchoPresenter.hpp b/Appli/TouchGFX/gui/include/gui/echo_screen/EchoPresenter.hpp
index 0761e6d..3d04342 100644
--- a/Appli/TouchGFX/gui/include/gui/echo_screen/EchoPresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/echo_screen/EchoPresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef ECHOPRESENTER_HPP
-#define ECHOPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class EchoView;
-
-class EchoPresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- EchoPresenter(EchoView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~EchoPresenter() {}
-
-private:
- EchoPresenter();
- EchoView& view;
-};
-
-#endif // ECHOPRESENTER_HPP
+#ifndef ECHOPRESENTER_HPP
+#define ECHOPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class EchoView;
+
+class EchoPresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ EchoPresenter(EchoView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~EchoPresenter() {}
+
+private:
+ EchoPresenter();
+
+ EchoView& view;
+};
+
+#endif // ECHOPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/echo_screen/EchoView.hpp b/Appli/TouchGFX/gui/include/gui/echo_screen/EchoView.hpp
index 5392474..4156782 100644
--- a/Appli/TouchGFX/gui/include/gui/echo_screen/EchoView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/echo_screen/EchoView.hpp
@@ -12,11 +12,10 @@ public:
virtual void setupScreen();
virtual void tearDownScreen();
- virtual void goBack();
- virtual void toggleEnabled();
- virtual void param1Changed(int value);
- virtual void param2Changed(int value);
- virtual void param3Changed(int value);
+ virtual void toggleClicked();
+ virtual void sliderDelaiChanged(int value);
+ virtual void sliderFeedbackChanged(int value);
+ virtual void sliderMixChanged(int value);
protected:
};
diff --git a/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerPresenter.hpp b/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerPresenter.hpp
index dcc7daa..3188639 100644
--- a/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerPresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerPresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef EQUALIZERPRESENTER_HPP
-#define EQUALIZERPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class EqualizerView;
-
-class EqualizerPresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- EqualizerPresenter(EqualizerView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~EqualizerPresenter() {}
-
-private:
- EqualizerPresenter();
- EqualizerView& view;
-};
-
-#endif // EQUALIZERPRESENTER_HPP
+#ifndef EQUALIZERPRESENTER_HPP
+#define EQUALIZERPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class EqualizerView;
+
+class EqualizerPresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ EqualizerPresenter(EqualizerView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~EqualizerPresenter() {}
+
+private:
+ EqualizerPresenter();
+
+ EqualizerView& view;
+};
+
+#endif // EQUALIZERPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerView.hpp b/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerView.hpp
index 5476d74..04ea6a2 100644
--- a/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/equalizer_screen/EqualizerView.hpp
@@ -12,18 +12,17 @@ public:
virtual void setupScreen();
virtual void tearDownScreen();
- virtual void goBack();
- virtual void toggleEnabled();
- virtual void band1Changed(int value);
- virtual void band2Changed(int value);
- virtual void band3Changed(int value);
- virtual void band4Changed(int value);
- virtual void band5Changed(int value);
- virtual void band6Changed(int value);
- virtual void band7Changed(int value);
- virtual void band8Changed(int value);
- virtual void band9Changed(int value);
- virtual void band10Changed(int value);
+ virtual void toggleClicked();
+ virtual void sliderBand1Changed(int value);
+ virtual void sliderBand2Changed(int value);
+ virtual void sliderBand3Changed(int value);
+ virtual void sliderBand4Changed(int value);
+ virtual void sliderBand5Changed(int value);
+ virtual void sliderBand6Changed(int value);
+ virtual void sliderBand7Changed(int value);
+ virtual void sliderBand8Changed(int value);
+ virtual void sliderBand9Changed(int value);
+ virtual void sliderBand10Changed(int value);
protected:
};
diff --git a/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdrivePresenter.hpp b/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdrivePresenter.hpp
index 86397f9..41b0d5f 100644
--- a/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdrivePresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdrivePresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef OVERDRIVEPRESENTER_HPP
-#define OVERDRIVEPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class OverdriveView;
-
-class OverdrivePresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- OverdrivePresenter(OverdriveView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~OverdrivePresenter() {}
-
-private:
- OverdrivePresenter();
- OverdriveView& view;
-};
-
-#endif // OVERDRIVEPRESENTER_HPP
+#ifndef OVERDRIVEPRESENTER_HPP
+#define OVERDRIVEPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class OverdriveView;
+
+class OverdrivePresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ OverdrivePresenter(OverdriveView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~OverdrivePresenter() {}
+
+private:
+ OverdrivePresenter();
+
+ OverdriveView& view;
+};
+
+#endif // OVERDRIVEPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdriveView.hpp b/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdriveView.hpp
index 1d18d29..64dd482 100644
--- a/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdriveView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/overdrive_screen/OverdriveView.hpp
@@ -12,11 +12,10 @@ public:
virtual void setupScreen();
virtual void tearDownScreen();
- virtual void goBack();
- virtual void toggleEnabled();
- virtual void param1Changed(int value);
- virtual void param2Changed(int value);
- virtual void param3Changed(int value);
+ virtual void toggleClicked();
+ virtual void sliderDriveChanged(int value);
+ virtual void sliderToneChanged(int value);
+ virtual void sliderLevelChanged(int value);
protected:
};
diff --git a/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewPresenter.hpp b/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewPresenter.hpp
index fa816d1..223cc1c 100644
--- a/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewPresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewPresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef OVERVIEWPRESENTER_HPP
-#define OVERVIEWPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class OverviewView;
-
-class OverviewPresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- OverviewPresenter(OverviewView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~OverviewPresenter() {}
-
-private:
- OverviewPresenter();
- OverviewView& view;
-};
-
-#endif // OVERVIEWPRESENTER_HPP
+#ifndef OVERVIEWPRESENTER_HPP
+#define OVERVIEWPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class OverviewView;
+
+class OverviewPresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ OverviewPresenter(OverviewView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~OverviewPresenter() {}
+
+private:
+ OverviewPresenter();
+
+ OverviewView& view;
+};
+
+#endif // OVERVIEWPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewView.hpp b/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewView.hpp
index a30c718..73a5ad2 100644
--- a/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/overview_screen/OverviewView.hpp
@@ -1,17 +1,17 @@
-#ifndef OVERVIEWVIEW_HPP
-#define OVERVIEWVIEW_HPP
-
-#include
-#include
-
-class OverviewView : public OverviewViewBase
-{
-public:
- OverviewView();
- virtual ~OverviewView() {}
- virtual void setupScreen();
- virtual void tearDownScreen();
-protected:
-};
-
-#endif // OVERVIEWVIEW_HPP
+#ifndef OVERVIEWVIEW_HPP
+#define OVERVIEWVIEW_HPP
+
+#include
+#include
+
+class OverviewView : public OverviewViewBase
+{
+public:
+ OverviewView();
+ virtual ~OverviewView() {}
+ virtual void setupScreen();
+ virtual void tearDownScreen();
+protected:
+};
+
+#endif // OVERVIEWVIEW_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbPresenter.hpp b/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbPresenter.hpp
index 167e242..41d535b 100644
--- a/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbPresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbPresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef REVERBPRESENTER_HPP
-#define REVERBPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class ReverbView;
-
-class ReverbPresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- ReverbPresenter(ReverbView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~ReverbPresenter() {}
-
-private:
- ReverbPresenter();
- ReverbView& view;
-};
-
-#endif // REVERBPRESENTER_HPP
+#ifndef REVERBPRESENTER_HPP
+#define REVERBPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class ReverbView;
+
+class ReverbPresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ ReverbPresenter(ReverbView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~ReverbPresenter() {}
+
+private:
+ ReverbPresenter();
+
+ ReverbView& view;
+};
+
+#endif // REVERBPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbView.hpp b/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbView.hpp
index df8f80e..f0e9325 100644
--- a/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/reverb_screen/ReverbView.hpp
@@ -12,11 +12,10 @@ public:
virtual void setupScreen();
virtual void tearDownScreen();
- virtual void goBack();
- virtual void toggleEnabled();
- virtual void param1Changed(int value);
- virtual void param2Changed(int value);
- virtual void param3Changed(int value);
+ virtual void toggleClicked();
+ virtual void sliderTailleChanged(int value);
+ virtual void sliderAmortiChanged(int value);
+ virtual void sliderMixChanged(int value);
protected:
};
diff --git a/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationPresenter.hpp b/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationPresenter.hpp
index 6d96d85..438ddee 100644
--- a/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationPresenter.hpp
+++ b/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationPresenter.hpp
@@ -1,24 +1,36 @@
-#ifndef SATURATIONPRESENTER_HPP
-#define SATURATIONPRESENTER_HPP
-
-#include
-#include
-
-using namespace touchgfx;
-
-class SaturationView;
-
-class SaturationPresenter : public touchgfx::Presenter, public ModelListener
-{
-public:
- SaturationPresenter(SaturationView& v);
- virtual void activate();
- virtual void deactivate();
- virtual ~SaturationPresenter() {}
-
-private:
- SaturationPresenter();
- SaturationView& view;
-};
-
-#endif // SATURATIONPRESENTER_HPP
+#ifndef SATURATIONPRESENTER_HPP
+#define SATURATIONPRESENTER_HPP
+
+#include
+#include
+
+using namespace touchgfx;
+
+class SaturationView;
+
+class SaturationPresenter : public touchgfx::Presenter, public ModelListener
+{
+public:
+ SaturationPresenter(SaturationView& v);
+
+ /**
+ * The activate function is called automatically when this screen is "switched in"
+ * (ie. made active). Initialization logic can be placed here.
+ */
+ virtual void activate();
+
+ /**
+ * The deactivate function is called automatically when this screen is "switched out"
+ * (ie. made inactive). Teardown functionality can be placed here.
+ */
+ virtual void deactivate();
+
+ virtual ~SaturationPresenter() {}
+
+private:
+ SaturationPresenter();
+
+ SaturationView& view;
+};
+
+#endif // SATURATIONPRESENTER_HPP
diff --git a/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationView.hpp b/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationView.hpp
index f57c5fa..851a256 100644
--- a/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationView.hpp
+++ b/Appli/TouchGFX/gui/include/gui/saturation_screen/SaturationView.hpp
@@ -12,10 +12,9 @@ public:
virtual void setupScreen();
virtual void tearDownScreen();
- virtual void goBack();
- virtual void toggleEnabled();
- virtual void param1Changed(int value);
- virtual void param2Changed(int value);
+ virtual void toggleClicked();
+ virtual void sliderDriveClicked(int value);
+ virtual void sliderLevelClicked(int value);
protected:
};
diff --git a/Appli/TouchGFX/gui/src/echo_screen/EchoPresenter.cpp b/Appli/TouchGFX/gui/src/echo_screen/EchoPresenter.cpp
index a24a423..f95046c 100644
--- a/Appli/TouchGFX/gui/src/echo_screen/EchoPresenter.cpp
+++ b/Appli/TouchGFX/gui/src/echo_screen/EchoPresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-EchoPresenter::EchoPresenter(EchoView& v)
- : view(v)
-{
-}
-
-void EchoPresenter::activate()
-{
-}
-
-void EchoPresenter::deactivate()
-{
-}
+#include
+#include
+
+EchoPresenter::EchoPresenter(EchoView& v)
+ : view(v)
+{
+
+}
+
+void EchoPresenter::activate()
+{
+
+}
+
+void EchoPresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/echo_screen/EchoView.cpp b/Appli/TouchGFX/gui/src/echo_screen/EchoView.cpp
index 6f61896..4a7ec3d 100644
--- a/Appli/TouchGFX/gui/src/echo_screen/EchoView.cpp
+++ b/Appli/TouchGFX/gui/src/echo_screen/EchoView.cpp
@@ -1,7 +1,5 @@
#include
#include
-#include
-#include
EchoView::EchoView()
{
@@ -10,6 +8,10 @@ EchoView::EchoView()
void EchoView::setupScreen()
{
EchoViewBase::setupScreen();
+ toggleButton1.forceState(AudioEffects_GetParams()->echo.enabled);
+ slider1.setValue((int16_t)(AudioEffects_GetParams()->echo.delay_ms / 10.0f));
+ slider2.setValue((int16_t)(AudioEffects_GetParams()->echo.feedback / 0.95f * 100.0f));
+ slider3.setValue((int16_t)(AudioEffects_GetParams()->echo.mix * 100.0f));
}
void EchoView::tearDownScreen()
@@ -17,30 +19,20 @@ void EchoView::tearDownScreen()
EchoViewBase::tearDownScreen();
}
-void EchoView::goBack()
+void EchoView::toggleClicked()
{
- application().gotoOverviewScreenBlockTransition();
+ AudioEffects_GetParams()->echo.enabled = toggleButton1.getState();
}
-void EchoView::toggleEnabled()
-{
- bool en = !AudioEffects_GetParams()->echo.enabled;
- AudioEffects_GetParams()->echo.enabled = en;
- enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
- enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.invalidate();
-}
-
-void EchoView::param1Changed(int value)
+void EchoView::sliderDelaiChanged(int value)
{
AudioEffects_GetParams()->echo.delay_ms = value * 10.0f;
}
-void EchoView::param2Changed(int value)
+void EchoView::sliderFeedbackChanged(int value)
{
AudioEffects_GetParams()->echo.feedback = value / 100.0f * 0.95f;
}
-void EchoView::param3Changed(int value)
+void EchoView::sliderMixChanged(int value)
{
AudioEffects_GetParams()->echo.mix = value / 100.0f;
}
diff --git a/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerPresenter.cpp b/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerPresenter.cpp
index 57f6a40..b3658d5 100644
--- a/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerPresenter.cpp
+++ b/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerPresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-EqualizerPresenter::EqualizerPresenter(EqualizerView& v)
- : view(v)
-{
-}
-
-void EqualizerPresenter::activate()
-{
-}
-
-void EqualizerPresenter::deactivate()
-{
-}
+#include
+#include
+
+EqualizerPresenter::EqualizerPresenter(EqualizerView& v)
+ : view(v)
+{
+
+}
+
+void EqualizerPresenter::activate()
+{
+
+}
+
+void EqualizerPresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerView.cpp b/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerView.cpp
index 9aefc65..baa2f11 100644
--- a/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerView.cpp
+++ b/Appli/TouchGFX/gui/src/equalizer_screen/EqualizerView.cpp
@@ -1,7 +1,5 @@
#include
#include
-#include
-#include
EqualizerView::EqualizerView()
{
@@ -10,6 +8,17 @@ EqualizerView::EqualizerView()
void EqualizerView::setupScreen()
{
EqualizerViewBase::setupScreen();
+ toggleButton1.forceState(AudioEffects_GetParams()->equalizer.enabled);
+ bandSlider1.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[0].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider2.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[1].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider3.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[2].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider4.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[3].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider5.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[4].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider6.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[5].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider7.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[6].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider8.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[7].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider9.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[8].gain_db + 24.0f) / 48.0f * 100.0f));
+ bandSlider10.setValue((int16_t)((AudioEffects_GetParams()->equalizer.bands[9].gain_db + 24.0f) / 48.0f * 100.0f));
}
void EqualizerView::tearDownScreen()
@@ -17,58 +26,48 @@ void EqualizerView::tearDownScreen()
EqualizerViewBase::tearDownScreen();
}
-void EqualizerView::goBack()
+void EqualizerView::toggleClicked()
{
- application().gotoOverviewScreenBlockTransition();
+ AudioEffects_GetParams()->equalizer.enabled = toggleButton1.getState();
}
-void EqualizerView::toggleEnabled()
-{
- bool en = !AudioEffects_GetParams()->equalizer.enabled;
- AudioEffects_GetParams()->equalizer.enabled = en;
- enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
- enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.invalidate();
-}
-
-void EqualizerView::band1Changed(int value)
+void EqualizerView::sliderBand1Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[0].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band2Changed(int value)
+void EqualizerView::sliderBand2Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[1].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band3Changed(int value)
+void EqualizerView::sliderBand3Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[2].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band4Changed(int value)
+void EqualizerView::sliderBand4Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[3].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band5Changed(int value)
+void EqualizerView::sliderBand5Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[4].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band6Changed(int value)
+void EqualizerView::sliderBand6Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[5].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band7Changed(int value)
+void EqualizerView::sliderBand7Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[6].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band8Changed(int value)
+void EqualizerView::sliderBand8Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[7].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band9Changed(int value)
+void EqualizerView::sliderBand9Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[8].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
-void EqualizerView::band10Changed(int value)
+void EqualizerView::sliderBand10Changed(int value)
{
AudioEffects_GetParams()->equalizer.bands[9].gain_db = (value / 100.0f) * 48.0f - 24.0f;
}
diff --git a/Appli/TouchGFX/gui/src/overdrive_screen/OverdrivePresenter.cpp b/Appli/TouchGFX/gui/src/overdrive_screen/OverdrivePresenter.cpp
index 25ad8c2..4dac63a 100644
--- a/Appli/TouchGFX/gui/src/overdrive_screen/OverdrivePresenter.cpp
+++ b/Appli/TouchGFX/gui/src/overdrive_screen/OverdrivePresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-OverdrivePresenter::OverdrivePresenter(OverdriveView& v)
- : view(v)
-{
-}
-
-void OverdrivePresenter::activate()
-{
-}
-
-void OverdrivePresenter::deactivate()
-{
-}
+#include
+#include
+
+OverdrivePresenter::OverdrivePresenter(OverdriveView& v)
+ : view(v)
+{
+
+}
+
+void OverdrivePresenter::activate()
+{
+
+}
+
+void OverdrivePresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/overdrive_screen/OverdriveView.cpp b/Appli/TouchGFX/gui/src/overdrive_screen/OverdriveView.cpp
index 30675f5..6b4005d 100644
--- a/Appli/TouchGFX/gui/src/overdrive_screen/OverdriveView.cpp
+++ b/Appli/TouchGFX/gui/src/overdrive_screen/OverdriveView.cpp
@@ -1,7 +1,5 @@
#include
#include
-#include
-#include
OverdriveView::OverdriveView()
{
@@ -10,6 +8,10 @@ OverdriveView::OverdriveView()
void OverdriveView::setupScreen()
{
OverdriveViewBase::setupScreen();
+ toggleButton1.forceState(AudioEffects_GetParams()->overdrive.enabled);
+ slider1.setValue((int16_t)(AudioEffects_GetParams()->overdrive.drive * 100.0f));
+ slider2.setValue((int16_t)(AudioEffects_GetParams()->overdrive.tone * 100.0f));
+ slider3.setValue((int16_t)(AudioEffects_GetParams()->overdrive.level * 100.0f));
}
void OverdriveView::tearDownScreen()
@@ -17,30 +19,20 @@ void OverdriveView::tearDownScreen()
OverdriveViewBase::tearDownScreen();
}
-void OverdriveView::goBack()
+void OverdriveView::toggleClicked()
{
- application().gotoOverviewScreenBlockTransition();
+ AudioEffects_GetParams()->overdrive.enabled = toggleButton1.getState();
}
-void OverdriveView::toggleEnabled()
-{
- bool en = !AudioEffects_GetParams()->overdrive.enabled;
- AudioEffects_GetParams()->overdrive.enabled = en;
- enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
- enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.invalidate();
-}
-
-void OverdriveView::param1Changed(int value)
+void OverdriveView::sliderDriveChanged(int value)
{
AudioEffects_GetParams()->overdrive.drive = value / 100.0f;
}
-void OverdriveView::param2Changed(int value)
+void OverdriveView::sliderToneChanged(int value)
{
AudioEffects_GetParams()->overdrive.tone = value / 100.0f;
}
-void OverdriveView::param3Changed(int value)
+void OverdriveView::sliderLevelChanged(int value)
{
AudioEffects_GetParams()->overdrive.level = value / 100.0f;
}
diff --git a/Appli/TouchGFX/gui/src/overview_screen/OverviewPresenter.cpp b/Appli/TouchGFX/gui/src/overview_screen/OverviewPresenter.cpp
index 44ff7df..3dc391c 100644
--- a/Appli/TouchGFX/gui/src/overview_screen/OverviewPresenter.cpp
+++ b/Appli/TouchGFX/gui/src/overview_screen/OverviewPresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-OverviewPresenter::OverviewPresenter(OverviewView& v)
- : view(v)
-{
-}
-
-void OverviewPresenter::activate()
-{
-}
-
-void OverviewPresenter::deactivate()
-{
-}
+#include
+#include
+
+OverviewPresenter::OverviewPresenter(OverviewView& v)
+ : view(v)
+{
+
+}
+
+void OverviewPresenter::activate()
+{
+
+}
+
+void OverviewPresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp b/Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp
index e42b5d2..9a16638 100644
--- a/Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp
+++ b/Appli/TouchGFX/gui/src/overview_screen/OverviewView.cpp
@@ -1,15 +1,16 @@
-#include
-
-OverviewView::OverviewView()
-{
-}
-
-void OverviewView::setupScreen()
-{
- OverviewViewBase::setupScreen();
-}
-
-void OverviewView::tearDownScreen()
-{
- OverviewViewBase::tearDownScreen();
-}
+#include
+
+OverviewView::OverviewView()
+{
+
+}
+
+void OverviewView::setupScreen()
+{
+ OverviewViewBase::setupScreen();
+}
+
+void OverviewView::tearDownScreen()
+{
+ OverviewViewBase::tearDownScreen();
+}
diff --git a/Appli/TouchGFX/gui/src/reverb_screen/ReverbPresenter.cpp b/Appli/TouchGFX/gui/src/reverb_screen/ReverbPresenter.cpp
index 2870140..98d69e8 100644
--- a/Appli/TouchGFX/gui/src/reverb_screen/ReverbPresenter.cpp
+++ b/Appli/TouchGFX/gui/src/reverb_screen/ReverbPresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-ReverbPresenter::ReverbPresenter(ReverbView& v)
- : view(v)
-{
-}
-
-void ReverbPresenter::activate()
-{
-}
-
-void ReverbPresenter::deactivate()
-{
-}
+#include
+#include
+
+ReverbPresenter::ReverbPresenter(ReverbView& v)
+ : view(v)
+{
+
+}
+
+void ReverbPresenter::activate()
+{
+
+}
+
+void ReverbPresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/reverb_screen/ReverbView.cpp b/Appli/TouchGFX/gui/src/reverb_screen/ReverbView.cpp
index a94b72c..5709464 100644
--- a/Appli/TouchGFX/gui/src/reverb_screen/ReverbView.cpp
+++ b/Appli/TouchGFX/gui/src/reverb_screen/ReverbView.cpp
@@ -1,7 +1,5 @@
#include
#include
-#include
-#include
ReverbView::ReverbView()
{
@@ -10,6 +8,10 @@ ReverbView::ReverbView()
void ReverbView::setupScreen()
{
ReverbViewBase::setupScreen();
+ toggleButton1.forceState(AudioEffects_GetParams()->reverb.enabled);
+ slider1.setValue((int16_t)(AudioEffects_GetParams()->reverb.room_size * 100.0f));
+ slider2.setValue((int16_t)(AudioEffects_GetParams()->reverb.damping * 100.0f));
+ slider3.setValue((int16_t)(AudioEffects_GetParams()->reverb.mix * 100.0f));
}
void ReverbView::tearDownScreen()
@@ -17,30 +19,20 @@ void ReverbView::tearDownScreen()
ReverbViewBase::tearDownScreen();
}
-void ReverbView::goBack()
+void ReverbView::toggleClicked()
{
- application().gotoOverviewScreenBlockTransition();
+ AudioEffects_GetParams()->reverb.enabled = toggleButton1.getState();
}
-void ReverbView::toggleEnabled()
-{
- bool en = !AudioEffects_GetParams()->reverb.enabled;
- AudioEffects_GetParams()->reverb.enabled = en;
- enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
- enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.invalidate();
-}
-
-void ReverbView::param1Changed(int value)
+void ReverbView::sliderTailleChanged(int value)
{
AudioEffects_GetParams()->reverb.room_size = value / 100.0f;
}
-void ReverbView::param2Changed(int value)
+void ReverbView::sliderAmortiChanged(int value)
{
AudioEffects_GetParams()->reverb.damping = value / 100.0f;
}
-void ReverbView::param3Changed(int value)
+void ReverbView::sliderMixChanged(int value)
{
AudioEffects_GetParams()->reverb.mix = value / 100.0f;
}
diff --git a/Appli/TouchGFX/gui/src/saturation_screen/SaturationPresenter.cpp b/Appli/TouchGFX/gui/src/saturation_screen/SaturationPresenter.cpp
index 46f5bb6..112e800 100644
--- a/Appli/TouchGFX/gui/src/saturation_screen/SaturationPresenter.cpp
+++ b/Appli/TouchGFX/gui/src/saturation_screen/SaturationPresenter.cpp
@@ -1,15 +1,18 @@
-#include
-#include
-
-SaturationPresenter::SaturationPresenter(SaturationView& v)
- : view(v)
-{
-}
-
-void SaturationPresenter::activate()
-{
-}
-
-void SaturationPresenter::deactivate()
-{
-}
+#include
+#include
+
+SaturationPresenter::SaturationPresenter(SaturationView& v)
+ : view(v)
+{
+
+}
+
+void SaturationPresenter::activate()
+{
+
+}
+
+void SaturationPresenter::deactivate()
+{
+
+}
diff --git a/Appli/TouchGFX/gui/src/saturation_screen/SaturationView.cpp b/Appli/TouchGFX/gui/src/saturation_screen/SaturationView.cpp
index 653839d..e145daa 100644
--- a/Appli/TouchGFX/gui/src/saturation_screen/SaturationView.cpp
+++ b/Appli/TouchGFX/gui/src/saturation_screen/SaturationView.cpp
@@ -1,7 +1,5 @@
#include
#include
-#include
-#include
SaturationView::SaturationView()
{
@@ -10,6 +8,9 @@ SaturationView::SaturationView()
void SaturationView::setupScreen()
{
SaturationViewBase::setupScreen();
+ toggleButton1.forceState(AudioEffects_GetParams()->saturation.enabled);
+ slider1.setValue((int16_t)(AudioEffects_GetParams()->saturation.drive * 100.0f));
+ slider2.setValue((int16_t)(AudioEffects_GetParams()->saturation.level * 100.0f));
}
void SaturationView::tearDownScreen()
@@ -17,26 +18,16 @@ void SaturationView::tearDownScreen()
SaturationViewBase::tearDownScreen();
}
-void SaturationView::goBack()
+void SaturationView::toggleClicked()
{
- application().gotoOverviewScreenBlockTransition();
+ AudioEffects_GetParams()->saturation.enabled = toggleButton1.getState();
}
-void SaturationView::toggleEnabled()
-{
- bool en = !AudioEffects_GetParams()->saturation.enabled;
- AudioEffects_GetParams()->saturation.enabled = en;
- enableToggle.setLabelText(touchgfx::TypedText(en ? T_ON : T_OFF));
- enableToggle.setLabelColor(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.setLabelColorPressed(en ? touchgfx::Color::getColorFromRGB(140, 190, 90) : touchgfx::Color::getColorFromRGB(200, 90, 70));
- enableToggle.invalidate();
-}
-
-void SaturationView::param1Changed(int value)
+void SaturationView::sliderDriveClicked(int value)
{
AudioEffects_GetParams()->saturation.drive = value / 100.0f;
}
-void SaturationView::param2Changed(int value)
+void SaturationView::sliderLevelClicked(int value)
{
AudioEffects_GetParams()->saturation.level = value / 100.0f;
}
diff --git a/STM32CubeIDE/Appli/.project b/STM32CubeIDE/Appli/.project
index d426f1e..f65205a 100644
--- a/STM32CubeIDE/Appli/.project
+++ b/STM32CubeIDE/Appli/.project
@@ -601,24 +601,24 @@
PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_backgrounds_800x480_gradient_summer.cpp
- Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_small_fill_normal.cpp
+ Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp
1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_small_fill_normal.cpp
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_normal.cpp
- Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.cpp
+ Application/User/generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp
1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_small_fill_pressed.cpp
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_icon_rounded_huge_fill_pressed.cpp
- Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_small_round_normal.cpp
+ Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp
1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_small_round_normal.cpp
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_normal.cpp
- Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_small_round_pressed.cpp
+ Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.cpp
1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_small_round_pressed.cpp
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_large_rounded_pressed.cpp
Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_small_rounded_normal.cpp
@@ -630,16 +630,6 @@
1
PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_small_rounded_pressed.cpp
-
- Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_tiny_round_active.cpp
- 1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_tiny_round_active.cpp
-
-
- Application/User/generated/image_glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.cpp
- 1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_button_regular_height_50_tiny_round_pressed.cpp
-
Application/User/generated/image_glass_theme_images_widgets_slider_horizontal_thick_filler_large.cpp
1
@@ -665,15 +655,25 @@
1
PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_slider_horizontal_thick_track_small.cpp
+
+ Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp
+ 1
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_off_normal.cpp
+
+
+ Application/User/generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp
+ 1
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_glass_theme_images_widgets_togglebutton_large_round_text_on_active.cpp
+
Application/User/generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp
1
PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_done_50_50_E8F6FB.svg.cpp
- Application/User/generated/image_icon_theme_images_action_input_50_50_E8F6FB.svg.cpp
+ Application/User/generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp
1
- PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_action_input_50_50_E8F6FB.svg.cpp
+ PARENT-2-PROJECT_LOC/Appli/TouchGFX/generated/images/src/__generated/image_icon_theme_images_av_music_video_50_50_E8F6FB.svg.cpp
Application/User/generated/LanguageGb.cpp