Skip to content

Commit

Permalink
update
Browse files Browse the repository at this point in the history 
upgrade qmk to 0.22.12, fix combos loading/introspection

not all custom keymaps confirmed working with new qmk
  • Loading branch information
@patcoll
patcoll committed Oct 18, 2023
1 parent daf9f36 commit 758f2a6
Show file tree
Hide file tree
Showing 30 changed files with 455 additions and 456 deletions.
2 changes: 1 addition & 1 deletion .envrc
View file
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
export QMK_HOME=`expand_path qmk_firmware`
export QMK_HOME=`expand_path ../keymaps_qmk`
PATH_add ./bin
128 changes: 64 additions & 64 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,159 +1,159 @@
default: | keymaps qmk-clean

.PHONY: qmk
qmk: qmk_firmware/Makefile
qmk_firmware/Makefile:
qmk: ${QMK_HOME}/Makefile
${QMK_HOME}/Makefile:
init-qmk

.PHONY: qmk-clean
qmk-clean:
cd qmk_firmware && make git-submodule
cd ${QMK_HOME} && make git-submodule
qmk clean -a

.PHONY: twoyo-default
twoyo-default: | qmk
mkdir -p qmk_firmware/keyboards/twoyo
rsync -avz firmware/twoyo/ qmk_firmware/keyboards/twoyo/
mkdir -p ${QMK_HOME}/keyboards/twoyo
rsync -avz firmware/twoyo/ ${QMK_HOME}/keyboards/twoyo/

.PHONY: minisub-default
minisub-default: | qmk
mkdir -p qmk_firmware/keyboards/minisub
rsync -avz firmware/minisub/ qmk_firmware/keyboards/minisub/
mkdir -p ${QMK_HOME}/keyboards/minisub
rsync -avz firmware/minisub/ ${QMK_HOME}/keyboards/minisub/

.PHONY: kawaii-default
kawaii-default: | qmk
mkdir -p qmk_firmware/keyboards/kawaii
rsync -avz firmware/kawaii/ qmk_firmware/keyboards/kawaii/
mkdir -p ${QMK_HOME}/keyboards/kawaii
rsync -avz firmware/kawaii/ ${QMK_HOME}/keyboards/kawaii/

.PHONY: relic-default
relic-default: | qmk
mkdir -p qmk_firmware/keyboards/relic
rsync -avz firmware/relic/ qmk_firmware/keyboards/relic/
mkdir -p ${QMK_HOME}/keyboards/relic
rsync -avz firmware/relic/ ${QMK_HOME}/keyboards/relic/

.PHONY: caravan2
caravan2: | qmk
mkdir -p qmk_firmware/keyboards/caravan2
rsync -avz firmware/caravan2/ qmk_firmware/keyboards/caravan2/
mkdir -p ${QMK_HOME}/keyboards/caravan2
rsync -avz firmware/caravan2/ ${QMK_HOME}/keyboards/caravan2/

.PHONY: menhir
menhir: | qmk
mkdir -p qmk_firmware/keyboards/menhir
rsync -avz firmware/menhir/ qmk_firmware/keyboards/menhir/
mkdir -p ${QMK_HOME}/keyboards/menhir
rsync -avz firmware/menhir/ ${QMK_HOME}/keyboards/menhir/

.PHONY: agony
agony: | qmk
mkdir -p qmk_firmware/keyboards/handwired/patcoll/agony
rsync -avz firmware/handwired/patcoll/agony/ qmk_firmware/keyboards/handwired/patcoll/agony/
mkdir -p ${QMK_HOME}/keyboards/handwired/patcoll/agony
rsync -avz firmware/handwired/patcoll/agony/ ${QMK_HOME}/keyboards/handwired/patcoll/agony/

.PHONY: piedmont
piedmont: | qmk
mkdir -p qmk_firmware/keyboards/handwired/patcoll/piedmont
rsync -avz firmware/handwired/patcoll/piedmont/ qmk_firmware/keyboards/handwired/patcoll/piedmont/
mkdir -p ${QMK_HOME}/keyboards/handwired/patcoll/piedmont
rsync -avz firmware/handwired/patcoll/piedmont/ ${QMK_HOME}/keyboards/handwired/patcoll/piedmont/

.PHONY: oxymoron
oxymoron: | qmk
mkdir -p qmk_firmware/keyboards/oxymoron
rsync -avz firmware/oxymoron/ qmk_firmware/keyboards/oxymoron/
mkdir -p ${QMK_HOME}/keyboards/oxymoron
rsync -avz firmware/oxymoron/ ${QMK_HOME}/keyboards/oxymoron/

.PHONY: ca66r3
ca66r3: | qmk
mkdir -p qmk_firmware/keyboards/ca66r3
rsync -avz firmware/ca66r3/ qmk_firmware/keyboards/ca66r3/
mkdir -p ${QMK_HOME}/keyboards/ca66r3
rsync -avz firmware/ca66r3/ ${QMK_HOME}/keyboards/ca66r3/

.PHONY: curio
curio: | qmk
mkdir -p qmk_firmware/keyboards/curio
rsync -avz firmware/curio/ qmk_firmware/keyboards/curio/
mkdir -p ${QMK_HOME}/keyboards/curio
rsync -avz firmware/curio/ ${QMK_HOME}/keyboards/curio/

.PHONY: alphalpha-plus
alphalpha-plus: | qmk
mkdir -p qmk_firmware/keyboards/alphalpha_plus
rsync -avz firmware/alphalpha_plus/ qmk_firmware/keyboards/alphalpha_plus/
mkdir -p ${QMK_HOME}/keyboards/alphalpha_plus
rsync -avz firmware/alphalpha_plus/ ${QMK_HOME}/keyboards/alphalpha_plus/

.PHONY: 45_ats_hot
45_ats_hot: | qmk
mkdir -p qmk_firmware/keyboards/45_ats_hot
rsync -avz firmware/45_ats_hot/ qmk_firmware/keyboards/45_ats_hot/
mkdir -p ${QMK_HOME}/keyboards/45_ats_hot
rsync -avz firmware/45_ats_hot/ ${QMK_HOME}/keyboards/45_ats_hot/

.PHONY: plop
plop: | qmk
mkdir -p qmk_firmware/keyboards/plop
rsync -avz firmware/plop/ qmk_firmware/keyboards/plop/
mkdir -p ${QMK_HOME}/keyboards/plop
rsync -avz firmware/plop/ ${QMK_HOME}/keyboards/plop/

.PHONY: embrace
embrace: | qmk
mkdir -p qmk_firmware/keyboards/embrace
rsync -avz firmware/embrace/ qmk_firmware/keyboards/embrace/
mkdir -p ${QMK_HOME}/keyboards/embrace
rsync -avz firmware/embrace/ ${QMK_HOME}/keyboards/embrace/

.PHONY: apricot
apricot: | qmk
mkdir -p qmk_firmware/keyboards/lazydesigners/apricot
rsync -avz firmware/lazydesigners/apricot/ qmk_firmware/keyboards/lazydesigners/apricot/
mkdir -p ${QMK_HOME}/keyboards/lazydesigners/apricot
rsync -avz firmware/lazydesigners/apricot/ ${QMK_HOME}/keyboards/lazydesigners/apricot/

.PHONY: sst60
sst60: | qmk
mkdir -p qmk_firmware/keyboards/sst60
rsync -avz firmware/sst60/ qmk_firmware/keyboards/sst60/
mkdir -p ${QMK_HOME}/keyboards/sst60
rsync -avz firmware/sst60/ ${QMK_HOME}/keyboards/sst60/

.PHONY: orbital
orbital: | qmk
mkdir -p qmk_firmware/keyboards/orbital
rsync -avz firmware/orbital/ qmk_firmware/keyboards/orbital/
mkdir -p ${QMK_HOME}/keyboards/orbital
rsync -avz firmware/orbital/ ${QMK_HOME}/keyboards/orbital/

.PHONY: m0ii040pcb
m0ii040pcb: | qmk
mkdir -p qmk_firmware/keyboards/m0ii040pcb
rsync -avz firmware/m0ii040pcb/ qmk_firmware/keyboards/m0ii040pcb/
mkdir -p ${QMK_HOME}/keyboards/m0ii040pcb
rsync -avz firmware/m0ii040pcb/ ${QMK_HOME}/keyboards/m0ii040pcb/

.PHONY: cutiepie
cutiepie: | qmk
mkdir -p qmk_firmware/keyboards/cutiepie
rsync -avz firmware/cutiepie/ qmk_firmware/keyboards/cutiepie/
mkdir -p ${QMK_HOME}/keyboards/cutiepie
rsync -avz firmware/cutiepie/ ${QMK_HOME}/keyboards/cutiepie/

.PHONY: paintbrush_avr
paintbrush_avr: | qmk
mkdir -p qmk_firmware/keyboards/paintbrush_avr
rsync -avz firmware/paintbrush_avr/ qmk_firmware/keyboards/paintbrush_avr/
mkdir -p ${QMK_HOME}/keyboards/paintbrush_avr
rsync -avz firmware/paintbrush_avr/ ${QMK_HOME}/keyboards/paintbrush_avr/

.PHONY: bully
bully: | qmk
mkdir -p qmk_firmware/keyboards/bully
rsync -avz firmware/bully/ qmk_firmware/keyboards/bully/
mkdir -p ${QMK_HOME}/keyboards/bully
rsync -avz firmware/bully/ ${QMK_HOME}/keyboards/bully/

.PHONY: bully2040
bully2040: | qmk
mkdir -p qmk_firmware/keyboards/bully2040
rsync -avz firmware/bully2040/ qmk_firmware/keyboards/bully2040/
mkdir -p ${QMK_HOME}/keyboards/bully2040
rsync -avz firmware/bully2040/ ${QMK_HOME}/keyboards/bully2040/

.PHONY: monorail
monorail: | qmk
mkdir -p qmk_firmware/keyboards/monorail
rsync -avz firmware/monorail/ qmk_firmware/keyboards/monorail/
mkdir -p ${QMK_HOME}/keyboards/monorail
rsync -avz firmware/monorail/ ${QMK_HOME}/keyboards/monorail/

.PHONY: monorail2
monorail2: | qmk
mkdir -p qmk_firmware/keyboards/monorail2
rsync -avz firmware/monorail2/ qmk_firmware/keyboards/monorail2/
mkdir -p ${QMK_HOME}/keyboards/monorail2
rsync -avz firmware/monorail2/ ${QMK_HOME}/keyboards/monorail2/

.PHONY: cisne
cisne: | qmk
mkdir -p qmk_firmware/keyboards/cisne
rsync -avz firmware/cisne/ qmk_firmware/keyboards/cisne/
mkdir -p ${QMK_HOME}/keyboards/cisne
rsync -avz firmware/cisne/ ${QMK_HOME}/keyboards/cisne/

.PHONY: 3999
3999: | qmk
mkdir -p qmk_firmware/keyboards/3999
rsync -avz firmware/3999/ qmk_firmware/keyboards/3999/
mkdir -p ${QMK_HOME}/keyboards/3999
rsync -avz firmware/3999/ ${QMK_HOME}/keyboards/3999/

.PHONY: grouper
grouper: | qmk
mkdir -p qmk_firmware/keyboards/grouper
rsync -avz firmware/grouper/ qmk_firmware/keyboards/grouper/
mkdir -p ${QMK_HOME}/keyboards/grouper
rsync -avz firmware/grouper/ ${QMK_HOME}/keyboards/grouper/

.PHONY: c11
c11: | qmk
mkdir -p qmk_firmware/keyboards/c11
rsync -avz firmware/c11/ qmk_firmware/keyboards/c11/
mkdir -p ${QMK_HOME}/keyboards/c11
rsync -avz firmware/c11/ ${QMK_HOME}/keyboards/c11/

.PHONY: firmware
firmware: | twoyo-default minisub-default kawaii-default relic-default caravan2 menhir agony piedmont oxymoron ca66r3 curio alphalpha-plus 45_ats_hot plop embrace apricot sst60 orbital m0ii040pcb cutiepie paintbrush_avr bully monorail monorail2 cisne 3999 bully2040 grouper c11
Expand All @@ -164,8 +164,8 @@ keymaps: | qmk firmware userspace
init-keymaps

.PHONY: userspace
userspace: qmk_firmware/users/patcoll/patcoll.h
qmk_firmware/users/patcoll/patcoll.h: qmk
userspace: ${QMK_HOME}/users/patcoll/patcoll.h
${QMK_HOME}/users/patcoll/patcoll.h: qmk
init-userspace

.PHONY: test
Expand All @@ -174,4 +174,4 @@ test: | default

.PHONY: clean
clean:
rm -rf qmk_firmware working_area/*
rm -rf ${QMK_HOME} working_area/*
4 changes: 2 additions & 2 deletions bin/build-all-keymaps
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash -e
dir=$PWD

if [[ ! -d "$dir/qmk_firmware" ]]; then
echo "$dir/qmk_firmware" does not exist
if [[ ! -d "${QMK_HOME}" ]]; then
echo "${QMK_HOME}" does not exist
exit 1
fi

Expand Down
8 changes: 4 additions & 4 deletions bin/init-keymaps
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
#!/bin/bash
dir=$PWD

if [[ ! -d "$dir/qmk_firmware" ]]; then
echo "$dir/qmk_firmware" does not exist
if [[ ! -d "${QMK_HOME}" ]]; then
echo "${QMK_HOME}" does not exist
exit 1
fi

Expand Down Expand Up @@ -42,9 +42,9 @@ while read -r line; do

echo "$build_keyboard" "$build_keymap"

echo -n creating link "$dir/$keymap" '->' "$dir/qmk_firmware/$keymap"... ''
echo -n creating link "$dir/$keymap" '->' "${QMK_HOME}/$keymap"... ''

ln -nfs "$dir/$keymap" "$dir/qmk_firmware/$keymap"
ln -nfs "$dir/$keymap" "${QMK_HOME}/$keymap"

echo done.

Expand Down
7 changes: 4 additions & 3 deletions bin/init-qmk
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#!/bin/bash
# qmk clone vial-kb/vial-qmk -b rp2040

qmk clone vial-kb/vial-qmk -b vial
cd qmk_firmware && git checkout 0373554f48c5fbcb827ca3cebc25b1d80759d7c4
# qmk clone -b vial vial-kb/vial-qmk ${QMK_HOME}
# cd ${QMK_HOME} && git checkout 0373554f48c5fbcb827ca3cebc25b1d80759d7c4
# cd ${QMK_HOME} && git checkout ccda5d2d2f0b2e71e16d72636622743a68757b50 # 2023-10-14, with OS_DETECTION_ENABLE, apparently causes issues with LT combos defined in combos.def

# qmk clone -b 0.18.17
qmk clone -b 0.22.12 qmk/qmk_firmware ${QMK_HOME}
6 changes: 3 additions & 3 deletions bin/init-userspace
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
#!/bin/bash -ex
dir=$PWD

if [[ ! -d "$dir/qmk_firmware" ]]; then
echo "$dir/qmk_firmware" does not exist
if [[ ! -d "${QMK_HOME}" ]]; then
echo "${QMK_HOME}" does not exist
exit 1
fi

ln -nfs "$dir/users/patcoll" "$dir/qmk_firmware/users/patcoll"
ln -nfs "$dir/users/patcoll" "${QMK_HOME}/users/patcoll"
54 changes: 26 additions & 28 deletions firmware/3999/config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,16 @@
*/
#pragma once

#include "config_common.h"

/* USB Device descriptor parameter */
#define VENDOR_ID 0x7431
#define PRODUCT_ID 0xD645
#define DEVICE_VER 0x0001
#define MANUFACTURER dpalka15
#define PRODUCT _3999 Percent
// #define VENDOR_ID 0x7431
// #define PRODUCT_ID 0xD645
// #define DEVICE_VER 0x0001
// #define MANUFACTURER dpalka15
// #define PRODUCT _3999 Percent

/* key matrix size */
#define MATRIX_ROWS 4
#define MATRIX_COLS 11
// #define MATRIX_ROWS 4
// #define MATRIX_COLS 11

/*
* Keyboard Matrix Assignments
Expand All @@ -38,37 +36,37 @@
* ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
*
*/
#define MATRIX_ROW_PINS { D3, D5, F0, F1 }
#define MATRIX_COL_PINS { B4, D7, D6, B0, B2, B1, B3, D2, D1, D0, F7 }
#define UNUSED_PINS
// #define MATRIX_ROW_PINS { D3, D5, F0, F1 }
// #define MATRIX_COL_PINS { B4, D7, D6, B0, B2, B1, B3, D2, D1, D0, F7 }
// #define UNUSED_PINS

/* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW
// #define DIODE_DIRECTION COL2ROW

/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
#define DEBOUNCE 5
// #define DEBOUNCE 5

/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
#define LOCKING_SUPPORT_ENABLE
// #define LOCKING_SUPPORT_ENABLE
/* Locking resynchronize hack */
#define LOCKING_RESYNC_ENABLE
// #define LOCKING_RESYNC_ENABLE

/* Define encoder pads */
#define ENCODERS_PAD_A { B5 }
#define ENCODERS_PAD_B { B6 }
// #define ENCODERS_PAD_A { B5 }
// #define ENCODERS_PAD_B { B6 }

/*
* WS2812 Underglow Matrix options
*/
#define RGB_DI_PIN D4
#ifdef RGB_DI_PIN
# define RGBLIGHT_ANIMATIONS
# define RGBLED_NUM 9
# define RGBLIGHT_HUE_STEP 8
# define RGBLIGHT_SAT_STEP 8
# define RGBLIGHT_VAL_STEP 8
# define RGBLIGHT_SLEEP
#endif
// #define RGB_DI_PIN D4
// #ifdef RGB_DI_PIN
// # define RGBLIGHT_ANIMATIONS
// # define RGBLED_NUM 9
// # define RGBLIGHT_HUE_STEP 8
// # define RGBLIGHT_SAT_STEP 8
// # define RGBLIGHT_VAL_STEP 8
// # define RGBLIGHT_SLEEP
// #endif

#define DRIVER_LED_TOTAL RGBLED_NUM
// #define DRIVER_LED_TOTAL RGBLED_NUM

Loading

0 comments on commit 758f2a6

Please sign in to comment.