Browse Source

Add QMK Configurator Support for ORG60 (#3228)

* Add additional readme notes on how to fix the flickering backlight issue

* Add QMK Configurator support
MechMerlin 7 năm trước cách đây
mục cha
commit
2f8f26b1e0

Những thai đổi đã bị hủy bỏ vì nó quá lớn
+ 8 - 0
keyboards/org60/info.json


+ 3 - 3
keyboards/org60/keymaps/boardy/keymap.c

@@ -1,4 +1,4 @@
-#include "org60.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 
 // Keyboard Layers
@@ -9,7 +9,7 @@ enum keyboard_layers {
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
-  [_BASE] = KEYMAP(
+  [_BASE] = LAYOUT(
   /*
     0: Base Layer
     .--------------------------------------------------------------------------------------------------------------------------------------.
@@ -58,7 +58,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    //--------------------------------------------------------------------------------------------------------------------------------------'
 
 
-  [_FUNCTION] = KEYMAP(
+  [_FUNCTION] = LAYOUT(
   /*
     1: Function Layer
     .--------------------------------------------------------------------------------------------------------------------------------------.

+ 3 - 3
keyboards/org60/keymaps/default/keymap.c

@@ -1,10 +1,10 @@
-#include "org60.h"
+#include QMK_KEYBOARD_H
 #include "action_layer.h"
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   // 0: Base Layer
-  KEYMAP(
+  LAYOUT(
       KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,    KC_MINS,  KC_EQL,  KC_BSPC  ,  KC_NO,    \
       KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,    KC_LBRC,  KC_RBRC,           KC_BSLS,   \
       KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN, KC_QUOT,  KC_NO,             KC_ENT,    \
@@ -12,7 +12,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
       KC_LCTL, KC_LGUI, KC_LALT,                          KC_SPC,                          KC_RGUI, F(0),     KC_LEFT, KC_DOWN,  KC_RIGHT),
 
   // 1: Function Layer
-  KEYMAP(
+  LAYOUT(
       RESET,   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_NO,   KC_NO,    \
       KC_NO,   KC_WH_U, KC_UP,   KC_WH_D, KC_BSPC,KC_HOME,KC_CALC,KC_NO,  KC_INS, KC_NO,   KC_PSCR, KC_SLCK,  KC_PAUS,           KC_DEL,    \
       KC_NO,   KC_LEFT, KC_DOWN, KC_RIGHT,KC_DEL, KC_END, KC_PGDN,KC_NO,  KC_NO,  KC_NO,   KC_HOME, KC_PGUP,  KC_NO,             KC_ENT,    \

+ 1 - 1
keyboards/org60/org60.h

@@ -20,7 +20,7 @@ inline void org60_caps_led_off(void)   { DDRB &= ~(1<<2); PORTB &= ~(1<<2); }
 inline void org60_bl_led_off(void)   	{ DDRF &= ~(1<<5); PORTF &= ~(1<<5); }
 
 /* Org60 Keymap Definition Macro */
-#define KEYMAP( \
+#define LAYOUT( \
       K00,  K01,  K02,  K03,  K04,  K05,  K06,  K07,  K08,  K09,  K0A,  K0B,  K0C,  K0D,  K49, \
       K10,  K11,  K12,  K13,  K14,  K15,  K16,  K17,  K18,  K19,  K1A,  K1B,  K1C,  K1D,       \
       K20,  K21,  K22,  K23,  K24,  K25,  K26,  K27,  K28,  K29,  K2A,  K2B,  K2C,  K2D,       \

+ 7 - 1
keyboards/org60/readme.md

@@ -6,16 +6,22 @@
 ## Quantum MK Firmware
 For the full Quantum feature list, see [the parent readme.md](/readme.md).
 
-
 ## Additional Notes
+
+### GH60 Variant
 The Org60 seems to be a variant of the XD60 (which is essentially a GH60 rev. C, with support for a right-hand arrow cluster), which has USB-C and built-in RGB underlighting.
 
 Compatibility with GH60 expansion boards is unknown.
 
+### Support
 Board also supports in-switch LEDs (two-pin, single colour), as well as WS2182 LED strips for underglow lighting.
 
 Default keymap included, matching configuration on sale page.
 
+### Backlight Issues
+Taken from [r/mk](https://www.reddit.com/r/MechanicalKeyboards/comments/6xsd5c/modification_discovered_the_org60_pcb_has_a/)
+
+MOSFET that drives the in switch LEDs is not connected to a PWM pin. (It is connected to pin F5). Fix mentioned in reddit post re-routes to pin B5. You will have to change the pin to B5 in `config.h`
 
 ## Build
 To build the default keymap, simply run `make org60:default`.

Một số tệp đã không được hiển thị bởi vì quá nhiều tập tin thay đổi trong này khác