aboutsummaryrefslogtreecommitdiff
path: root/keyboards/molecule
diff options
context:
space:
mode:
authorNick Brassel <[email protected]>2024-05-28 14:39:23 +1000
committerNick Brassel <[email protected]>2024-05-28 14:39:23 +1000
commitf76cc320fd9f3365a80cc0d8af2990bc28d76bde (patch)
tree3c5330bbc9ab254424ac57335510de341b4ada11 /keyboards/molecule
parent7620c64b99dc5bec480bfaa2708cb3fae709e2b3 (diff)
parent465ab5a20643722c9b712c6b6924472b7345dd64 (diff)
downloadqmk_firmware-f76cc320fd9f3365a80cc0d8af2990bc28d76bde.tar.gz
qmk_firmware-f76cc320fd9f3365a80cc0d8af2990bc28d76bde.zip
Merge branch 'develop'
Diffstat (limited to 'keyboards/molecule')
-rw-r--r--keyboards/molecule/adns.c2
-rw-r--r--keyboards/molecule/adns.h2
-rwxr-xr-xkeyboards/molecule/config.h5
-rwxr-xr-xkeyboards/molecule/keyboard.json (renamed from keyboards/molecule/info.json)12
-rwxr-xr-xkeyboards/molecule/keymaps/default/keymap.c6
-rwxr-xr-xkeyboards/molecule/keymaps/default/readme.md1
-rwxr-xr-xkeyboards/molecule/rules.mk14
7 files changed, 15 insertions, 27 deletions
diff --git a/keyboards/molecule/adns.c b/keyboards/molecule/adns.c
index 96fc83ee0b..0648193557 100644
--- a/keyboards/molecule/adns.c
+++ b/keyboards/molecule/adns.c
@@ -16,7 +16,7 @@
#include "spi_master.h"
#include "adns.h"
#include "debug.h"
-#include "quantum.h"
+#include "wait.h"
#include "pointing_device.h"
#include "adns9800_srom_A6.h"
diff --git a/keyboards/molecule/adns.h b/keyboards/molecule/adns.h
index d684d3cbcb..e557aeb2ec 100644
--- a/keyboards/molecule/adns.h
+++ b/keyboards/molecule/adns.h
@@ -15,6 +15,8 @@
*/
#pragma once
+#include <stdint.h>
+
void adns_begin(void);
void adns_end(void);
diff --git a/keyboards/molecule/config.h b/keyboards/molecule/config.h
index 1755979bbc..3de5dc14cc 100755
--- a/keyboards/molecule/config.h
+++ b/keyboards/molecule/config.h
@@ -20,11 +20,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
/* OLED */
#define OLED_TIMEOUT 0
-/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
-#define LOCKING_SUPPORT_ENABLE
-/* Locking resynchronize hack */
-#define LOCKING_RESYNC_ENABLE
-
/*
* Feature disable options
* These options are also useful to firmware size reduction.
diff --git a/keyboards/molecule/info.json b/keyboards/molecule/keyboard.json
index 51ca67c282..94c721f752 100755
--- a/keyboards/molecule/info.json
+++ b/keyboards/molecule/keyboard.json
@@ -8,6 +8,18 @@
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": true,
+ "mousekey": true,
+ "extrakey": true,
+ "pointing_device": true
+ },
+ "qmk": {
+ "locking": {
+ "enabled": true,
+ "resync": true
+ }
+ },
"matrix_pins": {
"cols": ["D3", "D2", "D1", "D0", "D4", "C6", "D7", "E6", "B4", "B5"],
"rows": ["F4", "F5", "F6", "B6"]
diff --git a/keyboards/molecule/keymaps/default/keymap.c b/keyboards/molecule/keymaps/default/keymap.c
index bceed5774d..9030ba98d1 100755
--- a/keyboards/molecule/keymaps/default/keymap.c
+++ b/keyboards/molecule/keymaps/default/keymap.c
@@ -24,12 +24,6 @@ enum layer_names {
_FN,
};
-// Defines the keycodes used by our macros in process_record_user
-enum custom_keycodes {
- QMKBEST = SAFE_RANGE,
- QMKURL
-};
-
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
[_QWERTY_BASE] = LAYOUT(
KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
diff --git a/keyboards/molecule/keymaps/default/readme.md b/keyboards/molecule/keymaps/default/readme.md
deleted file mode 100755
index 136c2c986a..0000000000
--- a/keyboards/molecule/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# The default keymap for molecule
diff --git a/keyboards/molecule/rules.mk b/keyboards/molecule/rules.mk
index 06a8f490ee..3272be5a9b 100755
--- a/keyboards/molecule/rules.mk
+++ b/keyboards/molecule/rules.mk
@@ -1,18 +1,4 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # 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 = no # Enable N-Key Rollover
-BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# Add trackball support
-POINTING_DEVICE_ENABLE = yes
POINTING_DEVICE_DRIVER = custom
SRC += adns.c
SPI_DRIVER_REQUIRED = yes