From 7d5d73f63e7d966bbeec8d33e0b0f0ea2ce3a196 Mon Sep 17 00:00:00 2001 From: Carlos Pereira Atencio Date: Tue, 26 Sep 2023 13:36:12 +0100 Subject: [PATCH 01/13] Update target-locked.json codal-core commit to fix builds. There was build issues when DMESG_SERIAL_DEBUG was not defined. --- target-locked.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-locked.json b/target-locked.json index d6fa5ef9..0d69f497 100644 --- a/target-locked.json +++ b/target-locked.json @@ -50,7 +50,7 @@ "generate_hex": true, "libraries": [ { - "branch": "d7ea466ffe92856eaec941d309e0a45747feeaca", + "branch": "05aca3c01833fb5729d841b41dacb8bee2b9a371", "name": "codal-core", "type": "git", "url": "https://github.com/lancaster-university/codal-core" From 9ebab1532012c0cc0b44312c4fa5b70ed967eca2 Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Thu, 28 Sep 2023 15:31:22 +0100 Subject: [PATCH 02/13] Snapshot v0.2.62 --- target-locked.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/target-locked.json b/target-locked.json index 0d69f497..8ce0b1ff 100644 --- a/target-locked.json +++ b/target-locked.json @@ -50,13 +50,13 @@ "generate_hex": true, "libraries": [ { - "branch": "05aca3c01833fb5729d841b41dacb8bee2b9a371", + "branch": "b06b6031df2f3e9fd9459fbe13a0db95a5cc47f0", "name": "codal-core", "type": "git", "url": "https://github.com/lancaster-university/codal-core" }, { - "branch": "2d77a3c89d14c5f4344e73511ca32086a0fcc8ad", + "branch": "099f15ab7932ca902976262b989890f0edb3b1ce", "name": "codal-nrf52", "type": "git", "url": "https://github.com/lancaster-university/codal-nrf52" @@ -71,6 +71,6 @@ "linker_flags": "-Wl,--no-wchar-size-warning -Wl,--gc-sections -Wl,--wrap,atexit -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wl,--start-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys -Wl,--end-group", "post_process": "", "processor": "NRF52833", - "snapshot_version": "v0.2.61-master.2", + "snapshot_version": "v0.2.62", "toolchain": "ARM_GCC" } \ No newline at end of file From 348afc4c2de5c602b40b79ae63c377909404c96f Mon Sep 17 00:00:00 2001 From: Github Actions Date: Thu, 28 Sep 2023 14:31:46 +0000 Subject: [PATCH 03/13] Updated the Changelog --- Changelog.md | 21 +++++++++++++++++++-- 1 file changed, 19 insertions(+), 2 deletions(-) diff --git a/Changelog.md b/Changelog.md index f093a5f2..80ba45b2 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,11 +4,28 @@ For official release notes, please see Releases.md The current tag uses the following library versions: - - codal-core = https://github.com/lancaster-university/codal-core/tree/d7ea466ffe92856eaec941d309e0a45747feeaca - - codal-nrf52 = https://github.com/lancaster-university/codal-nrf52/tree/2d77a3c89d14c5f4344e73511ca32086a0fcc8ad + - codal-core = https://github.com/lancaster-university/codal-core/tree/b06b6031df2f3e9fd9459fbe13a0db95a5cc47f0 + - codal-nrf52 = https://github.com/lancaster-university/codal-nrf52/tree/099f15ab7932ca902976262b989890f0edb3b1ce - codal-microbit-nrf5sdk = https://github.com/microbit-foundation/codal-microbit-nrf5sdk/tree/f98e1a9325acef9de52416b3e30cc820531b6699 +## [v0.2.62](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.61...v0.2.62) + +Carlos Pereira Atencio (1): + - Update target-locked.json codal-core commit to fix builds. + +Dr John Vidler (5): + - Snapshot v0.2.61-master.0 + - Snapshot v0.2.61-master.1 + - Snapshot v0.2.61-master.2 + - Merge branch 'master' of ssh://github.com/lancaster-university/codal-microbit-v2 + - Snapshot v0.2.62 + +Github Actions (3): + - Updated the Changelog + - Updated the Changelog + - Updated the Changelog + ## [v0.2.61](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.60...v0.2.61) Dr John Vidler (4): From 1370026f4bfbf96b204fa901f98d1f166f91b078 Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Thu, 12 Oct 2023 15:39:29 +0100 Subject: [PATCH 04/13] Removed deactivateLevelSPL entirely as per codal-microbit-v2 issue #222 --- inc/MicroBitAudio.h | 5 ----- source/MicroBitAudio.cpp | 4 ---- 2 files changed, 9 deletions(-) diff --git a/inc/MicroBitAudio.h b/inc/MicroBitAudio.h index c0678a66..0a0d70c3 100644 --- a/inc/MicroBitAudio.h +++ b/inc/MicroBitAudio.h @@ -112,11 +112,6 @@ namespace codal */ void deactivateMic(); - /** - * Dectivate level detector SPL - */ - void deactivateLevelSPL(); - /** * Set normaliser gain * @param gain value to set the microphone gain to diff --git a/source/MicroBitAudio.cpp b/source/MicroBitAudio.cpp index 6ef1527c..93a22266 100644 --- a/source/MicroBitAudio.cpp +++ b/source/MicroBitAudio.cpp @@ -115,10 +115,6 @@ void MicroBitAudio::deactivateMic(){ runmic.setHighDrive(false); } -void MicroBitAudio::deactivateLevelSPL(){ - levelSPL->activateForEvents( false ); -} - void MicroBitAudio::setMicrophoneGain(int gain){ processor->setGain(gain/100); } From 9e6f027e92450017bc37dcf87d584dcbf6b1133e Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Wed, 1 Nov 2023 10:41:07 +0000 Subject: [PATCH 05/13] Fix for the microphone failing to wake after a sleep event --- inc/MicroBitAudio.h | 5 ----- source/MicroBitAudio.cpp | 8 ++------ 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/inc/MicroBitAudio.h b/inc/MicroBitAudio.h index 0a0d70c3..0e56c2d4 100644 --- a/inc/MicroBitAudio.h +++ b/inc/MicroBitAudio.h @@ -185,11 +185,6 @@ namespace codal */ bool isPinEnabled(); - /** - * Hook deep sleep events so we can manually turn off/on the microphone power pin. - */ - int deepSleepCallback( deepSleepCallbackReason reason, deepSleepCallbackData *data); - /** * Puts the component in (or out of) sleep (low power) mode. */ diff --git a/source/MicroBitAudio.cpp b/source/MicroBitAudio.cpp index 93a22266..b5543846 100644 --- a/source/MicroBitAudio.cpp +++ b/source/MicroBitAudio.cpp @@ -224,12 +224,6 @@ MicroBitAudio::~MicroBitAudio() } } -int MicroBitAudio::deepSleepCallback( deepSleepCallbackReason reason, deepSleepCallbackData *data) -{ - deactivateMic(); -} - - int MicroBitAudio::setSleep(bool doSleep) { if (doSleep) @@ -244,6 +238,7 @@ int MicroBitAudio::setSleep(bool doSleep) delete pwm; pwm = NULL; } + deactivateMic(); } else { @@ -252,6 +247,7 @@ int MicroBitAudio::setSleep(bool doSleep) status &= ~MICROBIT_AUDIO_STATUS_DEEPSLEEP; enable(); } + activateMic(); } return DEVICE_OK; From bdfbd6a6e12739e8f5dc3b20d9d3545626c6ce5b Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 11:20:58 +0000 Subject: [PATCH 06/13] Commented out a temporary alias for the face/logo touch button, staged for removal --- model/MicroBitIO.cpp | 4 ++-- model/MicroBitIO.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/MicroBitIO.cpp b/model/MicroBitIO.cpp index aa680dd9..96a6d710 100644 --- a/model/MicroBitIO.cpp +++ b/model/MicroBitIO.cpp @@ -89,8 +89,8 @@ MicroBitIO::MicroBitIO(NRF52ADC &a, TouchSensor &s) : col4(P6), col5(P10), buttonA(P5), - buttonB(P11), - face(logo) + buttonB(P11)//, + //face(logo) { pins = 33; NRF52Pin::adc = &a; diff --git a/model/MicroBitIO.h b/model/MicroBitIO.h index a3cda84c..a8b9b169 100644 --- a/model/MicroBitIO.h +++ b/model/MicroBitIO.h @@ -413,7 +413,7 @@ namespace codal NRF52Pin& col5; NRF52Pin& buttonA; NRF52Pin& buttonB; - NRF52Pin& face; // Temporary compat for MakeCode extension. Delete ASAP. + //NRF52Pin& face; // Temporary compat for MakeCode extension. Delete ASAP. /** From 06a8f96ed453b4bcac6012cd6d04eacb9e3e65eb Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 16:07:39 +0000 Subject: [PATCH 07/13] Revert for the face alias removal, for v0.2.63 release --- model/MicroBitIO.cpp | 4 ++-- model/MicroBitIO.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/model/MicroBitIO.cpp b/model/MicroBitIO.cpp index 96a6d710..aa680dd9 100644 --- a/model/MicroBitIO.cpp +++ b/model/MicroBitIO.cpp @@ -89,8 +89,8 @@ MicroBitIO::MicroBitIO(NRF52ADC &a, TouchSensor &s) : col4(P6), col5(P10), buttonA(P5), - buttonB(P11)//, - //face(logo) + buttonB(P11), + face(logo) { pins = 33; NRF52Pin::adc = &a; diff --git a/model/MicroBitIO.h b/model/MicroBitIO.h index a8b9b169..a3cda84c 100644 --- a/model/MicroBitIO.h +++ b/model/MicroBitIO.h @@ -413,7 +413,7 @@ namespace codal NRF52Pin& col5; NRF52Pin& buttonA; NRF52Pin& buttonB; - //NRF52Pin& face; // Temporary compat for MakeCode extension. Delete ASAP. + NRF52Pin& face; // Temporary compat for MakeCode extension. Delete ASAP. /** From b410f946f30a9a334377d67bd72098811163b49b Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 16:09:06 +0000 Subject: [PATCH 08/13] Snapshot v0.2.63 --- target-locked.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/target-locked.json b/target-locked.json index 8ce0b1ff..ad5b2501 100644 --- a/target-locked.json +++ b/target-locked.json @@ -50,19 +50,19 @@ "generate_hex": true, "libraries": [ { - "branch": "b06b6031df2f3e9fd9459fbe13a0db95a5cc47f0", + "branch": "63f017fdcd12aca769264c36fe47e6071a40e502", "name": "codal-core", "type": "git", "url": "https://github.com/lancaster-university/codal-core" }, { - "branch": "099f15ab7932ca902976262b989890f0edb3b1ce", + "branch": "0643733703b4f8f788af81a996f40d1f1a1527bc", "name": "codal-nrf52", "type": "git", "url": "https://github.com/lancaster-university/codal-nrf52" }, { - "branch": "f98e1a9325acef9de52416b3e30cc820531b6699", + "branch": "5714cbe338c3544793bbb841a7ae81708a3ffae1", "name": "codal-microbit-nrf5sdk", "type": "git", "url": "https://github.com/microbit-foundation/codal-microbit-nrf5sdk" @@ -71,6 +71,6 @@ "linker_flags": "-Wl,--no-wchar-size-warning -Wl,--gc-sections -Wl,--wrap,atexit -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wl,--start-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys -Wl,--end-group", "post_process": "", "processor": "NRF52833", - "snapshot_version": "v0.2.62", + "snapshot_version": "v0.2.63", "toolchain": "ARM_GCC" } \ No newline at end of file From 358d4f96cc45f4353b92f4a4105b8cadb7c1f138 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 6 Nov 2023 16:09:24 +0000 Subject: [PATCH 09/13] Updated the Changelog --- Changelog.md | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/Changelog.md b/Changelog.md index 80ba45b2..fa1beb8f 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,11 +4,23 @@ For official release notes, please see Releases.md The current tag uses the following library versions: - - codal-core = https://github.com/lancaster-university/codal-core/tree/b06b6031df2f3e9fd9459fbe13a0db95a5cc47f0 - - codal-nrf52 = https://github.com/lancaster-university/codal-nrf52/tree/099f15ab7932ca902976262b989890f0edb3b1ce - - codal-microbit-nrf5sdk = https://github.com/microbit-foundation/codal-microbit-nrf5sdk/tree/f98e1a9325acef9de52416b3e30cc820531b6699 + - codal-core = https://github.com/lancaster-university/codal-core/tree/63f017fdcd12aca769264c36fe47e6071a40e502 + - codal-nrf52 = https://github.com/lancaster-university/codal-nrf52/tree/0643733703b4f8f788af81a996f40d1f1a1527bc + - codal-microbit-nrf5sdk = https://github.com/microbit-foundation/codal-microbit-nrf5sdk/tree/5714cbe338c3544793bbb841a7ae81708a3ffae1 +## [v0.2.63](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.62...v0.2.63) + +Dr John Vidler (5): + - Removed deactivateLevelSPL entirely as per codal-microbit-v2 issue #222 + - Fix for the microphone failing to wake after a sleep event + - Commented out a temporary alias for the face/logo touch button, staged for removal + - Revert for the face alias removal, for v0.2.63 release + - Snapshot v0.2.63 + +Github Actions (1): + - Updated the Changelog + ## [v0.2.62](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.61...v0.2.62) Carlos Pereira Atencio (1): From 17acafdd95920aba520fb61d7939bc602b86209c Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 16:13:32 +0000 Subject: [PATCH 10/13] Reverted the power saving for the LED Matrix to avoid strange issues with Pins. --- source/NRF52LedMatrix.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/source/NRF52LedMatrix.cpp b/source/NRF52LedMatrix.cpp index 89244dcd..24bdab50 100644 --- a/source/NRF52LedMatrix.cpp +++ b/source/NRF52LedMatrix.cpp @@ -189,13 +189,14 @@ void NRF52LEDMatrix::disable() // Disable the timer that drivers the display timer.disable(); + timer.disableIRQ(); // Disable GPIOTE control of the display pins // FIXME: When GPIOTE is disabled here "system off" consumes almost 1mA @ 3V // It's unclear how changing this peripheral causes the additional power consumption // https://github.com/lancaster-university/codal-microbit-v2/issues/30 - // for (int column = 0; column < matrixMap.columns; column++) - // NRF_GPIOTE->CONFIG[gpiote[column]] = 0; + for (int column = 0; column < matrixMap.columns; column++) + NRF_GPIOTE->CONFIG[gpiote[column]] = 0; // Put all pins into high impedance mode. From 692bc1e56fd142f7df63b1c810929b1efdf50678 Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 16:14:34 +0000 Subject: [PATCH 11/13] Snapshot v0.2.64 --- target-locked.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/target-locked.json b/target-locked.json index ad5b2501..098d3f7a 100644 --- a/target-locked.json +++ b/target-locked.json @@ -71,6 +71,6 @@ "linker_flags": "-Wl,--no-wchar-size-warning -Wl,--gc-sections -Wl,--wrap,atexit -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wl,--start-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys -Wl,--end-group", "post_process": "", "processor": "NRF52833", - "snapshot_version": "v0.2.63", + "snapshot_version": "v0.2.64", "toolchain": "ARM_GCC" } \ No newline at end of file From 7008a3182ee1bfba17c86f30b5e270308a08ee37 Mon Sep 17 00:00:00 2001 From: Github Actions Date: Mon, 6 Nov 2023 16:15:04 +0000 Subject: [PATCH 12/13] Updated the Changelog --- Changelog.md | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Changelog.md b/Changelog.md index fa1beb8f..91cbd12c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -9,6 +9,16 @@ The current tag uses the following library versions: - codal-microbit-nrf5sdk = https://github.com/microbit-foundation/codal-microbit-nrf5sdk/tree/5714cbe338c3544793bbb841a7ae81708a3ffae1 +## [v0.2.64](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.63...v0.2.64) + +Dr John Vidler (3): + - Reverted the power saving for the LED Matrix to avoid strange issues with Pins. + - Merge branch 'master' of ssh://github.com/lancaster-university/codal-microbit-v2 + - Snapshot v0.2.64 + +Github Actions (1): + - Updated the Changelog + ## [v0.2.63](https://github.com/lancaster-university/codal-microbit-v2/compare/v0.2.62...v0.2.63) Dr John Vidler (5): From f149318b769343a6db79e5f280af13eaf46de807 Mon Sep 17 00:00:00 2001 From: Dr John Vidler Date: Mon, 6 Nov 2023 16:21:08 +0000 Subject: [PATCH 13/13] Updated target-locked with the corrected tag version --- target-locked.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/target-locked.json b/target-locked.json index 098d3f7a..b9097603 100644 --- a/target-locked.json +++ b/target-locked.json @@ -71,6 +71,6 @@ "linker_flags": "-Wl,--no-wchar-size-warning -Wl,--gc-sections -Wl,--wrap,atexit -mcpu=cortex-m4 -mthumb -mfpu=fpv4-sp-d16 -mfloat-abi=softfp -Wl,--start-group -lstdc++ -lsupc++ -lm -lc -lgcc -lnosys -Wl,--end-group", "post_process": "", "processor": "NRF52833", - "snapshot_version": "v0.2.64", + "snapshot_version": "v0.2.63", "toolchain": "ARM_GCC" -} \ No newline at end of file +}