From e38eed627021da278e4601c66f7b4660eaaff123 Mon Sep 17 00:00:00 2001 From: RogueMaster Date: Fri, 23 Dec 2022 15:43:57 -0500 Subject: [PATCH 1/2] Update buildRelease.sh --- buildRelease.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/buildRelease.sh b/buildRelease.sh index 7a0516026..56d5bd56f 100755 --- a/buildRelease.sh +++ b/buildRelease.sh @@ -6,6 +6,6 @@ TIME_VAR=`date +%H%M` VER_VAR=`cat scripts/version.py | awk '/VERSION/{ gsub(/[",]/,"",$2); print $2}' | tail -1` HASH_VAR=`git rev-parse \`git branch -r --sort=committerdate | tail -1\` | awk '{print substr($0,1,7)}' | tail -1` mv dist/f7-C/f7-update-RM420FAP "RM$DATE_VAR-$TIME_VAR" -zip -rq "RM$DATE_VAR-$TIME_VAR-$HASH_VAR.zip" "$RMDATE_VAR-$TIME_VAR" -tar -czf "RM$DATE_VAR-$TIME_VAR-$HASH_VAR.tgz" "RM$DATE_VAR-$TIME_VAR" -echo " BUILD COMPLETED, ZIP AND TGZ GENERATED FOR RM$DATE_VAR-$TIME_VAR-$HASH_VAR" +zip -rq "RM$DATE_VAR-$TIME_VAR-$VER_VAR-$HASH_VAR.zip" "$RMDATE_VAR-$TIME_VAR" +tar -czf "RM$DATE_VAR-$TIME_VAR-$VER_VAR-$HASH_VAR.tgz" "RM$DATE_VAR-$TIME_VAR" +echo " BUILD COMPLETED, ZIP AND TGZ GENERATED FOR RM$DATE_VAR-$TIME_VAR-$VER_VAR-$HASH_VAR" From 9974be830bc72c1b5bf350bf3480c861a15ac13a Mon Sep 17 00:00:00 2001 From: VerstreuteSeele Date: Fri, 23 Dec 2022 23:24:01 +0100 Subject: [PATCH 2/2] Update dolphin_state.c --- applications/services/dolphin/helpers/dolphin_state.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/applications/services/dolphin/helpers/dolphin_state.c b/applications/services/dolphin/helpers/dolphin_state.c index 5cfaec6b4..806259b69 100644 --- a/applications/services/dolphin/helpers/dolphin_state.c +++ b/applications/services/dolphin/helpers/dolphin_state.c @@ -83,7 +83,7 @@ uint64_t dolphin_state_timestamp() { bool dolphin_state_is_levelup(uint32_t icounter) { for (int i = 0; i<30; ++i) { - if ((icounter = level_array[i])) { + if ((icounter == level_array[i])) { return true; } };