From 2bf3317bf567b404ca0ae5bf13a31214b2d5e9c2 Mon Sep 17 00:00:00 2001 From: Mark Date: Tue, 27 Dec 2022 13:20:23 -0800 Subject: [PATCH] Meta files --- .gitignore | 4 ++++ .vscode/settings.json | 20 ++++++++++++++++++++ build.sh | 14 ++++++++++---- 3 files changed, 34 insertions(+), 4 deletions(-) create mode 100644 .vscode/settings.json diff --git a/.gitignore b/.gitignore index 431cbe6..3ad9678 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,7 @@ +# The docker container places firmware +# in this directory output +# Secret information that shouldn't be +# added to git. secrets.h \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 0000000..48ce34c --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,20 @@ +{ + //"files.exclude": { + // "**/.build": true, + // "**/*.hex": true, + // "**/*.bin": true, + // "**/*.uf2": true + //}, + "files.associations": { + "*.h": "c", + "*.c": "c", + "*.inc": "c", + "*.cpp": "cpp", + "*.hpp": "cpp", + "xstddef": "c", + "type_traits": "c", + "utility": "c", + "ranges": "c" + }, + "C_Cpp.errorSquiggles": "disabled", +} diff --git a/build.sh b/build.sh index 41c340d..f9572c4 100755 --- a/build.sh +++ b/build.sh @@ -1,13 +1,19 @@ #!/bin/bash -# Uses the qmk container found here: -# https://git.betalupi.com/Mark/docker +# Uses the docker container defined in +# the `docker` directory of this repo. +# Run from the root directory of this repo. + +# Targets in this repo: +# betalupi_ergodox:default +# ergodox_ez/glow:default # -# Be careful, it may not be using the latest QMK. +# Usage: +# bash build.sh betalupi_ergodox:default docker run -it --rm \ --user $(id -u):$(id -g) \ -v "$(pwd)/output:/build_output" \ -v "$(pwd)/keyboards:/qmk_firmware/keyboards:ro" \ - -e QMK_TARGET="betalupi_ergodox:default" \ + -e QMK_TARGET="$1" \ git.betalupi.com/mark/qmk \ No newline at end of file