aboutsummaryrefslogtreecommitdiff
path: root/keyboards/moon
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/moon')
-rw-r--r--keyboards/moon/keyboard.json (renamed from keyboards/moon/info.json)9
-rw-r--r--keyboards/moon/matrix.c7
-rw-r--r--keyboards/moon/rules.mk13
3 files changed, 11 insertions, 18 deletions
diff --git a/keyboards/moon/info.json b/keyboards/moon/keyboard.json
index a89caf86d2..4c66cb51a9 100644
--- a/keyboards/moon/info.json
+++ b/keyboards/moon/keyboard.json
@@ -8,6 +8,15 @@
"pid": "0xFCB8",
"device_version": "0.0.1"
},
+ "features": {
+ "bootmagic": false,
+ "mousekey": true,
+ "extrakey": true,
+ "console": true,
+ "command": true,
+ "nkro": true,
+ "backlight": true
+ },
"backlight": {
"pin": "C6"
},
diff --git a/keyboards/moon/matrix.c b/keyboards/moon/matrix.c
index bb46e1b576..1cb9590e9f 100644
--- a/keyboards/moon/matrix.c
+++ b/keyboards/moon/matrix.c
@@ -14,15 +14,12 @@ GNU General Public License for more details.
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 <stdint.h>
-#include <stdbool.h>
#include "wait.h"
#include "print.h"
#include "debug.h"
#include "util.h"
#include "matrix.h"
#include "debounce.h"
-#include "quantum.h"
#include "pca9555.h"
/*
@@ -145,8 +142,8 @@ static void select_row(uint8_t row) {
static uint16_t read_cols(void) {
uint8_t state_1 = 0;
uint8_t state_2 = 0;
- pca9555_readPins(IC2, PCA9555_PORT0, &state_1);
- pca9555_readPins(IC2, PCA9555_PORT1, &state_2);
+ pca9555_read_pins(IC2, PCA9555_PORT0, &state_1);
+ pca9555_read_pins(IC2, PCA9555_PORT1, &state_2);
uint16_t state = (((uint16_t)state_1 & PORT0_COLS_MASK) << 3) | (((uint16_t)state_2 & PORT1_COLS_MASK));
diff --git a/keyboards/moon/rules.mk b/keyboards/moon/rules.mk
index 676f0971a2..aee52dfee1 100644
--- a/keyboards/moon/rules.mk
+++ b/keyboards/moon/rules.mk
@@ -1,16 +1,3 @@
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-MOUSEKEY_ENABLE = yes # Mouse keys
-EXTRAKEY_ENABLE = yes # Audio control and System control
-CONSOLE_ENABLE = yes # Console for debug
-COMMAND_ENABLE = yes # Commands for debug and configuration
-NKRO_ENABLE = yes # Enable N-Key Rollover
-BACKLIGHT_ENABLE = yes # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
-AUDIO_ENABLE = no # Audio output
-
# custom matrix setup
CUSTOM_MATRIX = yes