~ruther/qmk_firmware: Chromatonemini info json revised to support qmk 0.22.2 (#21966)

4 files changed, 174 insertions(+), 116 deletions(-)

M keyboards/chromatonemini/chromatonemini.c
M keyboards/chromatonemini/config.h
M keyboards/chromatonemini/info.json
M keyboards/chromatonemini/rules.mk

M keyboards/chromatonemini/chromatonemini.c => keyboards/chromatonemini/chromatonemini.c +0 -60

@@ 19,66 19,6 @@
 #ifdef RGB_MATRIX_ENABLE
 #    define NO_LED 255
 
-led_config_t g_led_config = {
-    {
-#if 0
-        // register bottom two rows
-        { 0,   4,  3,  2,  1, 41,  5, NO_LED },
-        { 40,  6, 39,  7, 38,  8, 37, NO_LED },
-        {  9, 36, 10, 35, 11, 34, 12, NO_LED },
-        { 33, 13, 32, 14, 31, 15, 30, NO_LED },
-        { 16, 29, 17, 28, 18, 27, 19, NO_LED },
-        { 26, 20, 25, 21, 24, 22, 23, NO_LED }
-
-        // register middle two rows
-        { 0,   4,  3,  2,  1, 78, 42, NO_LED },
-        { 77, 43, 76, 44, 75, 45, 74, NO_LED },
-        { 46, 73, 47, 72, 48, 71, 49, NO_LED },
-        { 70, 50, 69, 51, 68, 52, 67, NO_LED },
-        { 53, 66, 54, 65, 55, 64, 56, NO_LED },
-        { 63, 57, 62, 58, 61, 59, 60, NO_LED }
-
-        // register top and bottom rows
-        { 0,     4,   3,   2,   1, 115,   5, NO_LED },
-        { 114,   6, 113,   7, 112,   8, 111, NO_LED },
-        { 9,   110,  10, 109,  11, 108,  12, NO_LED },
-        { 107,  13, 106,  14, 105,  15, 104, NO_LED },
-        {  16, 103,  17, 102,  18, 101,  19, NO_LED },
-        { 100,  20,  99,  21,  98,  22,  97, NO_LED }
-#else
-        // register top two rows
-        { 0,     4,   3,   2,   1, 115,  79, NO_LED },
-        { 114,  80, 113,  81, 112,  82, 111, NO_LED },
-        { 83,  110,  84, 109,  85, 108,  86, NO_LED },
-        { 107,  87, 106,  88, 105,  89, 104, NO_LED },
-        {  90, 103,  91, 102,  92, 101,  93, NO_LED },
-        { 100,  94,  99,  95,  98,  96,  97, NO_LED }
-#endif
-    },  {
-        { 14,  12 },
-        { 14,  36 },
-        { 19,  48 }, { 9, 48 },
-        { 14,  60 },
-        { 39,  60 }, { 49,  60 }, {  59, 60 }, {  69, 60 }, {  79, 60 }, {  89, 60 }, {  99, 60 }, { 109, 60 }, { 119, 60 }, { 129, 60 }, { 139, 60 }, { 149, 60 }, { 159, 60 }, { 169, 60 }, { 179, 60 }, { 189, 60 }, { 199, 60 }, { 209, 60 },
-        { 214, 48 }, { 204, 48 }, { 194, 48 }, { 184, 48 }, { 174, 48 }, { 164, 48 }, { 154, 48 }, { 144, 48 }, { 134, 48 }, { 124, 48 }, { 114, 48 }, { 104, 48 }, {  94, 48 }, {  84, 48 }, {  74, 48 }, {  64, 48 }, {  54, 48 }, {  44, 48 }, { 34, 48 },
-        { 39,  36 }, { 49,  36 }, {  59, 36 }, {  69, 36 }, {  79, 36 }, {  89, 36 }, {  99, 36 }, { 109, 36 }, { 119, 36 }, { 129, 36 }, { 139, 36 }, { 149, 36 }, { 159, 36 }, { 169, 36 }, { 179, 36 }, { 189, 36 }, { 199, 36 }, { 209, 36 },
-        { 214, 24 }, { 204, 24 }, { 194, 24 }, { 184, 24 }, { 174, 24 }, { 164, 24 }, { 154, 24 }, { 144, 24 }, { 134, 24 }, { 124, 24 }, { 114, 24 }, { 104, 24 }, {  94, 24 }, {  84, 24 }, {  74, 24 }, {  64, 24 }, {  54, 24 }, {  44, 24 }, { 34, 24 },
-        { 39,  12 }, { 49,  12 }, {  59, 12 }, {  69, 12 }, {  79, 12 }, {  89, 12 }, {  99, 12 }, { 109, 12 }, { 119, 12 }, { 129, 12 }, { 139, 12 }, { 149, 12 }, { 159, 12 }, { 169, 12 }, { 179, 12 }, { 189, 12 }, { 199, 12 }, { 209, 12 },
-        { 214,  0 }, { 204,  0 }, { 194,  0 }, { 184,  0 }, { 174,  0 }, { 164,  0 }, { 154,  0 }, { 144,  0 }, { 134,  0 }, { 124,  0 }, { 114,  0 }, { 104,  0 }, {  94,  0 }, {  84,  0 }, {  74,  0 }, {  64,  0} , {  54,  0 }, {  44,  0 }, { 34,  0 }
-    },  {
-        1,
-        4,
-        4, 4,
-        4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
-        4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
-    }
-};
-
 // indicator
 const uint8_t led_scale_indicator[12][12] = {
   {23, 29, 35, 41, 60, 66,  72,  78,  97, 103,    109,    115},     //  C

M keyboards/chromatonemini/config.h => keyboards/chromatonemini/config.h +1 -48

@@ 21,16 21,14 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 /* ws2812 RGB MATRIX */
 #   define RGB_MATRIX_LED_COUNT 116
-
  // reacts to keypresses
 #   define RGB_MATRIX_KEYPRESSES
 
 //  for all fingers used at once.
 #   define LED_HITS_TO_REMEMBER 10
 
-#   define RGB_MATRIX_MAXIMUM_BRIGHTNESS 50
 #   define RGB_MATRIX_DEFAULT_SPD 127
-#   define RGB_MATRIX_CENTER { 124, 32 }
+
 // the above brighness setting has no effect on rgb_matrix_set_color().
 // Use darker colors instead.
 /*              RGB darker COLORS             */


@@ 56,51 54,6 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //  https://docs.qmk.fm/#/feature_rgb_matrix
 //  Enable suspend mode.
 #   define RGB_DISABLE_WHEN_USB_SUSPENDED
-
-#   ifdef CONSOLE_ENABLE
-#       define ENABLE_RGB_MATRIX_SOLID_COLOR
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#   else
-#       define ENABLE_RGB_MATRIX_GRADIENT_UP_DOWN
-#       define ENABLE_RGB_MATRIX_GRADIENT_LEFT_RIGHT
-#       define ENABLE_RGB_MATRIX_BREATHING
-#       define ENABLE_RGB_MATRIX_BAND_SAT
-#       define ENABLE_RGB_MATRIX_BAND_VAL
-#       define ENABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
-#       define ENABLE_RGB_MATRIX_BAND_PINWHEEL_VAL
-#       define ENABLE_RGB_MATRIX_BAND_SPIRAL_SAT
-#       define ENABLE_RGB_MATRIX_BAND_SPIRAL_VAL
-#       define ENABLE_RGB_MATRIX_CYCLE_ALL
-#       define ENABLE_RGB_MATRIX_CYCLE_LEFT_RIGHT
-#       define ENABLE_RGB_MATRIX_CYCLE_UP_DOWN
-#       define ENABLE_RGB_MATRIX_RAINBOW_MOVING_CHEVRON
-#       define ENABLE_RGB_MATRIX_CYCLE_OUT_IN
-#       define ENABLE_RGB_MATRIX_CYCLE_OUT_IN_DUAL
-#       define ENABLE_RGB_MATRIX_CYCLE_PINWHEEL
-#       define ENABLE_RGB_MATRIX_CYCLE_SPIRAL
-#       define ENABLE_RGB_MATRIX_DUAL_BEACON
-#       define ENABLE_RGB_MATRIX_RAINBOW_BEACON
-#       define ENABLE_RGB_MATRIX_RAINBOW_PINWHEELS
-#       define ENABLE_RGB_MATRIX_RAINDROPS
-#       define ENABLE_RGB_MATRIX_JELLYBEAN_RAINDROPS
-#       define ENABLE_RGB_MATRIX_HUE_BREATHING
-#       define ENABLE_RGB_MATRIX_HUE_PENDULUM
-#       define ENABLE_RGB_MATRIX_HUE_WAVE
-#       define ENABLE_RGB_MATRIX_TYPING_HEATMAP
-#       define ENABLE_RGB_MATRIX_DIGITAL_RAIN
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_SIMPLE
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_WIDE
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
-#       define ENABLE_RGB_MATRIX_SOLID_REACTIVE_MULTINEXUS
-#       define ENABLE_RGB_MATRIX_SPLASH
-#       define ENABLE_RGB_MATRIX_MULTISPLASH
-#       define ENABLE_RGB_MATRIX_SOLID_SPLASH
-#       define ENABLE_RGB_MATRIX_SOLID_MULTISPLASH
-#   endif  // CONSOLE_ENABLE
 #endif  // RGB_MATRIX_ENABLE
 
 /* Audio */

M keyboards/chromatonemini/info.json => keyboards/chromatonemini/info.json +173 -7

@@ 3,8 3,10 @@
     "manufacturer": "3araht",
     "url": "https://github.com/3araht/chromatonemini",
     "maintainer": "3araht",
-    "bootloader": "caterina",
-    "processor": "atmega32u4",
+    "development_board": "promicro",
+    "build": {
+        "lto": true
+    },
     "features": {
         "midi": true,
         "extrakey": true,


@@ 13,15 15,179 @@
         "bootmagic": false,
         "console": false,
         "mousekey": false,
-        "nkro": false,
-        "rgblight": false,
-        "audio": false
+        "nkro": false
     },
     "ws2812": {
         "pin": "D3"
     },
     "rgb_matrix": {
-        "driver": "ws2812"
+        "driver": "ws2812",
+        "layout": [
+            {"matrix": [0, 0], "x": 14, "y": 12, "flags": 1},
+            {"matrix": [0, 4], "x": 14, "y": 36, "flags": 4},
+            {"matrix": [0, 3], "x": 19, "y": 48, "flags": 4},
+            {"matrix": [0, 2], "x": 9, "y": 48, "flags": 4},
+            {"matrix": [0, 1], "x": 14, "y": 60, "flags": 4},
+            {"x": 39, "y": 60, "flags": 4},
+            {"x": 49, "y": 60, "flags": 4},
+            {"x": 59, "y": 60, "flags": 4},
+            {"x": 69, "y": 60, "flags": 4},
+            {"x": 79, "y": 60, "flags": 4},
+            {"x": 89, "y": 60, "flags": 4},
+            {"x": 99, "y": 60, "flags": 4},
+            {"x": 109, "y": 60, "flags": 4},
+            {"x": 119, "y": 60, "flags": 4},
+            {"x": 129, "y": 60, "flags": 4},
+            {"x": 139, "y": 60, "flags": 4},
+            {"x": 149, "y": 60, "flags": 4},
+            {"x": 159, "y": 60, "flags": 4},
+            {"x": 169, "y": 60, "flags": 4},
+            {"x": 179, "y": 60, "flags": 4},
+            {"x": 189, "y": 60, "flags": 4},
+            {"x": 199, "y": 60, "flags": 4},
+            {"x": 209, "y": 60, "flags": 4},
+            {"x": 214, "y": 48, "flags": 4},
+            {"x": 204, "y": 48, "flags": 4},
+            {"x": 194, "y": 48, "flags": 4},
+            {"x": 184, "y": 48, "flags": 4},
+            {"x": 174, "y": 48, "flags": 4},
+            {"x": 164, "y": 48, "flags": 4},
+            {"x": 154, "y": 48, "flags": 4},
+            {"x": 144, "y": 48, "flags": 4},
+            {"x": 134, "y": 48, "flags": 4},
+            {"x": 124, "y": 48, "flags": 4},
+            {"x": 114, "y": 48, "flags": 4},
+            {"x": 104, "y": 48, "flags": 4},
+            {"x": 94, "y": 48, "flags": 4},
+            {"x": 84, "y": 48, "flags": 4},
+            {"x": 74, "y": 48, "flags": 4},
+            {"x": 64, "y": 48, "flags": 4},
+            {"x": 54, "y": 48, "flags": 4},
+            {"x": 44, "y": 48, "flags": 4},
+            {"x": 34, "y": 48, "flags": 4},
+            {"x": 39, "y": 36, "flags": 4},
+            {"x": 49, "y": 36, "flags": 4},
+            {"x": 59, "y": 36, "flags": 4},
+            {"x": 69, "y": 36, "flags": 4},
+            {"x": 79, "y": 36, "flags": 4},
+            {"x": 89, "y": 36, "flags": 4},
+            {"x": 99, "y": 36, "flags": 4},
+            {"x": 109, "y": 36, "flags": 4},
+            {"x": 119, "y": 36, "flags": 4},
+            {"x": 129, "y": 36, "flags": 4},
+            {"x": 139, "y": 36, "flags": 4},
+            {"x": 149, "y": 36, "flags": 4},
+            {"x": 159, "y": 36, "flags": 4},
+            {"x": 169, "y": 36, "flags": 4},
+            {"x": 179, "y": 36, "flags": 4},
+            {"x": 189, "y": 36, "flags": 4},
+            {"x": 199, "y": 36, "flags": 4},
+            {"x": 209, "y": 36, "flags": 4},
+            {"x": 214, "y": 24, "flags": 4},
+            {"x": 204, "y": 24, "flags": 4},
+            {"x": 194, "y": 24, "flags": 4},
+            {"x": 184, "y": 24, "flags": 4},
+            {"x": 174, "y": 24, "flags": 4},
+            {"x": 164, "y": 24, "flags": 4},
+            {"x": 154, "y": 24, "flags": 4},
+            {"x": 144, "y": 24, "flags": 4},
+            {"x": 134, "y": 24, "flags": 4},
+            {"x": 124, "y": 24, "flags": 4},
+            {"x": 114, "y": 24, "flags": 4},
+            {"x": 104, "y": 24, "flags": 4},
+            {"x": 94, "y": 24, "flags": 4},
+            {"x": 84, "y": 24, "flags": 4},
+            {"x": 74, "y": 24, "flags": 4},
+            {"x": 64, "y": 24, "flags": 4},
+            {"x": 54, "y": 24, "flags": 4},
+            {"x": 44, "y": 24, "flags": 4},
+            {"x": 34, "y": 24, "flags": 4},
+            {"matrix": [0, 6], "x": 39, "y": 12, "flags": 4},
+            {"matrix": [1, 1], "x": 49, "y": 12, "flags": 4},
+            {"matrix": [1, 3], "x": 59, "y": 12, "flags": 4},
+            {"matrix": [1, 5], "x": 69, "y": 12, "flags": 4},
+            {"matrix": [2, 0], "x": 79, "y": 12, "flags": 4},
+            {"matrix": [2, 2], "x": 89, "y": 12, "flags": 4},
+            {"matrix": [2, 4], "x": 99, "y": 12, "flags": 4},
+            {"matrix": [2, 6], "x": 109, "y": 12, "flags": 4},
+            {"matrix": [3, 1], "x": 119, "y": 12, "flags": 4},
+            {"matrix": [3, 3], "x": 129, "y": 12, "flags": 4},
+            {"matrix": [3, 5], "x": 139, "y": 12, "flags": 4},
+            {"matrix": [4, 0], "x": 149, "y": 12, "flags": 4},
+            {"matrix": [4, 2], "x": 159, "y": 12, "flags": 4},
+            {"matrix": [4, 4], "x": 169, "y": 12, "flags": 4},
+            {"matrix": [4, 6], "x": 179, "y": 12, "flags": 4},
+            {"matrix": [5, 1], "x": 189, "y": 12, "flags": 4},
+            {"matrix": [5, 3], "x": 199, "y": 12, "flags": 4},
+            {"matrix": [5, 5], "x": 209, "y": 12, "flags": 4},
+            {"matrix": [5, 6], "x": 214, "y": 0, "flags": 4},
+            {"matrix": [5, 4], "x": 204, "y": 0, "flags": 4},
+            {"matrix": [5, 2], "x": 194, "y": 0, "flags": 4},
+            {"matrix": [5, 0], "x": 184, "y": 0, "flags": 4},
+            {"matrix": [4, 5], "x": 174, "y": 0, "flags": 4},
+            {"matrix": [4, 3], "x": 164, "y": 0, "flags": 4},
+            {"matrix": [4, 1], "x": 154, "y": 0, "flags": 4},
+            {"matrix": [3, 6], "x": 144, "y": 0, "flags": 4},
+            {"matrix": [3, 4], "x": 134, "y": 0, "flags": 4},
+            {"matrix": [3, 2], "x": 124, "y": 0, "flags": 4},
+            {"matrix": [3, 0], "x": 114, "y": 0, "flags": 4},
+            {"matrix": [2, 5], "x": 104, "y": 0, "flags": 4},
+            {"matrix": [2, 3], "x": 94, "y": 0, "flags": 4},
+            {"matrix": [2, 1], "x": 84, "y": 0, "flags": 4},
+            {"matrix": [1, 6], "x": 74, "y": 0, "flags": 4},
+            {"matrix": [1, 4], "x": 64, "y": 0, "flags": 4},
+            {"matrix": [1, 2], "x": 54, "y": 0, "flags": 4},
+            {"matrix": [1, 0], "x": 44, "y": 0, "flags": 4},
+            {"matrix": [0, 5], "x": 34, "y": 0, "flags": 4}
+        ],
+        "max_brightness": 50,
+        "sat_steps": 8,
+        "speed_steps": 10,
+        "val_steps": 8,
+        "center_point": [124, 32],
+        "animations": {
+            "solid_color": true,
+            "alphas_mods": true,
+            "gradient_up_down": true,
+            "gradient_left_right": true,
+            "breathing": true,
+            "band_sat": true,
+            "band_val": true,
+            "band_pinwheel_sat": true,
+            "band_pinwheel_val": true,
+            "band_spiral_sat": true,
+            "band_spiral_val": true,
+            "cycle_all": true,
+            "cycle_left_right": true,
+            "cycle_up_down": true,
+            "cycle_out_in": true,
+            "cycle_out_in_dual": true,
+            "rainbow_moving_chevron": true,
+            "dual_beacon": true,
+            "cycle_pinwheel": true,
+            "cycle_spiral": true,
+            "rainbow_beacon": true,
+            "rainbow_pinwheels": true,
+            "raindrops": true,
+            "jellybean_raindrops": true,
+            "hue_breathing": true,
+            "hue_pendulum": true,
+            "hue_wave": true,
+            "typing_heatmap": true,
+            "digital_rain": true,
+            "solid_reactive": true,
+            "solid_reactive_simple": true,
+            "solid_reactive_wide": true,
+            "solid_reactive_multiwide": true,
+            "solid_reactive_cross": true,
+            "solid_reactive_multicross": true,
+            "solid_reactive_nexus": true,
+            "solid_reactive_multinexus": true,
+            "splash": true,
+            "multisplash": true,
+            "solid_splash": true,
+            "solid_multisplash": true
+        }
     },
     "diode_direction": "COL2ROW",
     "matrix_pins": {


@@ 33,7 199,7 @@
         "pid": "0xF4B4",
         "device_version": "0.0.1"
     },
-   "layouts": {
+    "layouts": {
         "LAYOUT": {
             "layout": [
                 {"matrix": [0, 0], "x": 0.5, "y": 0},

M keyboards/chromatonemini/rules.mk => keyboards/chromatonemini/rules.mk +0 -1

@@ 1,1 0,0 @@
-LTO_ENABLE = yes