Move GMMK Pro to allow for multiple revisions (#16423)
* Added GMMK PRO Rev2 WBG7 MCU compatibility. Added GMMK 2 WBG7 MCU compatibility. * GMMK PRO MCU Updates only (removed other kbs) * fix problems * Optimize the code. * Update form develop branch * Update * Updater from qmk/develop * Update * Update config.h * Update config.h * Remove gmmk pro rev2 * move moults31/keymap.c * Update * tidy up Co-authored-by: Joy <chang.li@westberrytech.com> Co-authored-by: zvecr <git@zvecr.com>
This commit is contained in:
		
							parent
							
								
									b5608cbb6d
								
							
						
					
					
						commit
						83fa6fe916
					
				
					 125 changed files with 82 additions and 23 deletions
				
			
		| 
						 | 
				
			
			@ -165,7 +165,13 @@
 | 
			
		|||
          target: 'gh60/revc'
 | 
			
		||||
    },
 | 
			
		||||
    'gmmk/pro': {
 | 
			
		||||
          target: 'gmmk/pro/ansi'
 | 
			
		||||
          target: 'gmmk/pro/rev1/ansi'
 | 
			
		||||
    },
 | 
			
		||||
    'gmmk/pro/ansi': {
 | 
			
		||||
        target: 'gmmk/pro/rev1/ansi'
 | 
			
		||||
    },
 | 
			
		||||
    'gmmk/pro/iso': {
 | 
			
		||||
        target: 'gmmk/pro/rev1/iso'
 | 
			
		||||
    },
 | 
			
		||||
    'handwired/ferris': {
 | 
			
		||||
          target: 'ferris/0_1'
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -53,7 +53,6 @@
 | 
			
		|||
#define LOCKING_RESYNC_ENABLE
 | 
			
		||||
 | 
			
		||||
/* SPI Config for LED Driver */
 | 
			
		||||
#define SPI_DRIVER SPID1
 | 
			
		||||
#define SPI_SCK_PIN A5
 | 
			
		||||
#define SPI_MOSI_PIN A6
 | 
			
		||||
#define SPI_MISO_PIN A7
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +0,0 @@
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
#define HAL_USE_SPI TRUE
 | 
			
		||||
#define SPI_USE_WAIT TRUE
 | 
			
		||||
#define SPI_SELECT_MODE SPI_SELECT_MODE_PAD
 | 
			
		||||
 | 
			
		||||
#include_next <halconf.h>
 | 
			
		||||
| 
						 | 
				
			
			@ -1,6 +0,0 @@
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
#include_next <mcuconf.h>
 | 
			
		||||
 | 
			
		||||
#undef STM32_SPI_USE_SPI1
 | 
			
		||||
#define STM32_SPI_USE_SPI1 TRUE
 | 
			
		||||
| 
						 | 
				
			
			@ -18,8 +18,8 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#if defined(KEYBOARD_gmmk_pro_ansi)
 | 
			
		||||
#    include "ansi.h"
 | 
			
		||||
#elif defined(KEYBOARD_gmmk_pro_iso)
 | 
			
		||||
#    include "iso.h"
 | 
			
		||||
#if defined(KEYBOARD_gmmk_pro_rev1_ansi)
 | 
			
		||||
#    include "rev1/ansi/ansi.h"
 | 
			
		||||
#elif defined(KEYBOARD_gmmk_pro_rev1_iso)
 | 
			
		||||
#    include "rev1/iso/iso.h"
 | 
			
		||||
#endif  // GMMK Pro revisions
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
Some files were not shown because too many files have changed in this diff Show more
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue