Merge pull request #1 from schmintendo/main

Adding encoder support
wplnguyen · Jul 18, 2022 · 7e5b659 · 7e5b659
2 parents 5fed9e5 + a868ccb
commit 7e5b659
Show file tree

Hide file tree

Showing 7 changed files with 158 additions and 1,830 deletions.
diff --git a/bolsa_damapad_vial.hex b/bolsa_damapad_vial.hex
diff --git a/damapad/config.h b/damapad/config.h
@@ -29,7 +29,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #define PRODUCT_ID      0x6470
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    Bolsa Keyboard Supply
-#define PRODUCT         Damapad
+#define PRODUCT         Damapad Bongo Cat Edition  //Edited by wplnguyen & schmintendo
 
 /* key matrix size */
 #define MATRIX_ROWS 3

diff --git a/damapad/damapad.c b/damapad/damapad.c
diff --git a/damapad/keymaps/vial/keymap.c b/damapad/keymaps/vial/keymap.c
@@ -20,16 +20,33 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
     [0] = LAYOUT_wkl(
-        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MSEL, KC_MUTE,
+        KC_MPRV, KC_MPLY, KC_MNXT, KC_MSTP, KC_MSEL, TO(1),
         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_PGUP,  
         KC_NO,   KC_COPY,          KC_PASTE,         KC_PGDN
+    ),
+	[1] = LAYOUT_wkl(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(2),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+        KC_NO,   KC_TRNS,          KC_TRNS,          KC_TRNS
+    ),
+	[2] = LAYOUT_wkl(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(3),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+        KC_NO,   KC_TRNS,          KC_TRNS,          KC_TRNS
+    ),
+	[3] = LAYOUT_wkl(
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TO(0),
+        KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  
+        KC_NO,   KC_TRNS,          KC_TRNS,          KC_TRNS
     )
-
 };
 
 
 #if defined(ENCODER_MAP_ENABLE)
 const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = {
-    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)}
+    [0] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
+	[1] = {ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+	[2] = {ENCODER_CCW_CW(KC_TRNS, KC_TRNS)},
+	[3] = {ENCODER_CCW_CW(KC_TRNS, KC_TRNS)}
 };
 #endif
diff --git a/damapad/keymaps/vial/rules.mk b/damapad/keymaps/vial/rules.mk
@@ -4,4 +4,4 @@ LTO_ENABLE = yes
 TAP_DANCE_ENABLE = no
 COMBO_ENABLE = no
 KEY_OVERRIDE_ENABLE = no
-ENCODER_MAP_ENABLE = yes
+ENCODER_MAP_ENABLE = yes
diff --git a/damapad/keymaps/vial/vial.json b/damapad/keymaps/vial/vial.json
@@ -1,3 +1,4 @@
+
 {
   "name": "Damapad",
   "vendorId": "0x6D64",
@@ -11,13 +12,13 @@
     "labels": [["Bottom Left","WKL","Space"]],
     "keymap": [
       [
-        {
-          "x": 5.25
-        },
-        "0,5",
+		{
+			"x": 5.25
+		},
+		"0,5",
 		"0,0\n\n\n\n\n\n\n\n\ne",
-        "0,1\n\n\n\n\n\n\n\n\ne"
-      ],
+		"0,1\n\n\n\n\n\n\n\n\ne"
+	  ],
       [
         {
           "y": -0.75

diff --git a/damapad/readme.md b/damapad/readme.md
@@ -3,11 +3,16 @@
 A Macropad by Bolsa Supply
 
 -   Keyboard Maintainer: [matthewdias](https://github.com/matthewdias)
+-   Bongocat Additions, Vial Support: [@wplnguyen](https://github.com/wplnguyen) and [@schmintendo](https://github.com/schmintendo)
 -   Hardware Supported: Damapad PCB
 
 Make example for this keyboard (after setting up your build environment):
 
     make bolsa/damapad:default
+
+ Or do this for Vial support (this repo):
+
+    make bolsa/damapad:vial
 
 Flashing example for this keyboard: