Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						3a22c4a31f
					
				
					 7 changed files with 206 additions and 0 deletions
				
			
		
							
								
								
									
										3
									
								
								keyboards/mechwild/bb40/f401/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/mechwild/bb40/f401/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "development_board": "blackpill_f401"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								keyboards/mechwild/bb40/f401/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/mechwild/bb40/f401/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
# This file intentionally left blank
 | 
			
		||||
							
								
								
									
										3
									
								
								keyboards/mechwild/bb40/f411/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										3
									
								
								keyboards/mechwild/bb40/f411/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
{
 | 
			
		||||
    "development_board": "blackpill_f411"
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										1
									
								
								keyboards/mechwild/bb40/f411/rules.mk
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										1
									
								
								keyboards/mechwild/bb40/f411/rules.mk
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1 @@
 | 
			
		|||
# This file intentionally left blank
 | 
			
		||||
							
								
								
									
										133
									
								
								keyboards/mechwild/bb40/info.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										133
									
								
								keyboards/mechwild/bb40/info.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,133 @@
 | 
			
		|||
{
 | 
			
		||||
    "manufacturer": "MechWild",
 | 
			
		||||
    "keyboard_name": "BB40",
 | 
			
		||||
    "maintainer": "kylemccreery",
 | 
			
		||||
    "bootloader_instructions": "Hold down the BOOT button, then tap the NRST button on the BlackPill. Avoid touching the A11 and A12 pins.",
 | 
			
		||||
    "diode_direction": "COL2ROW",
 | 
			
		||||
    "encoder": {
 | 
			
		||||
        "rotary": [
 | 
			
		||||
            {"pin_a": "B4", "pin_b": "B3"}
 | 
			
		||||
        ]
 | 
			
		||||
    },
 | 
			
		||||
    "features": {
 | 
			
		||||
        "bootmagic": true,
 | 
			
		||||
        "encoder": true,
 | 
			
		||||
        "extrakey": true,
 | 
			
		||||
        "mousekey": true,
 | 
			
		||||
        "nkro": true
 | 
			
		||||
    },
 | 
			
		||||
    "indicators": {
 | 
			
		||||
        "caps_lock": "B8",
 | 
			
		||||
        "num_lock": "B7",
 | 
			
		||||
        "scroll_lock": "B9"
 | 
			
		||||
    },
 | 
			
		||||
    "matrix_pins": {
 | 
			
		||||
        "cols": ["B10", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15"],
 | 
			
		||||
        "rows": ["B12", "B13", "B14", "B15"]
 | 
			
		||||
    },
 | 
			
		||||
    "url": "https://mechwild.com/product/bb40/",
 | 
			
		||||
    "usb": {
 | 
			
		||||
        "device_version": "1.0.0",
 | 
			
		||||
        "pid": "0x1714",
 | 
			
		||||
        "vid": "0x6D77"
 | 
			
		||||
    },
 | 
			
		||||
    "layout_aliases": {
 | 
			
		||||
        "LAYOUT": "LAYOUT_all"
 | 
			
		||||
    },
 | 
			
		||||
    "layouts": {
 | 
			
		||||
        "LAYOUT_6u": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"matrix": [0, 0], "x": 0, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 1, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 2, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 3, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 4, "y": 0},
 | 
			
		||||
                {"matrix": [0, 5], "x": 5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 6], "x": 6, "y": 0},
 | 
			
		||||
                {"matrix": [0, 7], "x": 7, "y": 0},
 | 
			
		||||
                {"matrix": [0, 8], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 4.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 1.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 2.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 3.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 4.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25},
 | 
			
		||||
                {"matrix": [2, 10], "x": 10, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 11, "y": 2},
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1, "y": 3},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2, "y": 3},
 | 
			
		||||
                {"matrix": [3, 6], "x": 3, "y": 3, "w": 6},
 | 
			
		||||
                {"matrix": [3, 8], "x": 9, "y": 3},
 | 
			
		||||
                {"matrix": [3, 9], "x": 10, "y": 3},
 | 
			
		||||
                {"matrix": [3, 10], "x": 11, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0}
 | 
			
		||||
            ]
 | 
			
		||||
        },
 | 
			
		||||
        "LAYOUT_all": {
 | 
			
		||||
            "layout": [
 | 
			
		||||
                {"matrix": [0, 0], "x": 0, "y": 0},
 | 
			
		||||
                {"matrix": [0, 1], "x": 1, "y": 0},
 | 
			
		||||
                {"matrix": [0, 2], "x": 2, "y": 0},
 | 
			
		||||
                {"matrix": [0, 3], "x": 3, "y": 0},
 | 
			
		||||
                {"matrix": [0, 4], "x": 4, "y": 0},
 | 
			
		||||
                {"matrix": [0, 5], "x": 5, "y": 0},
 | 
			
		||||
                {"matrix": [0, 6], "x": 6, "y": 0},
 | 
			
		||||
                {"matrix": [0, 7], "x": 7, "y": 0},
 | 
			
		||||
                {"matrix": [0, 8], "x": 8, "y": 0},
 | 
			
		||||
                {"matrix": [0, 9], "x": 9, "y": 0},
 | 
			
		||||
                {"matrix": [0, 10], "x": 10, "y": 0},
 | 
			
		||||
                {"matrix": [0, 11], "x": 11, "y": 0},
 | 
			
		||||
                {"matrix": [1, 0], "x": 0, "y": 1, "w": 1.25},
 | 
			
		||||
                {"matrix": [1, 1], "x": 1.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 2], "x": 2.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 3], "x": 3.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 4], "x": 4.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 5], "x": 5.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 6], "x": 6.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 7], "x": 7.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 8], "x": 8.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 9], "x": 9.25, "y": 1},
 | 
			
		||||
                {"matrix": [1, 11], "x": 10.25, "y": 1, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 0], "x": 0, "y": 2, "w": 1.75},
 | 
			
		||||
                {"matrix": [2, 2], "x": 1.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 3], "x": 2.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 4], "x": 3.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 5], "x": 4.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 6], "x": 5.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 7], "x": 6.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 8], "x": 7.75, "y": 2},
 | 
			
		||||
                {"matrix": [2, 9], "x": 8.75, "y": 2, "w": 1.25},
 | 
			
		||||
                {"matrix": [2, 10], "x": 10, "y": 2},
 | 
			
		||||
                {"matrix": [2, 11], "x": 11, "y": 2},
 | 
			
		||||
                {"matrix": [3, 0], "x": 0, "y": 3},
 | 
			
		||||
                {"matrix": [3, 1], "x": 1, "y": 3},
 | 
			
		||||
                {"matrix": [3, 2], "x": 2, "y": 3},
 | 
			
		||||
                {"matrix": [3, 4], "x": 3, "y": 3, "w": 2.25},
 | 
			
		||||
                {"matrix": [3, 6], "x": 5.25, "y": 3},
 | 
			
		||||
                {"matrix": [3, 7], "x": 6.25, "y": 3, "w": 2.75},
 | 
			
		||||
                {"matrix": [3, 8], "x": 9, "y": 3},
 | 
			
		||||
                {"matrix": [3, 9], "x": 10, "y": 3},
 | 
			
		||||
                {"matrix": [3, 10], "x": 11, "y": 3},
 | 
			
		||||
                {"matrix": [3, 11], "x": 12.5, "y": 3, "encoder": 0}
 | 
			
		||||
            ]
 | 
			
		||||
        }
 | 
			
		||||
    }
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										42
									
								
								keyboards/mechwild/bb40/keymaps/default/keymap.json
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										42
									
								
								keyboards/mechwild/bb40/keymaps/default/keymap.json
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,42 @@
 | 
			
		|||
{
 | 
			
		||||
   "keyboard": "mechwild/bb40",
 | 
			
		||||
   "keymap": "default",
 | 
			
		||||
   "version": 1,
 | 
			
		||||
   "layout": "LAYOUT_all",
 | 
			
		||||
   "layers": [
 | 
			
		||||
      [
 | 
			
		||||
         "KC_ESC",             "KC_Q",    "KC_W",    "KC_E",    "KC_R",    "KC_T",    "KC_Y",    "KC_U",    "KC_I",    "KC_O",            "KC_P",    "KC_BSPC",
 | 
			
		||||
         "MO(1)",              "KC_A",    "KC_S",    "KC_D",    "KC_F",    "KC_G",    "KC_H",    "KC_J",    "KC_K",    "KC_L",                       "KC_ENT",
 | 
			
		||||
         "KC_LSFT",            "KC_Z",    "KC_X",    "KC_C",    "KC_V",    "KC_B",    "KC_N",    "KC_M",               "RSFT_T(KC_COMM)", "KC_UP",   "LT(2,KC_DOT)",
 | 
			
		||||
         "KC_LCTL", "KC_LGUI", "KC_LALT",            "KC_SPC",             "LT(1,KC_SPC)",       "KC_SPC",             "KC_LEFT",         "KC_DOWN", "KC_RIGHT", "KC_MUTE"
 | 
			
		||||
      ],
 | 
			
		||||
      [
 | 
			
		||||
         "KC_TRNS",            "KC_1",    "KC_2",    "KC_3",    "KC_4",    "KC_5",    "KC_6",    "KC_7",    "KC_8",    "KC_9",    "KC_0",    "KC_TRNS",
 | 
			
		||||
         "KC_TRNS",            "KC_GRV",  "KC_LBRC", "KC_RBRC", "KC_MINS", "KC_TRNS", "KC_TRNS", "KC_EQL",  "KC_BSLS", "KC_SCLN",            "KC_QUOT",
 | 
			
		||||
         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_SLSH",
 | 
			
		||||
         "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
 | 
			
		||||
      ],
 | 
			
		||||
      [
 | 
			
		||||
         "KC_F1",              "KC_F2",   "KC_F3",   "KC_F4",   "KC_F5",   "KC_F6",   "KC_F7",   "KC_F8",   "KC_F9",   "KC_F10",  "KC_F11",  "KC_F12",
 | 
			
		||||
         "KC_CAPS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",
 | 
			
		||||
         "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS",
 | 
			
		||||
         "KC_TRNS", "KC_TRNS", "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS",            "KC_TRNS", "KC_TRNS", "KC_TRNS", "KC_TRNS"
 | 
			
		||||
      ]
 | 
			
		||||
   ],
 | 
			
		||||
   "config": {
 | 
			
		||||
      "features": {
 | 
			
		||||
         "encoder_map": true
 | 
			
		||||
      }
 | 
			
		||||
   },
 | 
			
		||||
   "encoders": [
 | 
			
		||||
      [
 | 
			
		||||
         {"ccw": "KC_VOLD", "cw": "KC_VOLU"}
 | 
			
		||||
      ],
 | 
			
		||||
      [
 | 
			
		||||
         {"ccw": "KC_TRNS", "cw": "KC_TRNS"}
 | 
			
		||||
      ],
 | 
			
		||||
      [
 | 
			
		||||
         {"ccw": "KC_TRNS", "cw": "KC_TRNS"}
 | 
			
		||||
      ]
 | 
			
		||||
   ]
 | 
			
		||||
}
 | 
			
		||||
							
								
								
									
										23
									
								
								keyboards/mechwild/bb40/readme.md
									
										
									
									
									
										Normal file
									
								
							
							
						
						
									
										23
									
								
								keyboards/mechwild/bb40/readme.md
									
										
									
									
									
										Normal file
									
								
							| 
						 | 
				
			
			@ -0,0 +1,23 @@
 | 
			
		|||
# BB40
 | 
			
		||||
 | 
			
		||||

 | 
			
		||||
 | 
			
		||||
A completely normal BlackPill-powered 40% DIY kit.
 | 
			
		||||
 | 
			
		||||
The `f401` version is the standard for this kit, using an STM32F401 BlackPill. The `f411` version will not run on an STM32F401 BlackPill; if in doubt, use `f401`.
 | 
			
		||||
 | 
			
		||||
* Keyboard Maintainer: [Kyle McCreery](https://github.com/kylemccreery)
 | 
			
		||||
* Hardware Supported: BB40 v1.0
 | 
			
		||||
* Hardware Availability: [BB40 on MechWild](https://mechwild.com/product/bb40/)
 | 
			
		||||
 | 
			
		||||
Make example for this keyboard (after setting up your build environment):
 | 
			
		||||
 | 
			
		||||
    make mechwild/bb40/f401:default
 | 
			
		||||
    make mechwild/bb40/f411:default
 | 
			
		||||
 | 
			
		||||
Flashing example for this keyboard:
 | 
			
		||||
 | 
			
		||||
    make mechwild/bb40/f401:default:flash
 | 
			
		||||
    make mechwild/bb40/f411: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).
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue