Merge remote-tracking branch 'upstream/master' into lotus-march2023

This commit is contained in:
Daniel Schaefer
2023-03-22 02:54:55 +08:00
11612 changed files with 115637 additions and 107111 deletions

View File

@@ -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 "---------------------------------" ; }

View File

@@ -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!'

10
util/regen.sh Executable file
View File

@@ -0,0 +1,10 @@
#!/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
qmk generate-keycodes-tests --version latest -o tests/test_common/keycode_table.cpp
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

View File

@@ -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
}

View File

@@ -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"