diff --git a/.github/workflows/lotus.yml b/.github/workflows/lotus.yml index ad63400edb..894fac90d9 100644 --- a/.github/workflows/lotus.yml +++ b/.github/workflows/lotus.yml @@ -1,4 +1,4 @@ -name: Build Lotus Firmware +name: Build Framework Laptop 16 Firmware on: push: @@ -8,7 +8,7 @@ on: - lotus jobs: - lotus-build: + fl16-build: runs-on: ubuntu-latest container: qmkfm/qmk_cli @@ -21,34 +21,34 @@ jobs: - name: Install dependencies run: pip3 install -r requirements-dev.txt - - name: Lint lotus + - name: Lint Framework Laptop 16 run: | - qmk lint -kb lotus/ansi -km default - qmk lint -kb lotus/iso -km default - qmk lint -kb lotus/jis -km default - qmk lint -kb lotus/numpad -km default - qmk lint -kb lotus/gridpad -km default + qmk lint -kb framework/ansi -km default + qmk lint -kb framework/iso -km default + qmk lint -kb framework/jis -km default + qmk lint -kb framework/numpad -km default + qmk lint -kb framework/gridpad -km default - - name: Build Lotus ANSI variant - run: qmk compile -kb lotus/ansi -km default + - name: Build Framework Laptop 16 ANSI variant + run: qmk compile -kb framework/ansi -km default - - name: Build Lotus ISO variant - run: qmk compile -kb lotus/iso -km default + - name: Build Framework Laptop 16 ISO variant + run: qmk compile -kb framework/iso -km default - - name: Build Lotus JIS variant - run: qmk compile -kb lotus/jis -km default + - name: Build Framework Laptop 16 JIS variant + run: qmk compile -kb framework/jis -km default - - name: Build Lotus Numpad - run: qmk compile -kb lotus/numpad -km default + - name: Build Framework Laptop 16 Numpad + run: qmk compile -kb framework/numpad -km default - - name: Build Lotus Gridpad - run: qmk compile -kb lotus/gridpad -km default + - name: Build Framework Laptop 16 Gridpad + run: qmk compile -kb framework/gridpad -km default - uses: actions/upload-artifact@v3 with: - name: lotus_kb_qmk.${{github.sha}} + name: fl16_kb_qmk.${{github.sha}} path: | - lotus_*.uf2 + framework_*.uf2 # tests: # runs-on: ubuntu-latest diff --git a/keyboards/lotus/ansi/ansi.c b/keyboards/framework/ansi/ansi.c similarity index 100% rename from keyboards/lotus/ansi/ansi.c rename to keyboards/framework/ansi/ansi.c diff --git a/keyboards/lotus/ansi/ansi.h b/keyboards/framework/ansi/ansi.h similarity index 100% rename from keyboards/lotus/ansi/ansi.h rename to keyboards/framework/ansi/ansi.h diff --git a/keyboards/lotus/ansi/config.h b/keyboards/framework/ansi/config.h similarity index 100% rename from keyboards/lotus/ansi/config.h rename to keyboards/framework/ansi/config.h diff --git a/keyboards/lotus/ansi/info.json b/keyboards/framework/ansi/info.json similarity index 100% rename from keyboards/lotus/ansi/info.json rename to keyboards/framework/ansi/info.json diff --git a/keyboards/lotus/ansi/keymaps/default/keymap.c b/keyboards/framework/ansi/keymaps/default/keymap.c similarity index 99% rename from keyboards/lotus/ansi/keymaps/default/keymap.c rename to keyboards/framework/ansi/keymaps/default/keymap.c index 04471601d1..b52444c895 100644 --- a/keyboards/lotus/ansi/keymaps/default/keymap.c +++ b/keyboards/framework/ansi/keymaps/default/keymap.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include QMK_KEYBOARD_H -#include "lotus.h" +#include "framework.h" const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { /* diff --git a/keyboards/lotus/ansi/rules.mk b/keyboards/framework/ansi/rules.mk similarity index 100% rename from keyboards/lotus/ansi/rules.mk rename to keyboards/framework/ansi/rules.mk diff --git a/keyboards/framework/build_all.sh b/keyboards/framework/build_all.sh new file mode 100644 index 0000000000..547ff84d4f --- /dev/null +++ b/keyboards/framework/build_all.sh @@ -0,0 +1,6 @@ +set -e +qmk compile -kb framework/ansi -km default +qmk compile -kb framework/iso -km default +qmk compile -kb framework/jis -km default +qmk compile -kb framework/numpad -km default +qmk compile -kb framework/gridpad -km default diff --git a/keyboards/lotus/config.h b/keyboards/framework/config.h similarity index 94% rename from keyboards/lotus/config.h rename to keyboards/framework/config.h index 8a70e7bb0a..6e278d3f58 100644 --- a/keyboards/lotus/config.h +++ b/keyboards/framework/config.h @@ -14,18 +14,18 @@ // SDB is mapped to GP22 //#define PICO_FL16 -// Enable serial number. Calls into lotus_serial_number_string* functions +// Enable serial number. Calls into dyn_serial_number_string* functions #define SERIAL_NUMBER -#ifdef KEYBOARD_lotus_ansi +#ifdef KEYBOARD_framework_ansi #define LED_CAPS_LOCK_PIN GP24 -#elif KEYBOARD_lotus_iso +#elif KEYBOARD_framework_iso #define LED_CAPS_LOCK_PIN GP24 -#elif KEYBOARD_lotus_jis +#elif KEYBOARD_framework_jis #define LED_CAPS_LOCK_PIN GP24 -#elif KEYBOARD_lotus_numpad +#elif KEYBOARD_framework_numpad #define LED_NUM_LOCK_PIN GP24 -#elif KEYBOARD_lotus_gridpad +#elif KEYBOARD_framework_gridpad #endif // PWM single one backlight configuration diff --git a/keyboards/lotus/dyn_serial.c b/keyboards/framework/dyn_serial.c similarity index 100% rename from keyboards/lotus/dyn_serial.c rename to keyboards/framework/dyn_serial.c diff --git a/keyboards/lotus/dyn_serial.h b/keyboards/framework/dyn_serial.h similarity index 100% rename from keyboards/lotus/dyn_serial.h rename to keyboards/framework/dyn_serial.h diff --git a/keyboards/lotus/factory.c b/keyboards/framework/factory.c similarity index 99% rename from keyboards/lotus/factory.c rename to keyboards/framework/factory.c index 2a6a9c7ebd..bc6d601e26 100644 --- a/keyboards/lotus/factory.c +++ b/keyboards/framework/factory.c @@ -4,7 +4,7 @@ #include "quantum.h" #include "raw_hid.h" #include "matrix.h" -#include "lotus.h" +#include "framework.h" #if defined(RGB_MATRIX_ENABLE) #include "rgb_matrix.h" #endif diff --git a/keyboards/lotus/lotus.c b/keyboards/framework/framework.c similarity index 98% rename from keyboards/lotus/lotus.c rename to keyboards/framework/framework.c index 95d935c199..9c046519b4 100644 --- a/keyboards/lotus/lotus.c +++ b/keyboards/framework/framework.c @@ -2,7 +2,7 @@ // SPDX-License-Identifier: GPL-2.0-or-later #include "quantum.h" -#include "lotus.h" +#include "framework.h" void keyboard_post_init_kb(void) { keyboard_post_init_user(); diff --git a/keyboards/lotus/lotus.h b/keyboards/framework/framework.h similarity index 77% rename from keyboards/lotus/lotus.h rename to keyboards/framework/framework.h index 5ff87a8b61..c2183d49de 100644 --- a/keyboards/lotus/lotus.h +++ b/keyboards/framework/framework.h @@ -5,19 +5,19 @@ #include "quantum.h" -#ifdef KEYBOARD_lotus_ansi +#ifdef KEYBOARD_framework_ansi #include "ansi.h" -#elif KEYBOARD_lotus_iso +#elif KEYBOARD_framework_iso #include "iso.h" -#elif KEYBOARD_lotus_jis +#elif KEYBOARD_framework_jis #include "jis.h" -#elif KEYBOARD_lotus_numpad +#elif KEYBOARD_framework_numpad #include "numpad.h" -#elif KEYBOARD_lotus_gridpad +#elif KEYBOARD_framework_gridpad #include "gridpad.h" #endif -enum lotus_keycodes { +enum framework_keycodes { // Custom keycode to change screen modes (e.g. enable external screen) KC_SCRN = SAFE_RANGE, }; diff --git a/keyboards/lotus/gridpad/config.h b/keyboards/framework/gridpad/config.h similarity index 100% rename from keyboards/lotus/gridpad/config.h rename to keyboards/framework/gridpad/config.h diff --git a/keyboards/lotus/gridpad/gridpad.h b/keyboards/framework/gridpad/gridpad.h similarity index 100% rename from keyboards/lotus/gridpad/gridpad.h rename to keyboards/framework/gridpad/gridpad.h diff --git a/keyboards/lotus/gridpad/info.json b/keyboards/framework/gridpad/info.json similarity index 100% rename from keyboards/lotus/gridpad/info.json rename to keyboards/framework/gridpad/info.json diff --git a/keyboards/lotus/gridpad/keymaps/default/keymap.c b/keyboards/framework/gridpad/keymaps/default/keymap.c similarity index 100% rename from keyboards/lotus/gridpad/keymaps/default/keymap.c rename to keyboards/framework/gridpad/keymaps/default/keymap.c diff --git a/keyboards/lotus/gridpad/rules.mk b/keyboards/framework/gridpad/rules.mk similarity index 100% rename from keyboards/lotus/gridpad/rules.mk rename to keyboards/framework/gridpad/rules.mk diff --git a/keyboards/lotus/halconf.h b/keyboards/framework/halconf.h similarity index 100% rename from keyboards/lotus/halconf.h rename to keyboards/framework/halconf.h diff --git a/keyboards/lotus/iso/config.h b/keyboards/framework/iso/config.h similarity index 100% rename from keyboards/lotus/iso/config.h rename to keyboards/framework/iso/config.h diff --git a/keyboards/lotus/iso/info.json b/keyboards/framework/iso/info.json similarity index 100% rename from keyboards/lotus/iso/info.json rename to keyboards/framework/iso/info.json diff --git a/keyboards/lotus/iso/iso.h b/keyboards/framework/iso/iso.h similarity index 100% rename from keyboards/lotus/iso/iso.h rename to keyboards/framework/iso/iso.h diff --git a/keyboards/lotus/iso/keymaps/default/keymap.c b/keyboards/framework/iso/keymaps/default/keymap.c similarity index 100% rename from keyboards/lotus/iso/keymaps/default/keymap.c rename to keyboards/framework/iso/keymaps/default/keymap.c diff --git a/keyboards/lotus/iso/rules.mk b/keyboards/framework/iso/rules.mk similarity index 100% rename from keyboards/lotus/iso/rules.mk rename to keyboards/framework/iso/rules.mk diff --git a/keyboards/lotus/jis/config.h b/keyboards/framework/jis/config.h similarity index 100% rename from keyboards/lotus/jis/config.h rename to keyboards/framework/jis/config.h diff --git a/keyboards/lotus/jis/info.json b/keyboards/framework/jis/info.json similarity index 100% rename from keyboards/lotus/jis/info.json rename to keyboards/framework/jis/info.json diff --git a/keyboards/lotus/jis/jis.h b/keyboards/framework/jis/jis.h similarity index 100% rename from keyboards/lotus/jis/jis.h rename to keyboards/framework/jis/jis.h diff --git a/keyboards/lotus/jis/keymaps/default/keymap.c b/keyboards/framework/jis/keymaps/default/keymap.c similarity index 100% rename from keyboards/lotus/jis/keymaps/default/keymap.c rename to keyboards/framework/jis/keymaps/default/keymap.c diff --git a/keyboards/lotus/jis/rules.mk b/keyboards/framework/jis/rules.mk similarity index 100% rename from keyboards/lotus/jis/rules.mk rename to keyboards/framework/jis/rules.mk diff --git a/keyboards/lotus/kle/README.md b/keyboards/framework/kle/README.md similarity index 100% rename from keyboards/lotus/kle/README.md rename to keyboards/framework/kle/README.md diff --git a/keyboards/lotus/kle/ansi_layout.json b/keyboards/framework/kle/ansi_layout.json similarity index 100% rename from keyboards/lotus/kle/ansi_layout.json rename to keyboards/framework/kle/ansi_layout.json diff --git a/keyboards/lotus/kle/ansi_via.json b/keyboards/framework/kle/ansi_via.json similarity index 100% rename from keyboards/lotus/kle/ansi_via.json rename to keyboards/framework/kle/ansi_via.json diff --git a/keyboards/lotus/kle/gridpad_layout.json b/keyboards/framework/kle/gridpad_layout.json similarity index 100% rename from keyboards/lotus/kle/gridpad_layout.json rename to keyboards/framework/kle/gridpad_layout.json diff --git a/keyboards/lotus/kle/gridpad_via.json b/keyboards/framework/kle/gridpad_via.json similarity index 100% rename from keyboards/lotus/kle/gridpad_via.json rename to keyboards/framework/kle/gridpad_via.json diff --git a/keyboards/lotus/kle/iso_layout.json b/keyboards/framework/kle/iso_layout.json similarity index 100% rename from keyboards/lotus/kle/iso_layout.json rename to keyboards/framework/kle/iso_layout.json diff --git a/keyboards/lotus/kle/iso_via.json b/keyboards/framework/kle/iso_via.json similarity index 100% rename from keyboards/lotus/kle/iso_via.json rename to keyboards/framework/kle/iso_via.json diff --git a/keyboards/lotus/kle/jis_layout.json b/keyboards/framework/kle/jis_layout.json similarity index 100% rename from keyboards/lotus/kle/jis_layout.json rename to keyboards/framework/kle/jis_layout.json diff --git a/keyboards/lotus/kle/jis_via.json b/keyboards/framework/kle/jis_via.json similarity index 100% rename from keyboards/lotus/kle/jis_via.json rename to keyboards/framework/kle/jis_via.json diff --git a/keyboards/lotus/kle/numpad_layout.json b/keyboards/framework/kle/numpad_layout.json similarity index 100% rename from keyboards/lotus/kle/numpad_layout.json rename to keyboards/framework/kle/numpad_layout.json diff --git a/keyboards/lotus/kle/numpad_via.json b/keyboards/framework/kle/numpad_via.json similarity index 100% rename from keyboards/lotus/kle/numpad_via.json rename to keyboards/framework/kle/numpad_via.json diff --git a/keyboards/lotus/kle/via_design.json b/keyboards/framework/kle/via_design.json similarity index 100% rename from keyboards/lotus/kle/via_design.json rename to keyboards/framework/kle/via_design.json diff --git a/keyboards/lotus/kle/via_gridpad_design.json b/keyboards/framework/kle/via_gridpad_design.json similarity index 100% rename from keyboards/lotus/kle/via_gridpad_design.json rename to keyboards/framework/kle/via_gridpad_design.json diff --git a/keyboards/lotus/kle/via_iso_design.json b/keyboards/framework/kle/via_iso_design.json similarity index 100% rename from keyboards/lotus/kle/via_iso_design.json rename to keyboards/framework/kle/via_iso_design.json diff --git a/keyboards/lotus/kle/via_jis_design.json b/keyboards/framework/kle/via_jis_design.json similarity index 100% rename from keyboards/lotus/kle/via_jis_design.json rename to keyboards/framework/kle/via_jis_design.json diff --git a/keyboards/lotus/kle/via_numpad_design.json b/keyboards/framework/kle/via_numpad_design.json similarity index 100% rename from keyboards/lotus/kle/via_numpad_design.json rename to keyboards/framework/kle/via_numpad_design.json diff --git a/keyboards/lotus/led.py b/keyboards/framework/led.py similarity index 100% rename from keyboards/lotus/led.py rename to keyboards/framework/led.py diff --git a/keyboards/lotus/matrix.c b/keyboards/framework/matrix.c similarity index 98% rename from keyboards/lotus/matrix.c rename to keyboards/framework/matrix.c index 38d517c61b..9aad01b5bc 100644 --- a/keyboards/lotus/matrix.c +++ b/keyboards/framework/matrix.c @@ -11,7 +11,7 @@ #include "chprintf.h" #include "matrix.h" -#include "lotus.h" +#include "framework.h" #define adc10ksample_t int @@ -48,7 +48,8 @@ #define ADC_CH2_PIN GP28 // Voltage threshold - anything below that counts as pressed -const adc10ksample_t ADC_THRESHOLD = (adc10ksample_t) 2.9 * 10000; +// 29000 = 2.9V * 10000 +const adc10ksample_t ADC_THRESHOLD = (adc10ksample_t) 29000; adc10ksample_t to_voltage(adcsample_t sample) { int voltage = sample * 33000; diff --git a/keyboards/lotus/matrix.h b/keyboards/framework/matrix.h similarity index 100% rename from keyboards/lotus/matrix.h rename to keyboards/framework/matrix.h diff --git a/keyboards/lotus/mcuconf.h b/keyboards/framework/mcuconf.h similarity index 100% rename from keyboards/lotus/mcuconf.h rename to keyboards/framework/mcuconf.h diff --git a/keyboards/lotus/numpad/config.h b/keyboards/framework/numpad/config.h similarity index 100% rename from keyboards/lotus/numpad/config.h rename to keyboards/framework/numpad/config.h diff --git a/keyboards/lotus/numpad/info.json b/keyboards/framework/numpad/info.json similarity index 100% rename from keyboards/lotus/numpad/info.json rename to keyboards/framework/numpad/info.json diff --git a/keyboards/lotus/numpad/keymaps/default/keymap.c b/keyboards/framework/numpad/keymaps/default/keymap.c similarity index 100% rename from keyboards/lotus/numpad/keymaps/default/keymap.c rename to keyboards/framework/numpad/keymaps/default/keymap.c diff --git a/keyboards/lotus/numpad/numpad.h b/keyboards/framework/numpad/numpad.h similarity index 100% rename from keyboards/lotus/numpad/numpad.h rename to keyboards/framework/numpad/numpad.h diff --git a/keyboards/lotus/numpad/rules.mk b/keyboards/framework/numpad/rules.mk similarity index 100% rename from keyboards/lotus/numpad/rules.mk rename to keyboards/framework/numpad/rules.mk diff --git a/keyboards/lotus/readme.md b/keyboards/framework/readme.md similarity index 85% rename from keyboards/lotus/readme.md rename to keyboards/framework/readme.md index 1261a1f812..f8bbdd8449 100644 --- a/keyboards/lotus/readme.md +++ b/keyboards/framework/readme.md @@ -21,15 +21,15 @@ backlight options. Make example for this keyboard (after setting up your build environment): - qmk compile -kb lotus/ansi -km default - qmk compile -kb lotus/iso -km default - qmk compile -kb lotus/jis -km default - qmk compile -kb lotus/numpad -km default - qmk compile -kb lotus/gridpad -km default + qmk compile -kb framework/ansi -km default + qmk compile -kb framework/iso -km default + qmk compile -kb framework/jis -km default + qmk compile -kb framework/numpad -km default + qmk compile -kb framework/gridpad -km default Flashing example for the ANSI keyboard: - qmk compile -kb lotus/ansi -km default + qmk compile -kb framework/ansi -km default See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs). diff --git a/keyboards/lotus/rules.mk b/keyboards/framework/rules.mk similarity index 95% rename from keyboards/lotus/rules.mk rename to keyboards/framework/rules.mk index 9944a70ab0..54ff82fc83 100644 --- a/keyboards/lotus/rules.mk +++ b/keyboards/framework/rules.mk @@ -18,4 +18,4 @@ SRC += matrix.c analog.c SRC += dyn_serial.c factory.c -DEFAULT_FOLDER = lotus/ansi +DEFAULT_FOLDER = framework/ansi diff --git a/keyboards/lotus/build_all.sh b/keyboards/lotus/build_all.sh deleted file mode 100644 index 38e5f104c8..0000000000 --- a/keyboards/lotus/build_all.sh +++ /dev/null @@ -1,6 +0,0 @@ -set -e -qmk compile -kb lotus/ansi -km default -qmk compile -kb lotus/iso -km default -qmk compile -kb lotus/jis -km default -qmk compile -kb lotus/numpad -km default -qmk compile -kb lotus/gridpad -km default diff --git a/lib/python/qmk/cli/lint.py b/lib/python/qmk/cli/lint.py index 050d7121fd..4bc076e95e 100644 --- a/lib/python/qmk/cli/lint.py +++ b/lib/python/qmk/cli/lint.py @@ -125,7 +125,7 @@ def keymap_check(kb, km): invalid_files = git_get_ignored_files(keymap_path.parent.as_posix()) for file in invalid_files: # Ignore via files, I'm comitting them to this branch for now - if file.startswith('keyboards/lotus/kle/via'): + if file.startswith('keyboards/framework/kle/via'): continue cli.log.error(f'{kb}/{km}: The file "{file}" should not exist!') ok = False diff --git a/util/uf2conv.py b/util/uf2conv.py index 93171ce5d9..5c8fbc5210 100755 --- a/util/uf2conv.py +++ b/util/uf2conv.py @@ -10,7 +10,7 @@ import argparse import json # Don't even need -b. hex has this embedded -# > ./util/uf2conv.py .build/lotus_ansi_default.hex -o ansi.uf2 -b 0x10000000 -f rp2040 --convert --blocks-reserved 1 +# > ./util/uf2conv.py .build/framework_ansi_default.hex -o ansi.uf2 -b 0x10000000 -f rp2040 --convert --blocks-reserved 1 # Converted to 222 blocks # Converted to uf2, output size: 113664, start address: 0x10000000 # Wrote 113664 bytes to ansi.uf2