From b25ea3f6f0935d49768c4b4b4bc5e3cfe1289ff6 Mon Sep 17 00:00:00 2001 From: jenoack Date: Fri, 21 Mar 2025 08:47:58 +0100 Subject: [PATCH] modified playing time --- vscode/singing_picture/.vscode/settings.json | 59 +++++++++++++++++++- vscode/singing_picture_serial/src/main.cpp | 8 +-- 2 files changed, 62 insertions(+), 5 deletions(-) diff --git a/vscode/singing_picture/.vscode/settings.json b/vscode/singing_picture/.vscode/settings.json index 7f0005a..0b57d3b 100644 --- a/vscode/singing_picture/.vscode/settings.json +++ b/vscode/singing_picture/.vscode/settings.json @@ -1,3 +1,60 @@ { - "svn.ignoreMissingSvnWarning": true + "svn.ignoreMissingSvnWarning": true, + "C_Cpp_Runner.cCompilerPath": "c:/wingw64/bin/gcc.exe", + "C_Cpp_Runner.cppCompilerPath": "g++", + "C_Cpp_Runner.debuggerPath": "c:/wingw64/bin/gdb.exe", + "C_Cpp_Runner.cStandard": "", + "C_Cpp_Runner.cppStandard": "", + "C_Cpp_Runner.msvcBatchPath": "C:/Program Files/Microsoft Visual Studio/VR_NR/Community/VC/Auxiliary/Build/vcvarsall.bat", + "C_Cpp_Runner.useMsvc": false, + "C_Cpp_Runner.warnings": [ + "-Wall", + "-Wextra", + "-Wpedantic", + "-Wshadow", + "-Wformat=2", + "-Wcast-align", + "-Wconversion", + "-Wsign-conversion", + "-Wnull-dereference" + ], + "C_Cpp_Runner.msvcWarnings": [ + "/W4", + "/permissive-", + "/w14242", + "/w14287", + "/w14296", + "/w14311", + "/w14826", + "/w44062", + "/w44242", + "/w14905", + "/w14906", + "/w14263", + "/w44265", + "/w14928" + ], + "C_Cpp_Runner.enableWarnings": true, + "C_Cpp_Runner.warningsAsError": false, + "C_Cpp_Runner.compilerArgs": [], + "C_Cpp_Runner.linkerArgs": [], + "C_Cpp_Runner.includePaths": [], + "C_Cpp_Runner.includeSearch": [ + "*", + "**/*" + ], + "C_Cpp_Runner.excludeSearch": [ + "**/build", + "**/build/**", + "**/.*", + "**/.*/**", + "**/.vscode", + "**/.vscode/**" + ], + "C_Cpp_Runner.useAddressSanitizer": false, + "C_Cpp_Runner.useUndefinedSanitizer": false, + "C_Cpp_Runner.useLeakSanitizer": false, + "C_Cpp_Runner.showCompilationTime": false, + "C_Cpp_Runner.useLinkTimeOptimization": false, + "C_Cpp_Runner.msvcSecureNoWarnings": false } \ No newline at end of file diff --git a/vscode/singing_picture_serial/src/main.cpp b/vscode/singing_picture_serial/src/main.cpp index 25fe598..ed5b05a 100644 --- a/vscode/singing_picture_serial/src/main.cpp +++ b/vscode/singing_picture_serial/src/main.cpp @@ -1,9 +1,9 @@ #include -#define MV_ONE_IS_PLAYING 3100 //voltage level in mV of the busy signal - if there is one player is playing -#define MS_MAX_PLAYING_LENGTH 60000 //if there is one SD card signaling busy all the time - this is the time out for the play detection -#define MS_TO_WAIT_BEFORE_NEXT_MOVE 120000 //ms to wait before new movement is valid -#define MS_TO_WAIT_BEFORE_VALID_NO_MOVEMEVENT 10000 //ms a no movement phase must be +#define MV_ONE_IS_PLAYING 3100 //voltage level in mV of the busy signal - if there is one player is playing +#define MS_MAX_PLAYING_LENGTH 150000 //if there is one SD card signaling busy all the time - this is the time out for the play detection +#define MS_TO_WAIT_BEFORE_NEXT_MOVE 2*MS_MAX_PLAYING_LENGTH //ms to wait before new movement is valid +#define MS_TO_WAIT_BEFORE_VALID_NO_MOVEMEVENT 10000 //ms a no movement phase must be #define MS_TO_WAIT_BEFORE_NEXT_PRESS 200 const uint8_t vol_poti_pin = 35;