Rename lotus to framework

Signed-off-by: Daniel Schaefer <dhs@frame.work>

.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

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] = {
      /*

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

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

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

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();

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,
 };

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;

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).
 

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

keyboards/lotus/build_all.sh

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

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

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