Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
FROM --platform=linux/x86_64 mcr.microsoft.com/devcontainers/base:ubuntu

RUN export DEBIAN_FRONTEND=noninteractive && \
apt-get update && \
apt-get -y install --no-install-recommends cmake build-essential ninja-build libsdl2-dev
28 changes: 28 additions & 0 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
{
"name": "arm-linux-musleabihf",
"build": {
"dockerfile": "Dockerfile"
},
"runArgs": [
"--cap-add=SYS_PTRACE",
"--security-opt",
"seccomp=unconfined"
],
"customizations": {
"vscode": {
// Set *default* container specific settings.json values on container create.
"settings": {
"cmake.configureArgs": [
"-DCMAKE_TOOLCHAIN_FILE=${workspaceFolder}/toolchain/share/buildroot/toolchainfile.cmake"
]
},
// Add the IDs of extensions you want installed when the container is created.
"extensions": [
"ms-vscode.cpptools",
"ms-vscode.cmake-tools"
]
}
},
"postCreateCommand": "bash setup.sh",
"remoteUser": "vscode"
}
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,4 @@ media.tar.gz
/tmp
/.vscode/settings.json
.DS_Store
utilities/font/out
2 changes: 2 additions & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ file(GLOB SRC_FILES_BMI "src/bmi270/*.c" "src/bmi270/*.h")
file(GLOB SRC_FILES_UTIL "src/util/*.c" "src/util/*.h")
file(GLOB SRC_FILES_PLAYER "src/player/*.c" "src/player/*.h")
file(GLOB SRC_FILES_EMULATOR "src/emulator/*.c" "src/emulator/*.h")
file(GLOB SRC_FILES_LANG "src/lang/*.c" "src/lang/*.h")

set(SRC_FILES
${SRC_FILES_CORE}
Expand All @@ -79,6 +80,7 @@ set(SRC_FILES
${SRC_FILES_UI}
${SRC_FILES_BMI}
${SRC_FILES_UTIL}
${SRC_FILES_LANG}
)
if(EMULATOR_BUILD)
list(APPEND SRC_FILES ${SRC_FILES_EMULATOR})
Expand Down
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
9.4.0
9.5.0
14 changes: 12 additions & 2 deletions lib/log/src/log.c
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
#include <stdatomic.h>
#include <stdio.h>
#include <string.h>
#include <sys/time.h>
#include <unistd.h>

#define get_filename(file) (strrchr(file, '/') ? strrchr(file, '/') + 1 : file)
Expand Down Expand Up @@ -78,10 +79,19 @@ int log_printf(const char *file, const char *func, int line, const int level, co
va_end(args2);
static char buffer[1024];

int bytes =
// Timestamp
struct timeval now;
gettimeofday(&now, NULL);
int milli = now.tv_usec / 1000;
char timestamp[sizeof "YYYY-MM-DD HH:MM:SS.sss"];
int bytes = strftime(timestamp, sizeof timestamp, "%F %T.", gmtime(&now.tv_sec));
snprintf(&timestamp[bytes], sizeof(timestamp) - bytes, "%03d", milli);

bytes =
snprintf(buffer,
sizeof(buffer),
"[%s][%s:%s:%d] %s\r\n",
"%s [%s][%s:%s:%d] %s\r\n",
timestamp,
log_level_names[level + 2],
get_filename(file),
func,
Expand Down
2 changes: 0 additions & 2 deletions lib/lvgl/lvgl/src/font/lv_font.mk
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ CSRCS += lv_font_dejavu_16_persian_hebrew.c
CSRCS += lv_font_montserrat_8.c
CSRCS += lv_font_montserrat_10.c
CSRCS += lv_font_montserrat_12.c
CSRCS += lv_font_montserrat_12_subpx.c
CSRCS += lv_font_montserrat_14.c
CSRCS += lv_font_montserrat_16.c
CSRCS += lv_font_montserrat_18.c
Expand All @@ -15,7 +14,6 @@ CSRCS += lv_font_montserrat_22.c
CSRCS += lv_font_montserrat_24.c
CSRCS += lv_font_montserrat_26.c
CSRCS += lv_font_montserrat_28.c
CSRCS += lv_font_montserrat_28_compressed.c
CSRCS += lv_font_montserrat_30.c
CSRCS += lv_font_montserrat_32.c
CSRCS += lv_font_montserrat_34.c
Expand Down
Loading