Skip to content

Commit

Permalink
fix: halfmoon moonlander layout
Browse files Browse the repository at this point in the history
  • Loading branch information
@fdidron
fdidron committed Oct 4, 2024
1 parent eb3e035 commit ac5f08a
Show file tree
Hide file tree
Showing 2 changed files with 69 additions and 16 deletions.
40 changes: 40 additions & 0 deletions keyboards/zsa/moonlander/keyboard.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,46 @@
"toggle": 1
},
"layouts": {
"LAYOUT_halfmoon": {
"layout": [
{"label": "k00", "matrix": [0, 0], "x": 0, "y": 0},
{"label": "k01", "matrix": [0, 1], "x": 1, "y": 0},
{"label": "k02", "matrix": [0, 2], "x": 2, "y": 0},
{"label": "k03", "matrix": [0, 3], "x": 3, "y": 0},
{"label": "k04", "matrix": [0, 4], "x": 4, "y": 0},
{"label": "k05", "matrix": [0, 5], "x": 5, "y": 0},
{"label": "k06", "matrix": [0, 6], "x": 6, "y": 0},
{"label": "k07", "matrix": [1, 0], "x": 7, "y": 0},
{"label": "k08", "matrix": [1, 1], "x": 8, "y": 0},
{"label": "k09", "matrix": [1, 2], "x": 9, "y": 0},
{"label": "k10", "matrix": [1, 3], "x": 10, "y": 0},
{"label": "k11", "matrix": [1, 4], "x": 11, "y": 0},
{"label": "k12", "matrix": [1, 5], "x": 12, "y": 0},
{"label": "k13", "matrix": [1, 6], "x": 13, "y": 0},
{"label": "k14", "matrix": [2, 0], "x": 14, "y": 0},
{"label": "k15", "matrix": [2, 1], "x": 15, "y": 0},
{"label": "k16", "matrix": [2, 2], "x": 16, "y": 0},
{"label": "k17", "matrix": [2, 3], "x": 17, "y": 0},
{"label": "k18", "matrix": [2, 4], "x": 18, "y": 0},
{"label": "k19", "matrix": [2, 5], "x": 19, "y": 0},
{"label": "k20", "matrix": [2, 6], "x": 20, "y": 0},
{"label": "k21", "matrix": [3, 0], "x": 21, "y": 0},
{"label": "k22", "matrix": [3, 1], "x": 22, "y": 0},
{"label": "k23", "matrix": [3, 2], "x": 23, "y": 0},
{"label": "k24", "matrix": [3, 3], "x": 24, "y": 0},
{"label": "k25", "matrix": [3, 4], "x": 25, "y": 0},
{"label": "k26", "matrix": [3, 5], "x": 26, "y": 0},
{"label": "k27", "matrix": [4, 0], "x": 27, "y": 0},
{"label": "k28", "matrix": [4, 1], "x": 28, "y": 0},
{"label": "k29", "matrix": [4, 2], "x": 29, "y": 0},
{"label": "k30", "matrix": [4, 3], "x": 30, "y": 0},
{"label": "k31", "matrix": [4, 4], "x": 31, "y": 0},
{"label": "k32", "matrix": [5, 3], "x": 32, "y": 0},
{"label": "k33", "matrix": [5, 0], "x": 33, "y": 0},
{"label": "k34", "matrix": [5, 1], "x": 34, "y": 0},
{"label": "k35", "matrix": [5, 2], "x": 35, "y": 0}
]
},
"LAYOUT": {
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0.375},
Expand Down
45 changes: 29 additions & 16 deletions keyboards/zsa/moonlander/moonlander.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
*/

#include "moonlander.h"

Expand Down Expand Up @@ -130,9 +130,9 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
bool LED_3 = false;
bool LED_4 = false;
bool LED_5 = false;
#if !defined(CAPS_LOCK_STATUS)
# if !defined(CAPS_LOCK_STATUS)
bool LED_6 = false;
#endif
# endif

uint8_t layer = get_highest_layer(state);
switch (layer) {
Expand All @@ -146,9 +146,9 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
break;
case 3:
LED_3 = true;
#if !defined(CAPS_LOCK_STATUS)
# if !defined(CAPS_LOCK_STATUS)
LED_6 = true;
#endif
# endif
break;
case 4:
LED_4 = true;
Expand All @@ -157,9 +157,9 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
LED_5 = true;
break;
case 6:
#if !defined(CAPS_LOCK_STATUS)
# if !defined(CAPS_LOCK_STATUS)
LED_6 = true;
#endif
# endif
break;
default:
break;
Expand All @@ -170,9 +170,9 @@ layer_state_t layer_state_set_kb(layer_state_t state) {
STATUS_LED_3(LED_3);
STATUS_LED_4(LED_4);
STATUS_LED_5(LED_5);
#if !defined(CAPS_LOCK_STATUS)
# if !defined(CAPS_LOCK_STATUS)
STATUS_LED_6(LED_6);
#endif
# endif
#endif

return state;
Expand Down Expand Up @@ -311,6 +311,16 @@ const keypos_t PROGMEM hand_swap_config[MATRIX_ROWS][MATRIX_COLS] = {

#if defined(AUDIO_ENABLE) && defined(MUSIC_MAP)
// clang-format off
#ifdef HALFMOON
const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
{ 29, 30, 31, 32, 33, 34, 35 },
{ 22, 23, 24, 25, 26, 27, 28 },
{ 15, 16, 17, 18, 19, 20, 21 },
{ 9, 10, 11, 12, 13, 14, 0 },
{ 4, 5, 6, 7, 8, 0, 3 },
{ 0, 0, 0, 0, 0, 1, 2 },
};
#else
__attribute__ ((weak))
const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
{58, 59, 60, 61, 62, 63, 64},
Expand All @@ -327,6 +337,7 @@ const uint8_t music_map[MATRIX_ROWS][MATRIX_COLS] = {
{ 0, 0, 0, 4, 5, 6, 7}
};
// clang-format on
# endif
#endif

#ifdef CAPS_LOCK_STATUS
Expand All @@ -336,7 +347,9 @@ void led_update_ports(led_t led_state) {
#endif

bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
if (!process_record_user(keycode, record)) { return false; }
if (!process_record_user(keycode, record)) {
return false;
}
switch (keycode) {
#if !defined(MOONLANDER_USER_LEDS)
case LED_LEVEL:
Expand Down Expand Up @@ -389,13 +402,13 @@ void keyboard_post_init_kb(void) {
keyboard_config.raw = eeconfig_read_kb();

if (!keyboard_config.led_level && !keyboard_config.led_level_res) {
keyboard_config.led_level = true;
keyboard_config.led_level = true;
keyboard_config.led_level_res = 0b11;
eeconfig_update_kb(keyboard_config.raw);
}
#ifdef RGB_MATRIX_ENABLE
if (rgb_matrix_get_mode() >= RGB_MATRIX_EFFECT_MAX) {
rgb_matrix_mode(RGB_MATRIX_NONE);
rgb_matrix_mode(RGB_MATRIX_NONE);
}
rgb_matrix_enable_noeeprom();
#endif
Expand All @@ -406,11 +419,11 @@ void keyboard_post_init_kb(void) {
matrix_init_user();
}

void eeconfig_init_kb(void) { // EEPROM is getting reset!
keyboard_config.raw = 0;
void eeconfig_init_kb(void) { // EEPROM is getting reset!
keyboard_config.raw = 0;
keyboard_config.rgb_matrix_enable = true;
keyboard_config.led_level = true;
keyboard_config.led_level_res = 0b11;
keyboard_config.led_level = true;
keyboard_config.led_level_res = 0b11;
eeconfig_update_kb(keyboard_config.raw);
eeconfig_init_user();
}

0 comments on commit ac5f08a

Please sign in to comment.