Merge remote-tracking branch 'origin/develop' into xap

data/mappings/keyboard_aliases.hjson

@@ -1731,6 +1731,9 @@
     "handwired/unk": {
         "target": "handwired/unk/rev1"
     },
+    "handwired/xealous": {
+        "target": "handwired/xealous/rev1"
+    },
     "hillside/46": {
         "target": "hillside/46/0_1"
     },

keyboards/handwired/xealous/config.h

@@ -1,32 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-Copyright 2015 Jack Humbert
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.
-*/
-
-#pragma once
-
-#define USE_I2C
-#define SCL_CLOCK  800000UL
-
-//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
-
-#ifdef AUDIO_ENABLE
-  #define AUDIO_PIN C6
-  #define STARTUP_SONG SONG(STARTUP_SOUND)
-  #define NO_MUSIC_MODE
-  #define TONE_QWERTY SONG(Q__NOTE(_E4));
-  #define TONE_NUMPAD SONG(Q__NOTE(_D4));
-#endif

keyboards/handwired/xealous/matrix.c

@@ -1,49 +0,0 @@
-/*
-Copyright 2012 Jun Wako <wakojun@gmail.com>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation, either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-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/>.
-*/
-
-/*
- * scan matrix
- */
-#include <stdint.h>
-#include <stdbool.h>
-#include <avr/io.h>
-#include "wait.h"
-#include "print.h"
-#include "debug.h"
-#include "util.h"
-#include "matrix.h"
-#include "split_util.h"
-#include "timer.h"
-
-// Copy this code to split_common/matrix.c,
-// and call it instead of the unoptimized col_reader. Scan-rate jumps from 1200->1920
-// Also remove the sleep_us(30), not necessary for this keyboard.
-// In usb_descriptor.c, set .PollingIntervalMS      = 0x01
-#define ROW_SHIFTER ((uint8_t)1)
-inline static matrix_row_t optimized_col_reader(void) {
-    //MATRIX_COL_PINS { B6, B2, B3, B1, F7, F6, F5, F4 }
-    return (PINB & (1 << 6) ? 0 : (ROW_SHIFTER << 0)) |
-          (PINB & (1 << 2) ? 0 : (ROW_SHIFTER << 1)) |
-          (PINB & (1 << 3) ? 0 : (ROW_SHIFTER << 2)) |
-          (PINB & (1 << 1) ? 0 : (ROW_SHIFTER << 3)) |
-          (PINF & (1 << 7) ? 0 : (ROW_SHIFTER << 4)) |
-          (PINF & (1 << 6) ? 0 : (ROW_SHIFTER << 5)) |
-          (PINF & (1 << 5) ? 0 : (ROW_SHIFTER << 6)) |
-          (PINF & (1 << 4) ? 0 : (ROW_SHIFTER << 7));
-}
-
-

keyboards/handwired/xealous/rev1/config.h

@@ -18,6 +18,19 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 #pragma once
 
+#define USE_I2C
+#define SCL_CLOCK  800000UL
+
+//#define DEBUG_MATRIX_SCAN_RATE //Use this to determine scan-rate.
+
+#ifdef AUDIO_ENABLE
+  #define AUDIO_PIN C6
+  #define STARTUP_SONG SONG(STARTUP_SOUND)
+  #define NO_MUSIC_MODE
+  #define TONE_QWERTY SONG(Q__NOTE(_E4));
+  #define TONE_NUMPAD SONG(Q__NOTE(_D4));
+#endif
+
 /*
  * Feature disable options
  *  These options are also useful to firmware size reduction.

keyboards/handwired/xealous/rules.mk

@@ -1,3 +0,0 @@
-SRC += matrix.c
-
-DEFAULT_FOLDER = handwired/xealous/rev1