Converted audio play functions to *_user (#349)
* Updated personal layouts * tweaked personal * Nightly - Audio Cleanup Refactored the LUTs. Abstracted some of the registers out of audio to use more functional names. Split audio into audio and audio_pwm. WIP * nightly - collapsed code * Added check for note playing to LEDs * Usability tweaks * TWEAE * nightly added extra kcs to keymap common * turned on Plank audio * Added backlight breathing to atomic * reverted accidental merge * Added music and audio toggles to Quantum.c * Redid the audio callbacks * Adjusted default planck layout to use the user tone naming * tabs to spaces * Rewrote the ALL recipe to allow for faster parallel make * tabs to spaces * Renamed custom event functions to be 'startup_user' and 'shutdown_user'. Also moved the prototypes around. * Tweaked pvc atomic layout to work with the pvc planck. * updates midi scale calling
This commit is contained in:
		
							parent
							
								
									1ae6011cef
								
							
						
					
					
						commit
						287eb7ad14
					
				
					 11 changed files with 214 additions and 281 deletions
				
			
		| 
						 | 
				
			
			@ -33,20 +33,21 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
#include "led.h"
 | 
			
		||||
#include "command.h"
 | 
			
		||||
#include "backlight.h"
 | 
			
		||||
#include "quantum.h"
 | 
			
		||||
 | 
			
		||||
#ifdef MOUSEKEY_ENABLE
 | 
			
		||||
#include "mousekey.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef PROTOCOL_PJRC
 | 
			
		||||
#   include "usb_keyboard.h"
 | 
			
		||||
#   ifdef EXTRAKEY_ENABLE
 | 
			
		||||
#       include "usb_extra.h"
 | 
			
		||||
#   endif
 | 
			
		||||
	#include "usb_keyboard.h"
 | 
			
		||||
		#ifdef EXTRAKEY_ENABLE
 | 
			
		||||
		#include "usb_extra.h"
 | 
			
		||||
	#endif
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef PROTOCOL_VUSB
 | 
			
		||||
#   include "usbdrv.h"
 | 
			
		||||
	#include "usbdrv.h"
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#ifdef AUDIO_ENABLE
 | 
			
		||||
| 
						 | 
				
			
			@ -358,7 +359,7 @@ static bool command_common(uint8_t code)
 | 
			
		|||
            print("\n\nJumping to bootloader... ");
 | 
			
		||||
            #ifdef AUDIO_ENABLE
 | 
			
		||||
	            stop_all_notes();
 | 
			
		||||
                play_goodbye_tone();
 | 
			
		||||
                shutdown_user();
 | 
			
		||||
            #else
 | 
			
		||||
	            _delay_ms(1000);
 | 
			
		||||
            #endif
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -366,7 +366,13 @@ ALL_ASFLAGS = -mmcu=$(MCU) -x assembler-with-cpp $(ASFLAGS) $(EXTRAFLAGS)
 | 
			
		|||
 | 
			
		||||
 | 
			
		||||
# Default target.
 | 
			
		||||
all: begin gccversion sizebefore build sizeafter end
 | 
			
		||||
all: 
 | 
			
		||||
	$(MAKE) begin 
 | 
			
		||||
	$(MAKE) gccversion 
 | 
			
		||||
	$(MAKE) sizebefore 
 | 
			
		||||
	$(MAKE) build 
 | 
			
		||||
	$(MAKE) sizeafter 
 | 
			
		||||
	$(MAKE) end
 | 
			
		||||
 | 
			
		||||
# Change the build target to build a HEX file or a library.
 | 
			
		||||
build: elf hex eep lss sym
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue