From d915ab59ac2d05062f931a36463c1a84b57a2438 Mon Sep 17 00:00:00 2001 From: Gabriele Musco Date: Sun, 27 Nov 2022 23:13:25 +0100 Subject: Add udev rule for the WB32 DFU bootloader (#19135) Co-authored-by: Ryan --- util/udev/50-qmk.rules | 3 +++ 1 file changed, 3 insertions(+) (limited to 'util') diff --git a/util/udev/50-qmk.rules b/util/udev/50-qmk.rules index 86f1dc9004..1cc19b4142 100644 --- a/util/udev/50-qmk.rules +++ b/util/udev/50-qmk.rules @@ -81,3 +81,6 @@ SUBSYSTEMS=="usb", ATTRS{idVendor}=="314b", ATTRS{idProduct}=="0106", TAG+="uacc # GD32V DFU SUBSYSTEMS=="usb", ATTRS{idVendor}=="28e9", ATTRS{idProduct}=="0189", TAG+="uaccess" + +# WB32 DFU +SUBSYSTEMS=="usb", ATTRS{idVendor}=="342d", ATTRS{idProduct}=="dfa0", TAG+="uaccess" -- cgit v1.2.3 From 102f22f7e99d87989cd95e10370863c3f96ba7e2 Mon Sep 17 00:00:00 2001 From: jpe230 Date: Mon, 12 Dec 2022 14:51:14 -0600 Subject: [Core] Quantum Painter - LVGL Integration (#18499) Co-authored-by: Nick Brassel --- util/size_regression.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'util') diff --git a/util/size_regression.sh b/util/size_regression.sh index 6da2d360bb..96555c6519 100755 --- a/util/size_regression.sh +++ b/util/size_regression.sh @@ -64,6 +64,7 @@ fixup_submodules() { [ -e lib/ugfx ] && rm -rf lib/ugfx [ -e lib/pico-sdk ] && rm -rf lib/pico-sdk [ -e lib/chibios-contrib/ext/mcux-sdk ] && rm -rf lib/chibios-contrib/ext/mcux-sdk + [ -e lib/lvgl ] && rm -rf lib/lvgl make git-submodule } -- cgit v1.2.3 From e5721bbd37fcb0372fd007caae5a3f2aed060479 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Wed, 21 Dec 2022 23:35:23 +0000 Subject: Remaining DD keymap_extras migration (#19110) * Parse headers to data * Regen headers from data --- util/lang_conv.py | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ util/lang_gen.sh | 8 +++++++ 2 files changed, 73 insertions(+) create mode 100644 util/lang_conv.py create mode 100755 util/lang_gen.sh (limited to 'util') diff --git a/util/lang_conv.py b/util/lang_conv.py new file mode 100644 index 0000000000..a0da6c392d --- /dev/null +++ b/util/lang_conv.py @@ -0,0 +1,65 @@ +from pathlib import Path + +langs = set() +files = Path('quantum/keymap_extras/').glob('keymap_*.h') +for file in files: + langs.add(file.stem.replace('keymap_', '')) + +for lang in langs: + try: + file = Path(f'quantum/keymap_extras/keymap_{lang}.h') + print(f'Reading:{file}') + collect = None + out = [] + out += ['{'] + out += [' "aliases": {'] + lines = file.read_text(encoding='utf-8').split('\n') + for line in lines: + + if line.startswith("// Row"): + # print(line) + continue + elif line.startswith("/*******************************************************************************"): + raise Exception(f'Skipping:{file}') + elif '/*' in line: + collect = [line] + elif '*/' in line: + collect += [line] + if 'copyright' in collect[0].lower(): + collect = None + continue + out += collect + collect = None + elif collect: + collect += [line] + + elif '#define' in line: + define = line.split() + while len(define) < 5: + define.append("") + + if define[4] == "(backslash)": + define[4] = '\\\\' + + define[4] = " ".join(define[4:]).strip() + define[4] = define[4].replace('"', '\\"') + + if define[4]: + out += [f' "{define[2]}": {{'] + out += [f' "key": "{define[1]}",'] + out += [f' "label": "{define[4]}",'] + out += [f' }}'] + else: + out += [f' "{define[2]}": {{'] + out += [f' "key": "{define[1]}"'] + out += [f' }}'] + + out += [' }'] + out += ['}'] + + dump = Path(f'data/constants/keycodes/extras/keycodes_{lang}_0.0.1.hjson') + print(f'Writing:{dump}') + dump.write_text("\n".join(out), encoding='utf-8') + + except Exception as e: + print(e) diff --git a/util/lang_gen.sh b/util/lang_gen.sh new file mode 100755 index 0000000000..0b062b1a09 --- /dev/null +++ b/util/lang_gen.sh @@ -0,0 +1,8 @@ +#!/bin/bash + +for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_//g" | sed "s/_[0-9].*//"); do + data=$(qmk generate-keycode-extras --version latest --lang $lang) + if [ "$?" == "0" ]; then + echo "$data" > quantum/keymap_extras/keymap_$lang.h + fi +done -- cgit v1.2.3 From 5a3594366f2bd8a4aed34f6d085d9c516b9dbc32 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Sun, 1 Jan 2023 00:46:17 +0000 Subject: Initial DD keycode regen workflow (#19400) --- util/lang_conv.py | 65 ------------------------------------------------------- util/lang_gen.sh | 8 ------- util/regen.sh | 9 ++++++++ 3 files changed, 9 insertions(+), 73 deletions(-) delete mode 100644 util/lang_conv.py delete mode 100755 util/lang_gen.sh create mode 100755 util/regen.sh (limited to 'util') diff --git a/util/lang_conv.py b/util/lang_conv.py deleted file mode 100644 index a0da6c392d..0000000000 --- a/util/lang_conv.py +++ /dev/null @@ -1,65 +0,0 @@ -from pathlib import Path - -langs = set() -files = Path('quantum/keymap_extras/').glob('keymap_*.h') -for file in files: - langs.add(file.stem.replace('keymap_', '')) - -for lang in langs: - try: - file = Path(f'quantum/keymap_extras/keymap_{lang}.h') - print(f'Reading:{file}') - collect = None - out = [] - out += ['{'] - out += [' "aliases": {'] - lines = file.read_text(encoding='utf-8').split('\n') - for line in lines: - - if line.startswith("// Row"): - # print(line) - continue - elif line.startswith("/*******************************************************************************"): - raise Exception(f'Skipping:{file}') - elif '/*' in line: - collect = [line] - elif '*/' in line: - collect += [line] - if 'copyright' in collect[0].lower(): - collect = None - continue - out += collect - collect = None - elif collect: - collect += [line] - - elif '#define' in line: - define = line.split() - while len(define) < 5: - define.append("") - - if define[4] == "(backslash)": - define[4] = '\\\\' - - define[4] = " ".join(define[4:]).strip() - define[4] = define[4].replace('"', '\\"') - - if define[4]: - out += [f' "{define[2]}": {{'] - out += [f' "key": "{define[1]}",'] - out += [f' "label": "{define[4]}",'] - out += [f' }}'] - else: - out += [f' "{define[2]}": {{'] - out += [f' "key": "{define[1]}"'] - out += [f' }}'] - - out += [' }'] - out += ['}'] - - dump = Path(f'data/constants/keycodes/extras/keycodes_{lang}_0.0.1.hjson') - print(f'Writing:{dump}') - dump.write_text("\n".join(out), encoding='utf-8') - - except Exception as e: - print(e) diff --git a/util/lang_gen.sh b/util/lang_gen.sh deleted file mode 100755 index 0b062b1a09..0000000000 --- a/util/lang_gen.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/bash - -for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_//g" | sed "s/_[0-9].*//"); do - data=$(qmk generate-keycode-extras --version latest --lang $lang) - if [ "$?" == "0" ]; then - echo "$data" > quantum/keymap_extras/keymap_$lang.h - fi -done diff --git a/util/regen.sh b/util/regen.sh new file mode 100755 index 0000000000..e4c52ec9a1 --- /dev/null +++ b/util/regen.sh @@ -0,0 +1,9 @@ +#!/bin/bash +set -e + +qmk generate-rgb-breathe-table -o quantum/rgblight/rgblight_breathe_table.h +qmk generate-keycodes --version latest -o quantum/keycodes.h + +for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_\(.*\)_[0-9].*/\1/"); do + qmk generate-keycode-extras --version latest --lang $lang -o quantum/keymap_extras/keymap_$lang.h +done -- cgit v1.2.3 From c345278101b3882a2f33b078021ab31a6129120a Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Tue, 3 Jan 2023 03:15:29 +0000 Subject: Replace list_keyboards.sh with CLI calls (#19485) --- util/list_keyboards.sh | 6 ------ 1 file changed, 6 deletions(-) delete mode 100755 util/list_keyboards.sh (limited to 'util') diff --git a/util/list_keyboards.sh b/util/list_keyboards.sh deleted file mode 100755 index 0d1dae888f..0000000000 --- a/util/list_keyboards.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -# Temporary shell script to find keyboards -# -# This allows us to include DEFAULT_FOLDER targets. - -find -L keyboards -type f -name rules.mk | grep -v keymaps | sed 's!keyboards/\(.*\)/rules.mk!\1!' -- cgit v1.2.3 From ec0908754389017d723e2f656827381e93d8bd8a Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Thu, 12 Jan 2023 11:47:36 +0100 Subject: Update ChibiOS[-Contrib], SIO driver, configs (#17915) Co-authored-by: Nick Brassel --- util/chibios_conf_updater.sh | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'util') diff --git a/util/chibios_conf_updater.sh b/util/chibios_conf_updater.sh index 3c400ab63c..4c68c678c6 100755 --- a/util/chibios_conf_updater.sh +++ b/util/chibios_conf_updater.sh @@ -13,10 +13,8 @@ umask 022 # sudo add-apt-repository --yes https://adoptopenjdk.jfrog.io/adoptopenjdk/deb/ # sudo apt-get update && sudo apt-get install adoptopenjdk-8-hotspot # -# For Fedora 36-ish distros: -# # Prep yum repository from https://adoptium.net/installation/linux/ -# sudo dnf install -y ant temurin-8-jdk -# export JAVA_HOME=/usr/lib/jvm/temurin-8-jdk +# For Fedora 37-ish distros: +# sudo dnf install -y ant java-1.8.0-openjdk.x86_64 sinfo() { echo "$@" >&2 ; } shead() { sinfo "" ; sinfo "---------------------------------" ; sinfo "-- $@" ; sinfo "---------------------------------" ; } -- cgit v1.2.3 From fb6c9eaed4806d5cc0cc42ce2be8219190b6e564 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 3 Feb 2023 05:05:45 +0000 Subject: Regen keycode_table for unit tests (#19721) --- util/regen.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'util') diff --git a/util/regen.sh b/util/regen.sh index e4c52ec9a1..48ea7e0b2d 100755 --- a/util/regen.sh +++ b/util/regen.sh @@ -3,6 +3,7 @@ set -e qmk generate-rgb-breathe-table -o quantum/rgblight/rgblight_breathe_table.h qmk generate-keycodes --version latest -o quantum/keycodes.h +qmk generate-keycodes-tests --version latest -o tests/test_common/keycode_table.cpp for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_\(.*\)_[0-9].*/\1/"); do qmk generate-keycode-extras --version latest --lang $lang -o quantum/keymap_extras/keymap_$lang.h -- cgit v1.2.3 From 242f51007f2a6151da49cebb0d6ac4aa77fa9e19 Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Thu, 16 Feb 2023 01:00:01 +0000 Subject: Fix regen script for macOS (#19857) --- util/regen.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'util') diff --git a/util/regen.sh b/util/regen.sh index 48ea7e0b2d..ab03018893 100755 --- a/util/regen.sh +++ b/util/regen.sh @@ -5,6 +5,6 @@ qmk generate-rgb-breathe-table -o quantum/rgblight/rgblight_breathe_table.h qmk generate-keycodes --version latest -o quantum/keycodes.h qmk generate-keycodes-tests --version latest -o tests/test_common/keycode_table.cpp -for lang in $(find data/constants/keycodes/extras/ -type f -printf "%f\n" | sed "s/keycodes_\(.*\)_[0-9].*/\1/"); do +for lang in $(find data/constants/keycodes/extras/ -type f -exec basename '{}' \; | sed "s/keycodes_\(.*\)_[0-9].*/\1/"); do qmk generate-keycode-extras --version latest --lang $lang -o quantum/keymap_extras/keymap_$lang.h done -- cgit v1.2.3