From f02e73c1c46f7896d16de98704a43aeaf19912a0 Mon Sep 17 00:00:00 2001 From: Nicholas Rodrigues Lordello Date: Thu, 22 Aug 2024 14:54:41 +0200 Subject: [PATCH 1/3] Update Devcontainer Dockerfile This PR updates the .devcontainer Dockerfile which was no longer working. Attempting to build an image from the Dockerfile would result in an error: ``` E: The repository 'http://archive.ubuntu.com/ubuntu kinetic Release' does not have a Release file. ``` AFAIU, this is because the 22.04 release is no longer supported. I changed the base image to the current LTS release, which should remain supported until 2029. In addition, the Dockerfile is also modified to install `emscripten` APT package. While this is not the recommented installation method from the Emscripten docs, it is much more convenient and works enough to build the simulator using the resulting Docker image. --- .devcontainer/Dockerfile | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 55565a07..4f406566 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,6 +1,4 @@ -FROM ubuntu:22.10 - -# TODO: install emscripten (https://emscripten.org/docs/getting_started/downloads.html) +FROM ubuntu:24.04 # TODO: Clean this up once buildkit is supported gracefully in devcontainers # https://github.com/microsoft/vscode-remote-release/issues/1409 @@ -27,7 +25,9 @@ RUN apt-get update \ # ca certs need to be available for fetching git submodules ca-certificates \ # python is used to convert binaries to uf2 files - python3 python-is-python3 + python3 python-is-python3 \ + # emscripten for building simulator + emscripten # Download and verify both x86-64 and aarch64 toolchains. This is unfortunate and # slows down the build, but it's a clean-ish option until buildkit can be used. @@ -47,4 +47,4 @@ RUN /bin/sh -c 'set -ex && \ fi' RUN rm $X86_64_TOOLCHAIN_FILENAME -RUN rm $AARCH64_TOOLCHAIN_FILENAME \ No newline at end of file +RUN rm $AARCH64_TOOLCHAIN_FILENAME From 77fb6202c9637d83aef7ebdececd0ffb34157bca Mon Sep 17 00:00:00 2001 From: metehan-arslan <44465987+metehan-arslan@users.noreply.github.com> Date: Tue, 27 Aug 2024 13:56:36 +0300 Subject: [PATCH 2/3] Update SIGNAL_TUNE_KIM_POSSIBLE notes --- movement/movement_custom_signal_tunes.h | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/movement/movement_custom_signal_tunes.h b/movement/movement_custom_signal_tunes.h index cc21a5a8..e0f21af1 100644 --- a/movement/movement_custom_signal_tunes.h +++ b/movement/movement_custom_signal_tunes.h @@ -70,16 +70,15 @@ int8_t signal_tune[] = { #ifdef SIGNAL_TUNE_KIM_POSSIBLE int8_t signal_tune[] = { BUZZER_NOTE_G7, 6, - BUZZER_NOTE_REST, 1, - BUZZER_NOTE_G4, 3, + BUZZER_NOTE_G4, 2, BUZZER_NOTE_REST, 5, BUZZER_NOTE_G7, 6, - BUZZER_NOTE_REST, 1, - BUZZER_NOTE_G4, 3, + BUZZER_NOTE_G4, 2, BUZZER_NOTE_REST, 5, BUZZER_NOTE_A7SHARP_B7FLAT, 6, BUZZER_NOTE_REST, 2, - BUZZER_NOTE_G7, 6, + BUZZER_NOTE_G7, 6, + BUZZER_NOTE_G4, 2, 0 }; #endif // SIGNAL_TUNE_KIM_POSSIBLE From 2a194dfa699487c4814ada4da31f1711afba7ea4 Mon Sep 17 00:00:00 2001 From: metehan-arslan <44465987+metehan-arslan@users.noreply.github.com> Date: Wed, 28 Aug 2024 20:40:32 +0000 Subject: [PATCH 3/3] style: remove extra whitespace --- movement/movement_custom_signal_tunes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/movement/movement_custom_signal_tunes.h b/movement/movement_custom_signal_tunes.h index e0f21af1..27c1d397 100644 --- a/movement/movement_custom_signal_tunes.h +++ b/movement/movement_custom_signal_tunes.h @@ -77,7 +77,7 @@ int8_t signal_tune[] = { BUZZER_NOTE_REST, 5, BUZZER_NOTE_A7SHARP_B7FLAT, 6, BUZZER_NOTE_REST, 2, - BUZZER_NOTE_G7, 6, + BUZZER_NOTE_G7, 6, BUZZER_NOTE_G4, 2, 0 };