Merge branch 'develop' into recovery-firmware

# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
2021-03-07 08:44:14 +01:00 · 2021-03-07 08:44:14 +01:00 · 9f67e6f652
commit 9f67e6f652
parent 740b3d7b58 ada9425357
559 changed files with 33795 additions and 100474 deletions
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@ -22,6 +22,7 @@ RUN apt-get update -qq \
    && rm -rf /var/cache/apt/* /var/lib/apt/lists/*;

 RUN pip3 install adafruit-nrfutil
+RUN pip3 install -Iv cryptography==3.3

 # build.sh knows how to compile
 COPY build.sh /opt/