From a600d84589a69d65fdce29557a9f17deeffb34db Mon Sep 17 00:00:00 2001 From: Jaap Korthals Altes Date: Mon, 30 Oct 2023 12:53:43 +0100 Subject: [PATCH] 7.1.6 --- Common/build.gradle | 12 ++++++------ Common/src/main/cpp/share/hooks.cpp | 4 ++++ Common/src/main/java/tk/glucodata/BUGS | 3 +++ Common/src/mobile/java/tk/glucodata/Talker.java | 1 + 4 files changed, 14 insertions(+), 6 deletions(-) diff --git a/Common/build.gradle b/Common/build.gradle index 694e127b..9be84ec0 100644 --- a/Common/build.gradle +++ b/Common/build.gradle @@ -77,8 +77,8 @@ android { // targetSdk 26 //****** Zet op rollout op 100% ****** - versionCode 423 //LIBRE2ONLY - versionName '7.1.5-no3' + versionCode 425 //LIBRE2ONLY + versionName '7.1.6-no3' dimension 'libreVersion' buildConfigField 'int', 'libreVersion', '2' } @@ -88,9 +88,9 @@ android { minSdk 26 // minSdk 23 dimension 'libreVersion' - versionCode 423 //LIBRE3 + versionCode 425 //LIBRE3 //****** Zet op rollout op 100% ****** - versionName '7.1.5' + versionName '7.1.6' buildConfigField 'int', 'libreVersion', '3' externalNativeBuild.cmake { @@ -107,9 +107,9 @@ android { // targetSdk 30 dimension 'wearos' minSdk 26 - versionCode 424 //WATCH + versionCode 426 //WATCH //****** Zet op rollout op 100% ****** - versionName '7.1.5-wear' + versionName '7.1.6-wear' signingConfig signingConfigs.alg // buildConfigField 'int', 'targetSDK', "$targetSdk" diff --git a/Common/src/main/cpp/share/hooks.cpp b/Common/src/main/cpp/share/hooks.cpp index 43f94b71..6f8d5ed8 100644 --- a/Common/src/main/cpp/share/hooks.cpp +++ b/Common/src/main/cpp/share/hooks.cpp @@ -160,11 +160,13 @@ struct pthread_arg { void * origarg; }; static void ioreadyhandler(int sig) { +#ifndef NOLOG pid_t pid= syscall(SYS_getpid); pid_t tid= syscall(SYS_gettid); char buf[80]; prctl(PR_GET_NAME, buf, 0, 0, 0); LOGGER("SIGCHLD pid=%d tid=%d %s\n",pid,tid,buf); +#endif } #ifdef FINDHANDLE #include @@ -244,8 +246,10 @@ extern "C" VISIBLE int pthread_Detach(pthread_t thread) { return res; } void *pstart_routine( void * arg) { +#ifndef NOLOG signal(SIGCHLD,ioreadyhandler); LOGAR("pstart_routine"); +#endif pthread_arg *myarg=reinterpret_cast(arg); void *res=myarg->start_routine(myarg->origarg); endroutine=true; diff --git a/Common/src/main/java/tk/glucodata/BUGS b/Common/src/main/java/tk/glucodata/BUGS index 6ef91b19..ff56bb0b 100644 --- a/Common/src/main/java/tk/glucodata/BUGS +++ b/Common/src/main/java/tk/glucodata/BUGS @@ -1,3 +1,6 @@ +Changing speaker werkt niet goed. +Voorlees lijst item onduidelijk. Oplossing: + tijd na datum Beperk aantal connecties webserver? Resend data wordt niet doorgezonden. diff --git a/Common/src/mobile/java/tk/glucodata/Talker.java b/Common/src/mobile/java/tk/glucodata/Talker.java index 14414194..b4ac36fd 100644 --- a/Common/src/mobile/java/tk/glucodata/Talker.java +++ b/Common/src/mobile/java/tk/glucodata/Talker.java @@ -372,6 +372,7 @@ public void onNothingSelected (AdapterView parent) { var talk=SuperGattCallback.talker; if(talk!=null) { talk.setvalues(); + talk.setvoice(); talk.speak(say); return; }