had to move the layouts back
- trying something in left field to make it work
This commit is contained in:
		
							parent
							
								
									383363e0d8
								
							
						
					
					
						commit
						e392568f09
					
				
					 2 changed files with 151 additions and 75 deletions
				
			
		| 
						 | 
				
			
			@ -17,6 +17,156 @@
 | 
			
		|||
 | 
			
		||||
#include "klor.h"
 | 
			
		||||
 | 
			
		||||
#ifdef KLOR_POLYDACTYL
 | 
			
		||||
#   define LAYOUT(                                                \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34             \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
//#   define LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_KONRAD)
 | 
			
		||||
#   define LAYOUT_konrad(                                                    \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34                  \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
//#   define LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_YUBITSUME)
 | 
			
		||||
#   define LAYOUT_yubitsume(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34         \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
//#   define LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_SAEGEWERK)
 | 
			
		||||
#   define LAYOUT(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34              \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
//#   define LAYOUT(...) LAYOUT_saegewerk(__VA_ARGS__)
 | 
			
		||||
#endif //KLOR_POLYDACTL
 | 
			
		||||
 | 
			
		||||
/*
 | 
			
		||||
#ifdef KLOR_POLYDACTYL
 | 
			
		||||
#   define LAYOUT_polydactyl(                                                \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34             \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_KONRAD)
 | 
			
		||||
#   define LAYOUT_konrad(                                                    \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34                  \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_YUBITSUME)
 | 
			
		||||
#   define LAYOUT_yubitsume(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34         \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_SAEGEWERK)
 | 
			
		||||
#   define LAYOUT_saegewerk(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34              \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_saegewerk(__VA_ARGS__)
 | 
			
		||||
#endif //KLOR_POLYDACTL
 | 
			
		||||
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
oled_rotation_t oled_init_kb(oled_rotation_t rotation) {
 | 
			
		||||
    return OLED_ROTATION_180;
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -28,78 +28,4 @@
 | 
			
		|||
 */
 | 
			
		||||
 | 
			
		||||
// readability
 | 
			
		||||
#define ___ KC_NO
 | 
			
		||||
 | 
			
		||||
#ifdef KLOR_POLYDACTYL
 | 
			
		||||
#   define LAYOUT_polydactyl(                                                \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34             \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_polydactyl(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_KONRAD)
 | 
			
		||||
#   define LAYOUT_konrad(                                                    \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,       \
 | 
			
		||||
      L10, L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14, R15,  \
 | 
			
		||||
      L20, L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24, R25,  \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34                  \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { L10,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { L20,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { R15,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { R25,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_konrad(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_YUBITSUME)
 | 
			
		||||
#   define LAYOUT_yubitsume(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                L31, L32, L33, L34,           R31, R32, R33, R34         \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   L34,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   R31,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_yubitsume(__VA_ARGS__)
 | 
			
		||||
#elif defined(KLOR_SAEGEWERK)
 | 
			
		||||
#   define LAYOUT_saegewerk(                                             \
 | 
			
		||||
           L01, L02, L03, L04, L05,           R00, R01, R02, R03, R04,   \
 | 
			
		||||
           L11, L12, L13, L14, L15,           R10, R11, R12, R13, R14,   \
 | 
			
		||||
           L21, L22, L23, L24, L25, L35, R30, R20, R21, R22, R23, R24,   \
 | 
			
		||||
                     L31, L32, L33,           R32, R33, R34              \
 | 
			
		||||
      )                                               \
 | 
			
		||||
      {                                               \
 | 
			
		||||
          { ___,   L01,   L02,   L03,   L04,   L05 }, \
 | 
			
		||||
          { ___,   L11,   L12,   L13,   L14,   L15 }, \
 | 
			
		||||
          { ___,   L21,   L22,   L23,   L24,   L25 }, \
 | 
			
		||||
          { ___,   L31,   L32,   L33,   ___,   L35 }, \
 | 
			
		||||
          { ___,   R04,   R03,   R02,   R01,   R00 }, \
 | 
			
		||||
          { ___,   R14,   R13,   R12,   R11,   R10 }, \
 | 
			
		||||
          { ___,   R24,   R23,   R22,   R21,   R20 }, \
 | 
			
		||||
          { ___,   R34,   R33,   R32,   ___,   R30 }, \
 | 
			
		||||
      }
 | 
			
		||||
#   define LAYOUT(...) LAYOUT_saegewerk(__VA_ARGS__)
 | 
			
		||||
#endif //KLOR_POLYDACTL
 | 
			
		||||
#define ___ KC_NO
 | 
			
		||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue