From 8652c42dc2bfb4d0acfe8415fa9768284496797b Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Thu, 25 Feb 2021 16:18:08 +0000
Subject: [PATCH 1/6] added devcontainer files

---
 .devcontainer/Dockerfile        | 43 ++++++++++++++++++
 .devcontainer/build.sh          | 78 +++++++++++++++++++++++++++++++++
 .devcontainer/devcontainer.json | 32 ++++++++++++++
 3 files changed, 153 insertions(+)
 create mode 100644 .devcontainer/Dockerfile
 create mode 100755 .devcontainer/build.sh
 create mode 100644 .devcontainer/devcontainer.json

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
new file mode 100644
index 0000000000..c6a3588f57
--- /dev/null
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu:18.04
+
+ARG DEBIAN_FRONTEND=noninteractive
+RUN apt-get update -qq \
+    && apt-get install -y \
+# x86_64 / generic packages
+      bash \
+      build-essential \
+      cmake \
+      git \
+      make \
+      python3 \
+      python3-pip \
+      tar \
+      unzip \
+      wget \ 
+      curl \
+# aarch64 packages
+      libffi-dev \
+      libssl-dev \
+      python3-dev \ 
+      rustc \
+    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
+
+RUN adduser infinitime
+
+RUN pip3 install adafruit-nrfutil
+# required for McuBoot
+RUN pip3 install setuptools_rust
+
+WORKDIR /opt/
+# build.sh knows how to compile
+COPY build.sh .
+
+# Lets get each in a separate docker layer for better downloads
+# GCC
+RUN bash -c "source /opt/build.sh; GetGcc;"
+# NrfSdk
+RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+# McuBoot
+RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+
+ENV SOURCES_DIR /workspaces/Pinetime
diff --git a/.devcontainer/build.sh b/.devcontainer/build.sh
new file mode 100755
index 0000000000..8f0d0fa94c
--- /dev/null
+++ b/.devcontainer/build.sh
@@ -0,0 +1,78 @@
+#!/bin/bash
+(return 0 2>/dev/null) && SOURCED="true" || SOURCED="false"
+export LC_ALL=C.UTF-8
+export LANG=C.UTF-8
+set -x
+set -e
+
+# Default locations if the var isn't already set
+export TOOLS_DIR="${TOOLS_DIR:=/opt}"
+export SOURCES_DIR="${SOURCES_DIR:=/sources}"
+export BUILD_DIR="${BUILD_DIR:=$SOURCES_DIR/build}"
+export OUTPUT_DIR="${OUTPUT_DIR:=$BUILD_DIR/output}"
+
+export BUILD_TYPE=${BUILD_TYPE:=Release}
+export GCC_ARM_VER=${GCC_ARM_VER:="gcc-arm-none-eabi-9-2020-q2-update"}
+export NRF_SDK_VER=${NRF_SDK_VER:="nRF5_SDK_15.3.0_59ac345"}
+
+MACHINE="$(uname -m)"
+[[ "$MACHINE" == "arm64" ]] && MACHINE="aarch64"
+
+main() {
+  local target="$1"
+
+  mkdir -p "$TOOLS_DIR"
+  
+  [[ ! -d "$TOOLS_DIR/$GCC_ARM_VER" ]] && GetGcc
+  [[ ! -d "$TOOLS_DIR/$NRF_SDK_VER" ]] && GetNrfSdk
+  [[ ! -d "$TOOLS_DIR/mcuboot" ]] && GetMcuBoot
+
+  mkdir -p "$BUILD_DIR"
+
+  CmakeGenerate
+  CmakeBuild $target
+  BUILD_RESULT=$? 
+  if [ "$DISABLE_POSTBUILD" != "true" -a "$BUILD_RESULT" == 0 ]; then
+    source "$BUILD_DIR/post_build.sh"
+  fi
+}
+
+GetGcc() {
+  GCC_SRC="$GCC_ARM_VER-$MACHINE-linux.tar.bz"
+  wget -q https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/$GCC_SRC -O - | tar -xj -C $TOOLS_DIR/
+}
+
+GetMcuBoot() {
+  git clone https://github.com/JuulLabs-OSS/mcuboot.git "$TOOLS_DIR/mcuboot"
+  pip3 install -r "$TOOLS_DIR/mcuboot/scripts/requirements.txt"
+}
+
+GetNrfSdk() {
+  wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/$NRF_SDK_VER.zip" -O /tmp/$NRF_SDK_VER
+  unzip -q /tmp/$NRF_SDK_VER -d "$TOOLS_DIR/"
+  rm /tmp/$NRF_SDK_VER
+}
+
+CmakeGenerate() {
+  # We can swap the CD and trailing SOURCES_DIR for -B and -S respectively
+  # once we go to newer CMake (Ubuntu 18.10 gives us CMake 3.10)
+  cd "$BUILD_DIR"
+
+  cmake -G "Unix Makefiles" \
+    -DCMAKE_BUILD_TYPE=$BUILD_TYPE \
+    -DUSE_OPENOCD=1 \
+    -DARM_NONE_EABI_TOOLCHAIN_PATH="$TOOLS_DIR/$GCC_ARM_VER" \
+    -DNRF5_SDK_PATH="$TOOLS_DIR/$NRF_SDK_VER" \
+    "$SOURCES_DIR"
+  cmake -L -N .
+}
+
+CmakeBuild() {
+  local target="$1"
+  [[ -n "$target" ]] && target="--target $target"
+  if cmake --build "$BUILD_DIR" --config $BUILD_TYPE $target -- -j$(nproc)
+    then return 0; else return 1; 
+  fi
+}
+
+[[ $SOURCED == "false" ]] && main "$@" || echo "Sourced!"
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
new file mode 100644
index 0000000000..fb81d28937
--- /dev/null
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,32 @@
+// For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.154.2/containers/cpp
+{
+	// "name": "Pinetime",
+	// "image": "feabhas/pinetime-dev"
+	"build": {
+		"dockerfile": "Dockerfile",
+		// Update 'VARIANT' to pick an Debian / Ubuntu OS version: debian-10, debian-9, ubuntu-20.04, ubuntu-18.04
+		// "args": { "VARIANT": "ubuntu-20.04" }
+	},
+	"runArgs": [ "--cap-add=SYS_PTRACE", "--security-opt", "seccomp=unconfined"],
+
+	// Set *default* container specific settings.json values on container create.
+	"settings": { 
+		"terminal.integrated.shell.linux": "/bin/bash"
+	},
+
+	// Add the IDs of extensions you want installed when the container is created.
+	"extensions": [
+		"ms-vscode.cpptools"
+	],
+
+	// Use 'forwardPorts' to make a list of ports inside the container available locally.
+	// "forwardPorts": [],
+
+	// Use 'postCreateCommand' to run commands after the container is created.
+	// "postCreateCommand": "gcc -v",
+
+	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+	"remoteUser": "infinitime"
+}
\ No newline at end of file

From 764548018826d6d9c5f88e1c22f541f3c0891d1d Mon Sep 17 00:00:00 2001
From: "AzureAD\\NiallCooling" <niall.cooling@feabhas.com>
Date: Thu, 25 Feb 2021 17:16:01 +0000
Subject: [PATCH 2/6] removed dependency on build.sh

---
 .devcontainer/Dockerfile | 17 ++++++++++++-----
 1 file changed, 12 insertions(+), 5 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index c6a3588f57..7e96152824 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -22,8 +22,6 @@ RUN apt-get update -qq \
       rustc \
     && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;
 
-RUN adduser infinitime
-
 RUN pip3 install adafruit-nrfutil
 # required for McuBoot
 RUN pip3 install setuptools_rust
@@ -34,10 +32,19 @@ COPY build.sh .
 
 # Lets get each in a separate docker layer for better downloads
 # GCC
-RUN bash -c "source /opt/build.sh; GetGcc;"
+# RUN bash -c "source /opt/build.sh; GetGcc;"
+RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O - | tar -xj -C /opt
+# RUN rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
 # NrfSdk
-RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+# RUN bash -c "source /opt/build.sh; GetNrfSdk;"
+RUN wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip" -O /tmp/nRF5_SDK_15.3.0_59ac345
+RUN unzip -q /tmp/nRF5_SDK_15.3.0_59ac345 -d /opt
+RUN rm /tmp/nRF5_SDK_15.3.0_59ac345
 # McuBoot
-RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+# RUN bash -c "source /opt/build.sh; GetMcuBoot;"
+RUN git clone https://github.com/JuulLabs-OSS/mcuboot.git
+RUN pip3 install -r ./mcuboot/scripts/requirements.txt
+
+RUN adduser infinitime
 
 ENV SOURCES_DIR /workspaces/Pinetime

From 68f30bd5c3b409385d67caee9dc2b2366dbe3639 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Thu, 25 Feb 2021 17:49:40 +0000
Subject: [PATCH 3/6] macOS and Win10 dockerfile

---
 .devcontainer/Dockerfile              | 5 +++--
 .devcontainer/create_build_openocd.sh | 3 +++
 .devcontainer/devcontainer.json       | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)
 create mode 100755 .devcontainer/create_build_openocd.sh

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 7e96152824..2c223bc1b4 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -27,14 +27,15 @@ RUN pip3 install adafruit-nrfutil
 RUN pip3 install setuptools_rust
 
 WORKDIR /opt/
-# build.sh knows how to compile
+# build.sh knows how to compile but it problimatic on Win10
 COPY build.sh .
+# create_build_openocd.sh uses cmake to crate to build directory
+COPY create_build_openocd.sh .
 
 # Lets get each in a separate docker layer for better downloads
 # GCC
 # RUN bash -c "source /opt/build.sh; GetGcc;"
 RUN wget https://developer.arm.com/-/media/Files/downloads/gnu-rm/9-2020q2/gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2 -O - | tar -xj -C /opt
-# RUN rm gcc-arm-none-eabi-9-2020-q2-update-x86_64-linux.tar.bz2
 # NrfSdk
 # RUN bash -c "source /opt/build.sh; GetNrfSdk;"
 RUN wget -q "https://developer.nordicsemi.com/nRF5_SDK/nRF5_SDK_v15.x.x/nRF5_SDK_15.3.0_59ac345.zip" -O /tmp/nRF5_SDK_15.3.0_59ac345
diff --git a/.devcontainer/create_build_openocd.sh b/.devcontainer/create_build_openocd.sh
new file mode 100755
index 0000000000..860ffa1f72
--- /dev/null
+++ b/.devcontainer/create_build_openocd.sh
@@ -0,0 +1,3 @@
+#!/bin/bash
+rm -rf build/
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index fb81d28937..1740a8e40b 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -24,7 +24,7 @@
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "gcc -v",
+	// "postCreateCommand": "/opt/create_build_openocd.sh",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"

From 85f16da99a7b3bfa1edeb8fe5b58021d4b9fbcc6 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Fri, 26 Feb 2021 08:14:30 +0000
Subject: [PATCH 4/6] added dos2unix to docker for Win10 and default to release
 build

---
 .devcontainer/Dockerfile              | 1 +
 .devcontainer/create_build_openocd.sh | 2 +-
 .devcontainer/devcontainer.json       | 5 +++--
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index 2c223bc1b4..bb7dddba5d 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -15,6 +15,7 @@ RUN apt-get update -qq \
       unzip \
       wget \ 
       curl \
+      dos2unix \
 # aarch64 packages
       libffi-dev \
       libssl-dev \
diff --git a/.devcontainer/create_build_openocd.sh b/.devcontainer/create_build_openocd.sh
index 860ffa1f72..c5bff5c89b 100755
--- a/.devcontainer/create_build_openocd.sh
+++ b/.devcontainer/create_build_openocd.sh
@@ -1,3 +1,3 @@
 #!/bin/bash
 rm -rf build/
-cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Debug -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 -S . -Bbuild
\ No newline at end of file
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
index 1740a8e40b..90b6eceb4c 100644
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -17,14 +17,15 @@
 
 	// Add the IDs of extensions you want installed when the container is created.
 	"extensions": [
-		"ms-vscode.cpptools"
+		"ms-vscode.cpptools",
+		"ms-vscode.cmake-tools",
 	],
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
 	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "/opt/create_build_openocd.sh",
+	// "postCreateCommand": "bash /opt/create_build_openocd.sh",
 
 	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
 	// "remoteUser": "vscode"

From 1c629b7c0911f2399f810c60e25f70905a537305 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niallcooling@gmail.com>
Date: Fri, 26 Feb 2021 15:09:58 +0000
Subject: [PATCH 5/6] added clang-tidy/format to container

---
 .devcontainer/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
index bb7dddba5d..55f3013682 100644
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -16,6 +16,8 @@ RUN apt-get update -qq \
       wget \ 
       curl \
       dos2unix \
+      clang-format \
+      clang-tidy \
 # aarch64 packages
       libffi-dev \
       libssl-dev \

From 0fc0e1cfef79fb79f814a75c507ba67dab663276 Mon Sep 17 00:00:00 2001
From: Niall Cooling <niall.cooling@gmail.com>
Date: Fri, 26 Mar 2021 17:37:01 +0000
Subject: [PATCH 6/6] added extra .sh build files

---
 .devcontainer/build_app.sh      |  2 ++
 .devcontainer/make_build_dir.sh |  2 ++
 .vscode/c_cpp_properties.json   | 17 +++++++++++++++++
 src/libs/lvgl                   |  2 +-
 4 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 .devcontainer/build_app.sh
 create mode 100644 .devcontainer/make_build_dir.sh
 create mode 100644 .vscode/c_cpp_properties.json

diff --git a/.devcontainer/build_app.sh b/.devcontainer/build_app.sh
new file mode 100644
index 0000000000..0f578cc642
--- /dev/null
+++ b/.devcontainer/build_app.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cmake --build /workspaces/Pinetime/build --config Release -- -j6 pinetime-app
\ No newline at end of file
diff --git a/.devcontainer/make_build_dir.sh b/.devcontainer/make_build_dir.sh
new file mode 100644
index 0000000000..0b86b307ae
--- /dev/null
+++ b/.devcontainer/make_build_dir.sh
@@ -0,0 +1,2 @@
+#!/bin/bash
+cmake -G 'Unix Makefiles' -DCMAKE_BUILD_TYPE=Release -DUSE_OPENOCD=1 -DARM_NONE_EABI_TOOLCHAIN_PATH=/opt/gcc-arm-none-eabi-9-2020-q2-update -DNRF5_SDK_PATH=/opt/nRF5_SDK_15.3.0_59ac345 /workspaces/Pinetime
diff --git a/.vscode/c_cpp_properties.json b/.vscode/c_cpp_properties.json
new file mode 100644
index 0000000000..b409ec9823
--- /dev/null
+++ b/.vscode/c_cpp_properties.json
@@ -0,0 +1,17 @@
+{
+    "configurations": [
+        {
+            "name": "Linux",
+            "includePath": [
+                "${workspaceFolder}/**"
+            ],
+            "defines": [],
+            "compilerPath": "/usr/bin/gcc",
+            "cStandard": "gnu11",
+            "cppStandard": "gnu++14",
+            "intelliSenseMode": "linux-gcc-x64",
+            "compileCommands": "${workspaceFolder}/build/compile_commands.json"
+        }
+    ],
+    "version": 4
+}
\ No newline at end of file
diff --git a/src/libs/lvgl b/src/libs/lvgl
index 1b6501dc3b..b89c30eafe 160000
--- a/src/libs/lvgl
+++ b/src/libs/lvgl
@@ -1 +1 @@
-Subproject commit 1b6501dc3babf39538f4a02aa9fb14c2aaebca2f
+Subproject commit b89c30eafe1397a778ae5d65f108a0ef820de124