[Keyboard] Add JNAO keyboard (#6598)

* Add JNAO keyboard

* Use layout macro for default_4x12

* Add bakingpy keymap

* Add info.json data

* Remove bakingpy keymap from jnao, add ortho_4x12 layout fetching

* Clear up default keymaps

2 files changed, 29 insertions, 17 deletions

diff --git a/layouts/community/ortho_4x12/bakingpy/keymap.c b/layouts/community/ortho_4x12/bakingpy/keymap.c
index 71672d0513..eb3b420ee6 100644
--- a/layouts/community/ortho_4x12/bakingpy/keymap.c
+++ b/layouts/community/ortho_4x12/bakingpy/keymap.c
@@ -2,13 +2,15 @@
 
 extern keymap_config_t keymap_config;
 
-#define _MAC 0
-#define _WINDOWS 1
-#define _TESTMODE 2
-#define _LOWER 3
-#define _RAISE 4
-#define _FKEYS 5
-#define _ADJUST 16
+enum layer_names {
+    _MAC,
+    _WINDOWS,
+    _TESTMODE,
+    _LOWER,
+    _RAISE,
+    _FKEYS,
+    _ADJUST,
+};
 
 enum custom_keycodes {
   MAC = SAFE_RANGE,
@@ -17,7 +19,6 @@ enum custom_keycodes {
   LOWER,
   RAISE,
   ADJUST,
-  PLAY_ALLSTAR,
 };
 
 #define KC_ KC_TRNS
@@ -35,6 +36,22 @@ enum custom_keycodes {
 #define KC_BL_T BL_TOGG
 #define KC_RMOD RGB_MOD
 
+#ifndef LAYOUT_kc_ortho_4x12
+#define LAYOUT_kc_ortho_4x12( \
+    L00, L01, L02, L03, L04, L05, R00, R01, R02, R03, R04, R05, \
+    L10, L11, L12, L13, L14, L15, R10, R11, R12, R13, R14, R15, \
+    L20, L21, L22, L23, L24, L25, R20, R21, R22, R23, R24, R25, \
+    L30, L31, L32, L33, L34, L35, R30, R31, R32, R33, R34, R35 \
+    ) \
+    LAYOUT_ortho_4x12( \
+        KC_##L00, KC_##L01, KC_##L02, KC_##L03, KC_##L04, KC_##L05, KC_##R00, KC_##R01, KC_##R02, KC_##R03, KC_##R04, KC_##R05, \
+        KC_##L10, KC_##L11, KC_##L12, KC_##L13, KC_##L14, KC_##L15, KC_##R10, KC_##R11, KC_##R12, KC_##R13, KC_##R14, KC_##R15, \
+        KC_##L20, KC_##L21, KC_##L22, KC_##L23, KC_##L24, KC_##L25, KC_##R20, KC_##R21, KC_##R22, KC_##R23, KC_##R24, KC_##R25, \
+        KC_##L30, KC_##L31, KC_##L32, KC_##L33, KC_##L34, KC_##L35, KC_##R30, KC_##R31, KC_##R32, KC_##R33, KC_##R34, KC_##R35 \
+    )
+
+#endif
+
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
   [_MAC] = LAYOUT_kc_ortho_4x12(
@@ -130,28 +147,23 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 };
 
-void persistent_default_layer_set(uint16_t default_layer) {
-  eeconfig_update_default_layer(default_layer);
-  default_layer_set(default_layer);
-}
-
 bool process_record_user(uint16_t keycode, keyrecord_t *record) {
   switch (keycode) {
     case MAC:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_MAC);
+        set_single_persistent_default_layer(_MAC);
       }
       return false;
       break;
     case WINDOWS:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_WINDOWS);
+        set_single_persistent_default_layer(_WINDOWS);
       }
       return false;
       break;
     case TESTMODE:
       if (record->event.pressed) {
-        persistent_default_layer_set(1UL<<_TESTMODE);
+        set_single_persistent_default_layer(_TESTMODE);
       }
       return false;
       break;
diff --git a/layouts/community/ortho_4x12/bakingpy/rules.mk b/layouts/community/ortho_4x12/bakingpy/rules.mk
index 17a589cd1d..0da75e0be4 100644
--- a/layouts/community/ortho_4x12/bakingpy/rules.mk
+++ b/layouts/community/ortho_4x12/bakingpy/rules.mk
@@ -1,5 +1,5 @@
 ifneq ($(LAYOUTS_HAS_RGB), no)
-	RGBLIGHT_ENABLE = yes
+  RGBLIGHT_ENABLE = yes
 endif
 AUDIO_ENABLE = no
 ifeq ($(strip $(KEYBOARD)), zlant)