final keymap

keyboards/tweetydabird/lotus58/config.h

@@ -1,6 +1,93 @@
+/*
+Copyright 2021 TweetyDaBird
+
+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"
 
+// USB Device descriptor parameter
+#define VENDOR_ID    0xFEED
+#define PRODUCT_ID   0x0000
+#define DEVICE_VER   0x0001
+#define MANUFACTURER TweetyDaBird
+#define PRODUCT      Lotus58
+
+// Keyboard Matrix (Rows are doubled)
+#define MATRIX_ROWS 10
+#define MATRIX_COLS 6
+
+#define MATRIX_ROW_PINS { D4, C6, D7, E6, B4 }
+#define MATRIX_COL_PINS { B1, B2, B3, B6, F7, F6 }
+#define DIODE_DIRECTION COL2ROW
+
+/* Encoder support */
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F4 }
+#define ENCODERS_PAD_A_RIGHT { F4 }
+#define ENCODERS_PAD_B_RIGHT { F5 }
+#define ENCODER_RESOLUTION 1
+
+// Define Communication
+#define SOFT_SERIAL_PIN D2
+#define USE_SERIAL
+#define SERIAL_USE_MULTI_TRANSACTION
+#define SPLIT_MODS_ENABLE
+#define SPLIT_TRANSPORT_MIRROR
+
+// Disable depreciated
+#define NO_ACTION_MACRO
+#define NO_ACTION_FUNCTION
+
+#define SPLIT_USB_DETECT
+#define SPLIT_USB_TIMEOUT 2000
+#define SPLIT_USB_TIMEOUT_POLL 10
+
+#define SPLIT_HAND_PIN B5
+#define MASTER_RIGHT
+
+#define TAPPING_TERM 175
+#define TAPPING_TOGGLE 2
+#define TAP_CODE_DELAY 10
+
+#define NO_AUTO_SHIFT_SPECIAL
+#define NO_AUTO_SHIFT_NUMERIC
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* If defined, GRAVE_ESC will always act as ESC when CTRL is held.
+ * This is useful for the Windows task manager shortcut (ctrl+shift+esc).
+ */
+//#define GRAVE_ESC_CTRL_OVERRIDE
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+#define NO_ACTION_ONESHOT
+
+/* Bootmagic Lite key configuration */
 #define BOOTMAGIC_LITE_ROW 0
-#define BOOTMAGIC_LITE_COLUMN 5
+#define BOOTMAGIC_LITE_COLUMN 0

keyboards/tweetydabird/lotus58/info.json

@@ -0,0 +1,19 @@
+{
+    "keyboard_name": "lotus58",
+    "url": "",
+    "maintainer": "TweetyDaBird",
+    "width": 3,
+    "height": 2,
+    "layouts": {
+        "LAYOUT": {
+            "layout": [
+                {"label": "k00", "x": 0, "y": 0},
+                {"label": "k01", "x": 1, "y": 0},
+                {"label": "k02", "x": 2, "y": 0},
+
+                {"label": "k10", "x": 0, "y": 1, "w": 1.5},
+                {"label": "k12", "x": 1.5, "y": 1, "w": 1.5}
+            ]
+        }
+    }
+}

keyboards/tweetydabird/lotus58/keymaps/default/README.md

@@ -1 +1 @@
-Default keymap
+# The default keymap for lotus58

keyboards/tweetydabird/lotus58/lotus58.c

@@ -1 +1,17 @@
+/* Copyright 2021 TweetyDaBird
+ *
+ * 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 "lotus58.h"

keyboards/tweetydabird/lotus58/lotus58.h

@@ -1,5 +1,39 @@
+/* Copyright 2021 TweetyDaBird
+ *
+ * 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
 
-#ifdef KEYBOARD_lotus58_rev1
-    #include "rev1.h"
-#endif
+#include "quantum.h"
+
+#define LAYOUT( \
+    L00, L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04, R05,  \
+    L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
+    L20, L21, L22, L23, L24, L25,           R20, R21, R22, R23, R24, R25,  \
+    L30, L31, L32, L33, L34, L35, L45, R40, R30, R31, R32, R33, R34, R35, \
+              L40, L41, L42, L43, L44, R41, R42, R43, R44, R45  \
+    ) \
+    { \
+        { L00, L01, L02, L03, L04, L05 }, \
+        { L10, L11, L12, L13, L14, L15 }, \
+        { L20, L21, L22, L23, L24, L25 }, \
+        { L30, L31, L32, L33, L34, L35 }, \
+        { L40, L41, L42, L43, L44, L45 }, \
+        { R05, R04, R03, R02, R01, R00 }, \
+        { R15, R14, R13, R12, R11, R10 }, \
+        { R25, R24, R23, R22, R21, R20 }, \
+        { R35, R34, R33, R32, R31, R30 }, \
+        { R45, R44, R43, R42, R41, R40 } \
+    }

keyboards/tweetydabird/lotus58/readme.md

@@ -1,23 +1,19 @@
-# Lotus58 Glow Keyboard
+# lotus58
 
-Lotus58 Glow is 6×4+5 keys column-staggered split keyboard. Based on Lily58, Corne and Helix keyboards.
+![lotus58](imgur.com image replace me!)
 
-More details about the keyboard including parts list and build guide is available on GitHub: [Lotus58 Glow](https://github.com/TweetyDaBird/Lotus58)
+*A short description of the keyboard/project*
 
-* Keyboard Maintainer: [Markus Knutsson](https://github.com/TweetyDaBird)
-* Hardware Supported: Lotus58 Glow PCB, ProMicro  
-* Hardware Availability: [PCB & Case Data](https://github.com/TweetyDaBird/Lotus58)
+* Keyboard Maintainer: [TweetyDaBird](https://github.com/yourusername)
+* Hardware Supported: *The PCBs, controllers supported*
+* Hardware Availability: *Links to where you can find this hardware*
 
 Make example for this keyboard (after setting up your build environment):
 
     make lotus58:default
 
-Flash the default keymap: 
+Flashing example for this keyboard:
 
-    make lotus58:default:avrdude
-
-Press reset button on the keyboard when asked.
-
-Disconnect the first half, connect the second one and repeat the process.
+    make lotus58:default:flash
 
 See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).

keyboards/tweetydabird/lotus58/rules.mk

@@ -1,5 +1,21 @@
+# MCU name
 MCU = atmega32u4
+
+# Bootloader selection
 BOOTLOADER = caterina
-SPLIT_KEYBOARD = yes
-DEFAULT_FOLDER = lotus58/rev1
-BOOTMAGIC_ENABLE = lite
+
+# Build Options
+#   change yes to no to disable
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
+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            # USB Nkey Rollover
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+
+ENCODER_ENABLE = yes
+OLED_DRIVER_ENABLE = yes
+TAP_DANCE_ENABLE = yes
+AUTO_SHIFT_ENABLE = yes
+SPLIT_KEYBOARD = yes