Deleted ludmila, add ludmila_v1

keyboards/mexsistor/ludmila/config.h

@@ -1,91 +0,0 @@
-/*
-Copyright 2020 Kevin M.
-
-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    0x69CC
-#define PRODUCT_ID   0x6BF6
-#define DEVICE_VER   0x0001
-#define MANUFACTURER Kevin M.
-#define PRODUCT      ludmila
-
-/* key matrix size */
-#define MATRIX_ROWS 3
-#define MATRIX_COLS 2
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS \
-    { F0, C7 }
-#define MATRIX_COL_PINS \
-    { F4, F1 }
-
-/* COL2ROW, ROW2COL*/
-#define DIODE_DIRECTION COL2ROW
-
-#define RGB_DI_PIN D1
-// #ifdef RGB_DI_PIN
-#define RGBLED_NUM 5
-#define RGBLIGHT_HUE_STEP 8
-#define RGBLIGHT_SAT_STEP 8
-#define RGBLIGHT_VAL_STEP 8
-#define RGBLIGHT_LIMIT_VAL 255 /* The maximum brightness level */
-#define RGBLIGHT_SLEEP         /* If defined, the RGB lighting will be switched off when the host goes to sleep */
-// /*== all animations enable ==*/
-// #define RGBLIGHT_ANIMATIONS
-// /*== or choose animations ==*/
-// #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
-// /*== customize breathing effect ==*/
-//   /*==== (DEFAULT) use fixed table instead of exp() and sin() ====*/
-//   #define RGBLIGHT_BREATHE_TABLE_SIZE 256      // 256(default) or 128 or 64
-//   /*==== use exp() and sin() ====*/
-//   #define RGBLIGHT_EFFECT_BREATHE_CENTER 1.85  // 1 to 2.7
-//   #define RGBLIGHT_EFFECT_BREATHE_MAX    255   // 0 to 255
-// #endif
-
-/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
-#define DEBOUNCE 0
-
-/* ENCODER THINGS */
-// #define ENCODER_DIRECTION_FLIP
-#define ENCODERS_PAD_A \
-    { F6 }
-#define ENCODERS_PAD_B \
-    { F5 }
-/* 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

keyboards/mexsistor/ludmila/keymaps/default/readme.md

@@ -1 +0,0 @@
-# The default keymap for ludmila

keyboards/mexsistor/ludmila_v1/config.h

@@ -0,0 +1,57 @@
+/*
+Copyright 2020 Kevin M.
+
+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    0x69CC
+#define PRODUCT_ID   0x6BF6
+#define DEVICE_VER   0x0001
+#define MANUFACTURER Kevin M.
+#define PRODUCT      ludmila_v1
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 2
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+#define MATRIX_ROW_PINS { F0, C7, F7 }
+#define MATRIX_COL_PINS { F4, F1 }
+#define UNUSED_PINS
+
+/* COL2ROW, ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+#define RGB_DI_PIN B7
+#define RGBLED_NUM 4
+#define RGBLIGHT_SLEEP
+#define RGBLIGHT_ANIMATIONS
+
+// Encoder
+#define ENCODERS_PAD_A { F6 }
+#define ENCODERS_PAD_B { F5 }

keyboards/mexsistor/ludmila_v1/info.json

@@ -1,5 +1,5 @@
 {
-    "keyboard_name": "ludmila",
+    "keyboard_name": "ludmila_v1",
     "url": "",
     "maintainer": "Kevin M.",
     "width": 3,

keyboards/mexsistor/ludmila_v1/keymaps/default/keymap.c

@@ -13,10 +13,9 @@
  * 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 QMK_KEYBOARD_H
 
-// Keyboard Layers
+// Defines names for use in layer keycodes and the keymap
 enum keyboard_layers{
     _BASE = 0,
     _CONTROL
@@ -24,7 +23,7 @@ enum keyboard_layers{
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
   [_BASE] = LAYOUT( /* Base */
-    KC_A, KC_B, KC_C,
+    KC_A, KC_B, KC_MUTE,
     KC_D, KC_E
 
   ),
@@ -34,10 +33,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 void encoder_update_user(uint8_t index, bool clockwise) {
     if (index == 0) {
         if (clockwise) {
-            tap_code(KC_F);
+            tap_code(KC_VOLU);
         } else {
-            tap_code(KC_G);
+            tap_code(KC_VOLD);
         }
     }
 }
-

keyboards/mexsistor/ludmila_v1/keymaps/default/readme.md

@@ -0,0 +1 @@
+# The default keymap for ludmila_v1

keyboards/mexsistor/ludmila_v1/ludmila_v1.c

@@ -14,4 +14,4 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "ludmila.h"
+#include "ludmila_v1.h"

keyboards/mexsistor/ludmila_v1/ludmila_v1.h

@@ -17,9 +17,8 @@
 #pragma once
 
 #include "quantum.h"
-#define ___ KC_NO
 
-/* This a shortcut to help you visually see your layout.
+/* This is a shortcut to help you visually see your layout.
  *
  * The first section contains all of the arguments representing the physical
  * layout of the board and position of the keys.
@@ -33,6 +32,5 @@
 ) { \
     { k00, k01, }, \
     { k10, k11, }, \
-    { k20, ___, }  \
+    { k20 }  \
-}
+  }
-

keyboards/mexsistor/ludmila_v1/matrix.c

@@ -256,14 +256,3 @@ static bool read_encoder_switches(matrix_row_t current_matrix[], uint8_t current
 
     return (last_row_value != current_matrix[current_row]);
 }
-void matrix_init_custom(void) {
-    // TODO: initialize hardware here
-}
-
-bool matrix_scan_custom(matrix_row_t current_matrix[]) {
-    bool matrix_has_changed = false;
-
-    // TODO: add matrix scanning routine here
-
-    return matrix_has_changed;
-}

keyboards/mexsistor/ludmila_v1/readme.md

@@ -1,8 +1,8 @@
-# Ludmila Pad
+# ludmila_v1
 
-![ludmila](https://mexsistor.com/wp-content/uploads/2020/09/IMG_2249-scaled.jpg)
+![ludmila_v1](https://mexsistor.com/wp-content/uploads/2020/09/IMG_2249-scaled.jpg)
 
-Ludmila is a 4 Key Macropad with one rotary encoder.
+Ludmila v1 is a 4 Key Macropad with one rotary encoder.
 
 * Keyboard Maintainer: [Kevin M.](https://github.com/mexsistor)
 * Hardware Supported: Ludmila PCB (atmega32u4)
@@ -10,10 +10,10 @@ Ludmila is a 4 Key Macropad with one rotary encoder.
 
 Make example for this keyboard (after setting up your build environment):
 
-    make mexsistor/ludmila:default
+    make mexsistor/ludmila_v1:default
 
 Flashing example for this keyboard:
 
-    make mexsistor/ludmila:default:flash
+    make mexsistor/ludmila_v1: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/mexsistor/ludmila_v1/rules.mk

@@ -2,25 +2,24 @@
 MCU = atmega32u4
 
 # Bootloader selection
-BOOTLOADER = caterina
+BOOTLOADER = atmel-dfu
 
 # Build Options
 #   change yes to no to disable
 #
-BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+BOOTMAGIC_ENABLE = lite     # Virtual DIP switch configuration
 MOUSEKEY_ENABLE = yes       # Mouse keys
 EXTRAKEY_ENABLE = yes       # Audio control and System control
-CONSOLE_ENABLE = yes        # Console for debug
+CONSOLE_ENABLE = no         # Console for debug
-COMMAND_ENABLE = yes        # Commands for debug and configuration
+COMMAND_ENABLE = no         # Commands for debug and configuration
 # Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
 SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
 # if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
 NKRO_ENABLE = no            # USB Nkey Rollover
 BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
-RGBLIGHT_ENABLE = yes       # Enable keyboard RGB underglow
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 BLUETOOTH_ENABLE = no       # Enable Bluetooth
 AUDIO_ENABLE = no           # Audio output
-ENCODER_ENABLE = yes        # Rotary Encoder support
+ENCODER_ENABLE = yes
+SRC = matrix.c
 CUSTOM_MATRIX = yes
-
-SRC += matrix.c