Merge upstream master

3 files changed, 161 insertions, 0 deletions

diff --git a/keyboards/fallacy/config.h b/keyboards/fallacy/config.h
new file mode 100755
index 0000000000..b941af432c
--- /dev/null
+++ b/keyboards/fallacy/config.h
@@ -0,0 +1,64 @@
+/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
+ *
+ * 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
+
+#include "config_common.h"
+
+/* key matrix size
+ */
+#define MATRIX_ROWS 5
+#define MATRIX_COLS 15
+
+/* key matrix pins
+ */
+#define MATRIX_ROW_PINS { B1, B2, B3, C6, C7 }
+#define MATRIX_COL_PINS { E6, F0, F1, F4, F5, F6, F7, B6, B5, B4, D7, D6, D4, D5, D3 }
+
+/* COL2ROW or ROW2COL
+ */
+#define DIODE_DIRECTION COL2ROW
+
+/* IS31FL3731 driver address (for status LEDs)
+ * Using the default defines here, but using a custom implementation
+ */
+#define LED_DRIVER_ADDR_1 0b1110100
+#define LED_DRIVER_COUNT 1
+#define LED_MATRIX_LED_COUNT 3
+
+/* Set 0 if debouncing isn't needed
+ */
+#define DEBOUNCE 5
+
+/* 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
+
+#define RGB_DI_PIN D2
+#define RGBLIGHT_EFFECT_BREATHING
+#define RGBLIGHT_EFFECT_RAINBOW_MOOD
+#define RGBLIGHT_EFFECT_RAINBOW_SWIRL
+#define RGBLIGHT_EFFECT_SNAKE
+#define RGBLIGHT_EFFECT_KNIGHT
+#define RGBLIGHT_EFFECT_CHRISTMAS
+#define RGBLIGHT_EFFECT_STATIC_GRADIENT
+#define RGBLIGHT_EFFECT_RGB_TEST
+#define RGBLIGHT_EFFECT_ALTERNATING
+#define RGBLIGHT_EFFECT_TWINKLE
+#define RGBLED_NUM 14
diff --git a/keyboards/fallacy/fallacy.c b/keyboards/fallacy/fallacy.c
new file mode 100755
index 0000000000..486084098a
--- /dev/null
+++ b/keyboards/fallacy/fallacy.c
@@ -0,0 +1,36 @@
+/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
+ *
+ * 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/>.
+ */
+
+#include "fallacy.h"
+#include "indicators.h"
+
+void matrix_init_kb(void) {
+    init_fallacy_leds();
+    matrix_init_user();
+}
+
+void matrix_scan_kb(void) {
+    update_fallacy_leds();
+    matrix_scan_user();
+}
+ 
+/* update LED driver with usb led_state
+ */
+void led_update_ports(led_t led_state) {
+    set_fallacy_led(2, led_state.caps_lock);    /* caps */
+    set_fallacy_led(1, led_state.num_lock);     /* num lock */
+    set_fallacy_led(0, led_state.scroll_lock);  /* scroll lock */
+}
diff --git a/keyboards/fallacy/indicators.c b/keyboards/fallacy/indicators.c
new file mode 100755
index 0000000000..8686f292fc
--- /dev/null
+++ b/keyboards/fallacy/indicators.c
@@ -0,0 +1,61 @@
+/* Copyright 2020 B. Fletcher (toraifu) <typefast@kyaa.gg>
+ *
+ * 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/>.
+ */
+
+#include "indicators.h"
+#include "drivers/led/issi/is31fl3731-simple.h"
+#include "i2c_master.h"
+
+/* Set up IS31FL3731 for use in powering indicator LEDs. Absolutely overkill for this job but it was already in the design.
+ * init IS31FL3731 and i2c
+ */
+void init_fallacy_leds(void) {
+    i2c_init();
+    IS31FL3731_init(LED_DRIVER_ADDR_1);
+
+    for (int i = 0; i < LED_MATRIX_LED_COUNT; i++) {
+        IS31FL3731_set_led_control_register(i, true);
+    }
+
+    IS31FL3731_update_led_control_registers(LED_DRIVER_ADDR_1, 0);
+}
+
+
+/* update the buffer
+ */
+void update_fallacy_leds(void) {
+    IS31FL3731_update_pwm_buffers(LED_DRIVER_ADDR_1, 0);    
+}
+
+
+/* wrapper to actually set the LED PWM
+ */
+void set_fallacy_led(int index, bool state) {
+    if (state) {
+        IS31FL3731_set_value(index, 128);
+    } 
+    else {
+        IS31FL3731_set_value(index, 0);
+    }
+}
+
+
+/* define LED matrix
+ */
+const is31_led PROGMEM g_is31_leds[LED_MATRIX_LED_COUNT] = {
+    {0, C1_1},
+    {0, C2_1},
+    {0, C3_1},
+};