Merge remote-tracking branch 'qmk/master' into merge-2024-06-23

keyboards/nullbitsco/nibble/big_led.c

@@ -24,13 +24,13 @@ void set_big_LED_rgb(uint8_t r_mode, uint8_t g_mode, uint8_t b_mode) {
 void set_big_LED_r(uint8_t mode) {
     switch(mode) {
         case LED_ON:
-            setPinOutput(BIG_LED_R_PIN);
-            writePin(BIG_LED_R_PIN, GPIO_STATE_HIGH);
+            gpio_set_pin_output(BIG_LED_R_PIN);
+            gpio_write_pin(BIG_LED_R_PIN, GPIO_STATE_HIGH);
         break;
 
         case LED_OFF:
-            setPinOutput(BIG_LED_R_PIN);
-            writePin(BIG_LED_R_PIN, GPIO_STATE_LOW);
+            gpio_set_pin_output(BIG_LED_R_PIN);
+            gpio_write_pin(BIG_LED_R_PIN, GPIO_STATE_LOW);
         break;
 
         default:
@@ -41,13 +41,13 @@ void set_big_LED_r(uint8_t mode) {
 void set_big_LED_g(uint8_t mode) {
     switch(mode) {
         case LED_ON:
-            setPinOutput(BIG_LED_G_PIN);
-            writePin(BIG_LED_G_PIN, GPIO_STATE_HIGH);
+            gpio_set_pin_output(BIG_LED_G_PIN);
+            gpio_write_pin(BIG_LED_G_PIN, GPIO_STATE_HIGH);
         break;
 
         case LED_OFF:
-            setPinOutput(BIG_LED_G_PIN);
-            writePin(BIG_LED_G_PIN, GPIO_STATE_LOW);
+            gpio_set_pin_output(BIG_LED_G_PIN);
+            gpio_write_pin(BIG_LED_G_PIN, GPIO_STATE_LOW);
         break;
 
         default:
@@ -58,13 +58,13 @@ void set_big_LED_g(uint8_t mode) {
 void set_big_LED_b(uint8_t mode) {
     switch(mode) {
         case LED_ON:
-            setPinOutput(BIG_LED_B_PIN);
-            writePin(BIG_LED_B_PIN, GPIO_STATE_HIGH);
+            gpio_set_pin_output(BIG_LED_B_PIN);
+            gpio_write_pin(BIG_LED_B_PIN, GPIO_STATE_HIGH);
         break;
 
         case LED_OFF:
-            setPinOutput(BIG_LED_B_PIN);
-            writePin(BIG_LED_B_PIN, GPIO_STATE_LOW);
+            gpio_set_pin_output(BIG_LED_B_PIN);
+            gpio_write_pin(BIG_LED_B_PIN, GPIO_STATE_LOW);
         break;
 
         default:

keyboards/nullbitsco/nibble/big_led.h

@@ -15,7 +15,8 @@
  */
 #pragma once
 
-#include "quantum.h"
+#include <stdint.h>
+#include "gpio.h"
 
 /* Optional big LED pins */
 #define BIG_LED_R_PIN D7

keyboards/nullbitsco/nibble/keyboard.json

@@ -7,6 +7,17 @@
         "pid": "0x6060",
         "device_version": "0.0.1"
     },
+    "build": {
+        "lto": true
+    },
+    "features": {
+        "bootmagic": false,
+        "encoder": true,
+        "extrakey": true,
+        "mousekey": false,
+        "nkro": true,
+        "rgblight": true
+    },
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "B4"}

keyboards/nullbitsco/nibble/keymaps/default/keymap.c

@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F16, KC_LCTL, KC_LGUI, KC_LALT,                   KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT,          KC_DOWN, KC_RGHT
   ),
   [_FN] = LAYOUT_ansi(
-               QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_END,
+             QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, _______,  KC_END,
     RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,

keyboards/nullbitsco/nibble/keymaps/iso/keymap.c

@@ -33,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
     KC_F16,  KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    MO(_FN), KC_RALT, KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
   ),
   [_FN] = LAYOUT_iso(
-               QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_HOME,  KC_INS,
+             QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,  KC_F10,  KC_F11,  KC_F12, KC_HOME,  KC_INS,
     RGB_TOG, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.c

@@ -13,8 +13,15 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+
 #include "oled_display.h"
+#include "keycodes.h"
+#include "progmem.h"
+#include "host.h"
+#include "timer.h"
+#include "wpm.h"
+#include "rgblight.h"
+#include "oled_driver.h"
 
 static const char PROGMEM oled_mode_messages[5][15] = {
     "",

keyboards/nullbitsco/nibble/keymaps/oled_status/oled_display.h

@@ -15,6 +15,8 @@
  */
 #pragma once
 
+#include <stdint.h>
+
 typedef enum {
     OLED_MODE_IDLE = 0,
     OLED_MODE_VOLUME_UP = 1,

keyboards/nullbitsco/nibble/keymaps/via/keymap.c

@@ -49,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   ),
 
   [_VIA1] = LAYOUT_all(
-              QK_BOOT,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
+              QK_BOOT, KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,  KC_END,
     RGB_TOG,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______,
     _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,

keyboards/nullbitsco/nibble/matrix.c

@@ -13,7 +13,8 @@
  * You should have received a copy of the GNU General Public License
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
-#include "quantum.h"
+#include "matrix.h"
+#include "wait.h"
 
 #define COL_SHIFTER ((uint32_t)1)
 
@@ -26,17 +27,17 @@ static const uint8_t col_pins[MATRIX_MUX_COLS] = MATRIX_COL_MUX_PINS;
 static void init_pins(void) {
     // Set cols to outputs, low
     for (uint8_t pin = 0; pin < MATRIX_MUX_COLS; pin++) {
-        setPinOutput(col_pins[pin]);
+        gpio_set_pin_output(col_pins[pin]);
     }
     
     // Unselect cols
     for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) {
-        writePinLow(col_pins[bit]);
+        gpio_write_pin_low(col_pins[bit]);
     }
 
     // Set rows to input, pullup
     for (uint8_t pin = 0; pin < MATRIX_ROWS; pin++) {
-        setPinInputHigh(row_pins[pin]);
+        gpio_set_pin_input_high(row_pins[pin]);
     }
 }
 
@@ -44,7 +45,7 @@ static void select_col(uint8_t col)
 {
     for (uint8_t bit = 0; bit < MATRIX_MUX_COLS; bit++) {
         uint8_t state = (col & (0b1 << bit)) >> bit;
-        writePin(col_pins[bit], state);
+        gpio_write_pin(col_pins[bit], state);
     }
 }
 
@@ -59,7 +60,7 @@ static bool read_rows_on_col(matrix_row_t current_matrix[], uint8_t current_col)
     {
         matrix_row_t last_row_value = current_matrix[row_index];
 
-        if (!readPin(row_pins[row_index]))
+        if (!gpio_read_pin(row_pins[row_index]))
         {
             current_matrix[row_index] |= (COL_SHIFTER << current_col);
         }

keyboards/nullbitsco/nibble/rules.mk

@@ -1,22 +1,9 @@
-# Build Options
-#   change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = no        # Mouse keys
-EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = no         # Commands for debug and configuration
-NKRO_ENABLE = yes           # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
-AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Use rotary encoder
-LTO_ENABLE = yes            # Link-time optimization
-CUSTOM_MATRIX = lite        # Lite custom matrix
+CUSTOM_MATRIX = lite
+
+UART_DRIVER_REQUIRED = yes
 
 # Project specific files
 SRC += matrix.c \
        common/bitc_led.c \
        big_led.c \
        common/remote_kb.c
-UART_DRIVER_REQUIRED = yes