Rename MS-sculpt-mobile to MS_scuplpt_mobile
Subprojects with "-" have problems, since the build system creates a define containing the subproject name, and "-" is illegal in macro names.
This commit is contained in:
		
							parent
							
								
									738b8d2b9c
								
							
						
					
					
						commit
						bbe8876c8d
					
				
					 7 changed files with 11 additions and 10 deletions
				
			
		| 
						 | 
				
			
			@ -1 +1 @@
 | 
			
		|||
#include "MS-sculpt-mobile.h"
 | 
			
		||||
#include "MS_sculpt_mobile.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -7,7 +7,8 @@ Huge thanks to https://en.wikipedia.org/wiki/Table_of_keyboard_shortcuts
 | 
			
		|||
and https://github.com/qmk/qmk_firmware/blob/master/keyboards/planck/keymaps/jeebak/keymap.c 
 | 
			
		||||
*/
 | 
			
		||||
 | 
			
		||||
#include "babblePaste.h"
 | 
			
		||||
#include "../MS_sculpt_mobile/babblePaste.h"
 | 
			
		||||
 | 
			
		||||
#include "action_macro.h"
 | 
			
		||||
 | 
			
		||||
#ifdef USE_BABLPASTE
 | 
			
		||||
| 
						 | 
				
			
			@ -27,7 +28,7 @@ macro_t* switch_babble_mode( uint8_t id) {
 | 
			
		|||
// And else statements have problems, see https://gcc.gnu.org/onlinedocs/gcc-3.0.1/cpp_3.html#SEC15
 | 
			
		||||
#define BABLM(ent, macro...) \
 | 
			
		||||
	if ( ent == shortcut ) \
 | 
			
		||||
		 {  action_macro_play( MACRO(macro)); return MACRO_NONE; }   
 | 
			
		||||
		 {  action_macro_play( MACRO(macro)); return MACRO_NONE; }
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
/* this function runs the appropriate babblepaste macro, given
 | 
			
		||||
| 
						 | 
				
			
			@ -456,4 +457,4 @@ const  macro_t *babblePaste (keyrecord_t *record,  uint8_t shortcut) {
 | 
			
		|||
}
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
#endif
 | 
			
		||||
#endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -9,9 +9,9 @@ and jeebak & algernon's keymap
 | 
			
		|||
*/
 | 
			
		||||
#ifndef _babblePaste_h_included__
 | 
			
		||||
#define _babblePaste_h_included__
 | 
			
		||||
#include "../MS_sculpt_mobile/config.h"
 | 
			
		||||
#include "action_layer.h"
 | 
			
		||||
#include "quantum_keycodes.h"
 | 
			
		||||
#include "config.h"
 | 
			
		||||
 | 
			
		||||
#ifdef USE_BABLPASTE
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#ifndef CONFIG_USER_H
 | 
			
		||||
#define CONFIG_USER_H
 | 
			
		||||
 | 
			
		||||
#include "../../config.h"
 | 
			
		||||
#include "../../../MS_sculpt_mobile/config.h"
 | 
			
		||||
 | 
			
		||||
// place overrides here
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,4 +1,4 @@
 | 
			
		|||
#include "MS-sculpt-mobile.h"
 | 
			
		||||
#include "../../MS_sculpt_mobile.h"
 | 
			
		||||
 | 
			
		||||
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 | 
			
		||||
/* 
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#ifndef CONFIG_USER_H
 | 
			
		||||
#define CONFIG_USER_H
 | 
			
		||||
 | 
			
		||||
#include "../../config.h"
 | 
			
		||||
#include "../../../MS_sculpt_mobile/config.h"
 | 
			
		||||
 | 
			
		||||
#define USE_BABLPASTE
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -1,7 +1,7 @@
 | 
			
		|||
#include "MS-sculpt-mobile.h"
 | 
			
		||||
#include "../../../MS_sculpt_mobile/babblePaste.h"
 | 
			
		||||
#include "../../MS_sculpt_mobile.h"
 | 
			
		||||
#include "action_layer.h"
 | 
			
		||||
#include "action_util.h"
 | 
			
		||||
#include "babblePaste.h"
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
  #include "audio.h"
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue