Jack Humbert пре 7 година
родитељ
комит
0a7efccdc6
2 измењених фајлова са 85 додато и 83 уклоњено
  1. 3 3
      keyboards/moonlander/keymaps/default/keymap.c
  2. 82 80
      keyboards/moonlander/moonlander.c

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

@@ -20,7 +20,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 [0] = LAYOUT_moonlander(
-  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
+  RGB_MOD, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,
   KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,
   KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,
@@ -36,7 +36,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [1] = LAYOUT_moonlander(
-  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
+  RGB_MOD, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,
   KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,
   KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,
@@ -52,7 +52,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 ),
 
 [1] = LAYOUT_moonlander(
-  KC_GRV, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
+  RGB_MOD, KC_1,   KC_2,   KC_3,   KC_4,   KC_5,   KC_6,
   KC_TAB, KC_Q,   KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,
   KC_ESC, KC_A,   KC_S,   KC_D,   KC_F,   KC_G,   KC_H,
   KC_LSFT,KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,

+ 82 - 80
keyboards/moonlander/moonlander.c

@@ -31,6 +31,8 @@ void matrix_init_kb(void) {
   mcp23018_leds[0] = 0; // blue
   mcp23018_leds[1] = 0; // green
   mcp23018_leds[2] = 0; // red
+
+  eeconfig_init();
 }
 
 void matrix_scan_kb(void) {
@@ -171,94 +173,94 @@ rgb_led g_rgb_leds[DRIVER_LED_TOTAL] = {
       |              |                 modifier
       |              |                 | */
     {{0|(0<<4)},   {17.23*0, 21.33*0}, 1},
-    {{1|(0<<4)},   {17.23*0, 21.33*1}, 0},
-    {{2|(0<<4)},   {17.23*0, 21.33*2}, 0},
-    {{3|(0<<4)},   {17.23*0, 21.33*3}, 0},
-    {{4|(0<<4)},   {17.23*0, 21.33*4}, 0},
-
-    {{0|(1<<4)},   {17.23*1, 21.33*0}, 0},
-    {{1|(1<<4)},   {17.23*1, 21.33*1}, 0},
-    {{2|(1<<4)},   {17.23*1, 21.33*2}, 0},
-    {{3|(1<<4)},   {17.23*1, 21.33*3}, 0},
-    {{4|(1<<4)},   {17.23*1, 21.33*4}, 0},
-
-    {{0|(2<<4)},   {17.23*2, 21.33*0}, 0},
-    {{1|(2<<4)},   {17.23*2, 21.33*1}, 0},
-    {{2|(2<<4)},   {17.23*2, 21.33*2}, 0},
-    {{3|(2<<4)},   {17.23*2, 21.33*3}, 0},
-    {{4|(2<<4)},   {17.23*2, 21.33*4}, 0},
-
-    {{0|(3<<4)},   {17.23*3, 21.33*0}, 0},
-    {{1|(3<<4)},   {17.23*3, 21.33*1}, 0},
-    {{2|(3<<4)},   {17.23*3, 21.33*2}, 0},
-    {{3|(3<<4)},   {17.23*3, 21.33*3}, 0},
-    {{4|(3<<4)},   {17.23*3, 21.33*4}, 0},
-
-    {{0|(4<<4)},   {17.23*4, 21.33*0}, 0},
-    {{1|(4<<4)},   {17.23*4, 21.33*1}, 0},
-    {{2|(4<<4)},   {17.23*4, 21.33*2}, 0},
-    {{3|(4<<4)},   {17.23*4, 21.33*3}, 0},
-    {{4|(4<<4)},   {17.23*4, 21.33*4}, 0},
-
-    {{0|(5<<4)},   {17.23*5, 21.33*0}, 0},
-    {{1|(5<<4)},   {17.23*5, 21.33*1}, 0},
-    {{2|(5<<4)},   {17.23*5, 21.33*2}, 0},
-    {{3|(5<<4)},   {17.23*5, 21.33*3}, 0},
-
-    {{0|(6<<4)},   {17.23*6, 21.33*0}, 0},
-    {{1|(6<<4)},   {17.23*6, 21.33*1}, 0},
-    {{2|(6<<4)},   {17.23*6, 21.33*2}, 0},
+    {{1|(0<<4)},   {17.23*0, 21.33*1}, 4},
+    {{2|(0<<4)},   {17.23*0, 21.33*2}, 4},
+    {{3|(0<<4)},   {17.23*0, 21.33*3}, 4},
+    {{4|(0<<4)},   {17.23*0, 21.33*4}, 4},
+
+    {{0|(1<<4)},   {17.23*1, 21.33*0}, 4},
+    {{1|(1<<4)},   {17.23*1, 21.33*1}, 4},
+    {{2|(1<<4)},   {17.23*1, 21.33*2}, 4},
+    {{3|(1<<4)},   {17.23*1, 21.33*3}, 4},
+    {{4|(1<<4)},   {17.23*1, 21.33*4}, 4},
+
+    {{0|(2<<4)},   {17.23*2, 21.33*0}, 4},
+    {{1|(2<<4)},   {17.23*2, 21.33*1}, 4},
+    {{2|(2<<4)},   {17.23*2, 21.33*2}, 4},
+    {{3|(2<<4)},   {17.23*2, 21.33*3}, 4},
+    {{4|(2<<4)},   {17.23*2, 21.33*4}, 4},
+
+    {{0|(3<<4)},   {17.23*3, 21.33*0}, 4},
+    {{1|(3<<4)},   {17.23*3, 21.33*1}, 4},
+    {{2|(3<<4)},   {17.23*3, 21.33*2}, 4},
+    {{3|(3<<4)},   {17.23*3, 21.33*3}, 4},
+    {{4|(3<<4)},   {17.23*3, 21.33*4}, 4},
+
+    {{0|(4<<4)},   {17.23*4, 21.33*0}, 4},
+    {{1|(4<<4)},   {17.23*4, 21.33*1}, 4},
+    {{2|(4<<4)},   {17.23*4, 21.33*2}, 4},
+    {{3|(4<<4)},   {17.23*4, 21.33*3}, 4},
+    {{4|(4<<4)},   {17.23*4, 21.33*4}, 4},
+
+    {{0|(5<<4)},   {17.23*5, 21.33*0}, 4},
+    {{1|(5<<4)},   {17.23*5, 21.33*1}, 4},
+    {{2|(5<<4)},   {17.23*5, 21.33*2}, 4},
+    {{3|(5<<4)},   {17.23*5, 21.33*3}, 4},
+
+    {{0|(6<<4)},   {17.23*6, 21.33*0}, 4},
+    {{1|(6<<4)},   {17.23*6, 21.33*1}, 4},
+    {{2|(6<<4)},   {17.23*6, 21.33*2}, 4},
 
     // cluster
-    {{5|(0<<4)},   {17.23*5.5, 21.33*4}, 0},
-    {{5|(1<<4)},   {17.23*6.0, 21.33*5}, 0},
-    {{5|(2<<4)},   {17.23*6.5, 21.33*6}, 0},
+    {{5|(0<<4)},   {17.23*5.5, 21.33*4}, 4},
+    {{5|(1<<4)},   {17.23*6.0, 21.33*5}, 4},
+    {{5|(2<<4)},   {17.23*6.5, 21.33*6}, 4},
 
 
 
 
     {{0|(0<<4)},   {17.23*13, 21.33*0}, 1},
-    {{1|(0<<4)},   {17.23*13, 21.33*1}, 0},
-    {{2|(0<<4)},   {17.23*13, 21.33*2}, 0},
-    {{3|(0<<4)},   {17.23*13, 21.33*3}, 0},
-    {{4|(0<<4)},   {17.23*13, 21.33*4}, 0},
-
-    {{0|(1<<4)},   {17.23*12, 21.33*0}, 0},
-    {{1|(1<<4)},   {17.23*12, 21.33*1}, 0},
-    {{2|(1<<4)},   {17.23*12, 21.33*2}, 0},
-    {{3|(1<<4)},   {17.23*12, 21.33*3}, 0},
-    {{4|(1<<4)},   {17.23*12, 21.33*4}, 0},
-
-    {{0|(2<<4)},   {17.23*11, 21.33*0}, 0},
-    {{1|(2<<4)},   {17.23*11, 21.33*1}, 0},
-    {{2|(2<<4)},   {17.23*11, 21.33*2}, 0},
-    {{3|(2<<4)},   {17.23*11, 21.33*3}, 0},
-    {{4|(2<<4)},   {17.23*11, 21.33*4}, 0},
-
-    {{0|(3<<4)},   {17.23*10, 21.33*0}, 0},
-    {{1|(3<<4)},   {17.23*10, 21.33*1}, 0},
-    {{2|(3<<4)},   {17.23*10, 21.33*2}, 0},
-    {{3|(3<<4)},   {17.23*10, 21.33*3}, 0},
-    {{4|(3<<4)},   {17.23*10, 21.33*4}, 0},
-
-    {{0|(4<<4)},   {17.23*9, 21.33*0}, 0},
-    {{1|(4<<4)},   {17.23*9, 21.33*1}, 0},
-    {{2|(4<<4)},   {17.23*9, 21.33*2}, 0},
-    {{3|(4<<4)},   {17.23*9, 21.33*3}, 0},
-    {{4|(4<<4)},   {17.23*9, 21.33*4}, 0},
-
-    {{0|(5<<4)},   {17.23*8, 21.33*0}, 0},
-    {{1|(5<<4)},   {17.23*8, 21.33*1}, 0},
-    {{2|(5<<4)},   {17.23*8, 21.33*2}, 0},
-    {{3|(5<<4)},   {17.23*8, 21.33*3}, 0},
-
-    {{0|(6<<4)},   {17.23*7, 21.33*0}, 0},
-    {{1|(6<<4)},   {17.23*7, 21.33*1}, 0},
-    {{2|(6<<4)},   {17.23*7, 21.33*2}, 0},
+    {{1|(0<<4)},   {17.23*13, 21.33*1}, 4},
+    {{2|(0<<4)},   {17.23*13, 21.33*2}, 4},
+    {{3|(0<<4)},   {17.23*13, 21.33*3}, 4},
+    {{4|(0<<4)},   {17.23*13, 21.33*4}, 4},
+
+    {{0|(1<<4)},   {17.23*12, 21.33*0}, 4},
+    {{1|(1<<4)},   {17.23*12, 21.33*1}, 4},
+    {{2|(1<<4)},   {17.23*12, 21.33*2}, 4},
+    {{3|(1<<4)},   {17.23*12, 21.33*3}, 4},
+    {{4|(1<<4)},   {17.23*12, 21.33*4}, 4},
+
+    {{0|(2<<4)},   {17.23*11, 21.33*0}, 4},
+    {{1|(2<<4)},   {17.23*11, 21.33*1}, 4},
+    {{2|(2<<4)},   {17.23*11, 21.33*2}, 4},
+    {{3|(2<<4)},   {17.23*11, 21.33*3}, 4},
+    {{4|(2<<4)},   {17.23*11, 21.33*4}, 4},
+
+    {{0|(3<<4)},   {17.23*10, 21.33*0}, 4},
+    {{1|(3<<4)},   {17.23*10, 21.33*1}, 4},
+    {{2|(3<<4)},   {17.23*10, 21.33*2}, 4},
+    {{3|(3<<4)},   {17.23*10, 21.33*3}, 4},
+    {{4|(3<<4)},   {17.23*10, 21.33*4}, 4},
+
+    {{0|(4<<4)},   {17.23*9, 21.33*0}, 4},
+    {{1|(4<<4)},   {17.23*9, 21.33*1}, 4},
+    {{2|(4<<4)},   {17.23*9, 21.33*2}, 4},
+    {{3|(4<<4)},   {17.23*9, 21.33*3}, 4},
+    {{4|(4<<4)},   {17.23*9, 21.33*4}, 4},
+
+    {{0|(5<<4)},   {17.23*8, 21.33*0}, 4},
+    {{1|(5<<4)},   {17.23*8, 21.33*1}, 4},
+    {{2|(5<<4)},   {17.23*8, 21.33*2}, 4},
+    {{3|(5<<4)},   {17.23*8, 21.33*3}, 4},
+
+    {{0|(6<<4)},   {17.23*7, 21.33*0}, 4},
+    {{1|(6<<4)},   {17.23*7, 21.33*1}, 4},
+    {{2|(6<<4)},   {17.23*7, 21.33*2}, 4},
 
     // cluster
-    {{5|(0<<4)},   {17.23*7.5, 21.33*4}, 0},
-    {{5|(1<<4)},   {17.23*7.0, 21.33*5}, 0},
-    {{5|(2<<4)},   {17.23*6.5, 21.33*6}, 0},
+    {{5|(0<<4)},   {17.23*7.5, 21.33*4}, 4},
+    {{5|(1<<4)},   {17.23*7.0, 21.33*5}, 4},
+    {{5|(2<<4)},   {17.23*6.5, 21.33*6}, 4},
 
 };