mirror of
				https://github.com/mfulz/qmk_firmware.git
				synced 2025-11-03 23:02:34 +01:00 
			
		
		
		
	* Preonic: refactor layout macros
Unify layout macro names across AVR and ARM.
- all layouts and matrices have moved/duplicated to their appropriate revisions
  - preonic.h now includes the appropriate header file from the selected revision
  - revision header files only contain layouts appropriate for that revision
    - Previously, all layouts were available in source for all revisions.
- removed KEYMAP layout macro alias (was unused)
- macros LAYOUT_preonic_1x2uC and LAYOUT_preonic_grid for AVR and ARM revisions
  - LAYOUT_preonic_grid has alias LAYOUT_ortho_5x12 for all revisions
- deleted LAYOUT_ortho_4x12 alias (not appropriate for this keyboard)
- ARM-based revisions have 1x2uR, 1x2uL and 2x2u matrices
* Preonic: updated revision headers to #pragma once
* Preonic: update Configurator files
Updated the Configurator files to reflect the previous changes in this branch.
- Preonic revs. 1 and 2 will use keyboards/preonic/info.json
- Preonic rev. 3 will use keyboards/preonic/rev3/info.json
  - This file will override keyboards/preonic/info.json when preonic/rev3 is selected in the Configurator.
		
	
			
		
			
				
	
	
		
			124 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			124 lines
		
	
	
		
			4.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/* Copyright 2018 Jack Humbert <jack.humb@gmail.com>
 | 
						|
 *
 | 
						|
 * This program is free software: you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation, either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
						|
 */
 | 
						|
 | 
						|
#pragma once
 | 
						|
 | 
						|
#include "preonic.h"
 | 
						|
 | 
						|
#ifndef __AVR__ // Preonic rev. 3 and later
 | 
						|
 | 
						|
	#define LAYOUT_preonic_1x2uC( \
 | 
						|
	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 | 
						|
	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 | 
						|
	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 | 
						|
	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
 | 
						|
	  k40, k41, k42, k43, k44,    k45,   k47, k48, k49, k4a, k4b \
 | 
						|
  ) \
 | 
						|
  { \
 | 
						|
	  { k00, k01, k02, k03, k04, k05 }, \
 | 
						|
	  { k10, k11, k12, k13, k14, k15 }, \
 | 
						|
	  { k20, k21, k22, k23, k24, k25 }, \
 | 
						|
	  { k30, k31, k32, k33, k34, k35 }, \
 | 
						|
	  { k06, k07, k08, k09, k0a, k0b }, \
 | 
						|
	  { k16, k17, k18, k19, k1a, k1b }, \
 | 
						|
	  { k26, k27, k28, k29, k2a, k2b }, \
 | 
						|
	  { k36, k37, k38, k39, k3a, k3b }, \
 | 
						|
	  { k40, k41, k42, k49, k4a, k4b }, \
 | 
						|
	  { k45, k47, k48, k43, k44, k45 } \
 | 
						|
  }
 | 
						|
 | 
						|
  #define LAYOUT_preonic_1x2uR( \
 | 
						|
	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 | 
						|
	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 | 
						|
	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 | 
						|
	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
 | 
						|
	  k40, k41, k42, k43, k44, k45,   k47,    k48, k49, k4a, k4b \
 | 
						|
  ) \
 | 
						|
  { \
 | 
						|
	  { k00, k01, k02, k03, k04, k05 }, \
 | 
						|
	  { k10, k11, k12, k13, k14, k15 }, \
 | 
						|
	  { k20, k21, k22, k23, k24, k25 }, \
 | 
						|
	  { k30, k31, k32, k33, k34, k35 }, \
 | 
						|
	  { k06, k07, k08, k09, k0a, k0b }, \
 | 
						|
	  { k16, k17, k18, k19, k1a, k1b }, \
 | 
						|
	  { k26, k27, k28, k29, k2a, k2b }, \
 | 
						|
	  { k36, k37, k38, k39, k3a, k3b }, \
 | 
						|
	  { k40, k41, k42, k49, k4a, k4b }, \
 | 
						|
	  { k47, k47, k48, k43, k44, k45 } \
 | 
						|
  }
 | 
						|
 | 
						|
  #define LAYOUT_preonic_1x2uL( \
 | 
						|
	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 | 
						|
	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 | 
						|
	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 | 
						|
	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
 | 
						|
	  k40, k41, k42, k43,   k44,    k46, k47, k48, k49, k4a, k4b \
 | 
						|
  ) \
 | 
						|
  { \
 | 
						|
	  { k00, k01, k02, k03, k04, k05 }, \
 | 
						|
	  { k10, k11, k12, k13, k14, k15 }, \
 | 
						|
	  { k20, k21, k22, k23, k24, k25 }, \
 | 
						|
	  { k30, k31, k32, k33, k34, k35 }, \
 | 
						|
	  { k06, k07, k08, k09, k0a, k0b }, \
 | 
						|
	  { k16, k17, k18, k19, k1a, k1b }, \
 | 
						|
	  { k26, k27, k28, k29, k2a, k2b }, \
 | 
						|
	  { k36, k37, k38, k39, k3a, k3b }, \
 | 
						|
	  { k40, k41, k42, k49, k4a, k4b }, \
 | 
						|
	  { k46, k47, k48, k43, k44, k44 } \
 | 
						|
  }
 | 
						|
 | 
						|
  #define LAYOUT_preonic_2x2u( \
 | 
						|
	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 | 
						|
	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 | 
						|
	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 | 
						|
	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
 | 
						|
	  k40, k41, k42, k43,   k44,      k46,    k48, k49, k4a, k4b \
 | 
						|
  ) \
 | 
						|
  { \
 | 
						|
	  { k00, k01, k02, k03, k04, k05 }, \
 | 
						|
	  { k10, k11, k12, k13, k14, k15 }, \
 | 
						|
	  { k20, k21, k22, k23, k24, k25 }, \
 | 
						|
	  { k30, k31, k32, k33, k34, k35 }, \
 | 
						|
	  { k06, k07, k08, k09, k0a, k0b }, \
 | 
						|
	  { k16, k17, k18, k19, k1a, k1b }, \
 | 
						|
	  { k26, k27, k28, k29, k2a, k2b }, \
 | 
						|
	  { k36, k37, k38, k39, k3a, k3b }, \
 | 
						|
	  { k40, k41, k42, k49, k4a, k4b }, \
 | 
						|
	  { k46, k46, k48, k43, k44, k44 } \
 | 
						|
  }
 | 
						|
 | 
						|
  #define LAYOUT_preonic_grid( \
 | 
						|
	  k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, \
 | 
						|
	  k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, \
 | 
						|
	  k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, \
 | 
						|
	  k30, k31, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, \
 | 
						|
	  k40, k41, k42, k43, k44, k45, k46, k47, k48, k49, k4a, k4b \
 | 
						|
  ) \
 | 
						|
  { \
 | 
						|
	  { k00, k01, k02, k03, k04, k05 }, \
 | 
						|
	  { k10, k11, k12, k13, k14, k15 }, \
 | 
						|
	  { k20, k21, k22, k23, k24, k25 }, \
 | 
						|
	  { k30, k31, k32, k33, k34, k35 }, \
 | 
						|
	  { k06, k07, k08, k09, k0a, k0b }, \
 | 
						|
	  { k16, k17, k18, k19, k1a, k1b }, \
 | 
						|
	  { k26, k27, k28, k29, k2a, k2b }, \
 | 
						|
	  { k36, k37, k38, k39, k3a, k3b }, \
 | 
						|
	  { k40, k41, k42, k49, k4a, k4b }, \
 | 
						|
	  { k46, k47, k48, k43, k44, k45 } \
 | 
						|
  }
 | 
						|
 | 
						|
#endif
 |