diff --git a/Changelog.md b/Changelog.md index f093a5f2..91cbd12c 100644 --- a/Changelog.md +++ b/Changelog.md @@ -4,11 +4,50 @@ 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-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.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): + - 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): + - 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): diff --git a/inc/MicroBitAudio.h b/inc/MicroBitAudio.h index c0678a66..0e56c2d4 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 @@ -190,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 6ef1527c..b5543846 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); } @@ -228,12 +224,6 @@ MicroBitAudio::~MicroBitAudio() } } -int MicroBitAudio::deepSleepCallback( deepSleepCallbackReason reason, deepSleepCallbackData *data) -{ - deactivateMic(); -} - - int MicroBitAudio::setSleep(bool doSleep) { if (doSleep) @@ -248,6 +238,7 @@ int MicroBitAudio::setSleep(bool doSleep) delete pwm; pwm = NULL; } + deactivateMic(); } else { @@ -256,6 +247,7 @@ int MicroBitAudio::setSleep(bool doSleep) status &= ~MICROBIT_AUDIO_STATUS_DEEPSLEEP; enable(); } + activateMic(); } return DEVICE_OK; 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. diff --git a/target-locked.json b/target-locked.json index 3715bfe1..4129021e 100644 --- a/target-locked.json +++ b/target-locked.json @@ -50,19 +50,19 @@ "generate_hex": true, "libraries": [ { - "branch": "219356e446f9dada87be075a9dfede4bfdd6b46a", + "branch": "da93588bc0b445a426252abd73158deafad293e1", "name": "codal-core", "type": "git", "url": "https://github.com/calliope-edu/codal-core" }, { - "branch": "2d77a3c89d14c5f4344e73511ca32086a0fcc8ad", + "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.61-master.2", + "snapshot_version": "v0.2.63", "toolchain": "ARM_GCC" -} \ No newline at end of file +}