Backport ChibiOS Audio changes from ZSA (#11687)
This commit is contained in:
		
							parent
							
								
									30b46fad57
								
							
						
					
					
						commit
						bab9849a8b
					
				
					 2 changed files with 19 additions and 8 deletions
				
			
		| 
						 | 
				
			
			@ -86,13 +86,21 @@ static void gpt_cb8(GPTDriver *gptp);
 | 
			
		|||
 | 
			
		||||
#define START_CHANNEL_1()        \
 | 
			
		||||
    gptStart(&GPTD6, &gpt6cfg1); \
 | 
			
		||||
    gptStartContinuous(&GPTD6, 2U)
 | 
			
		||||
    gptStartContinuous(&GPTD6, 2U); \
 | 
			
		||||
    palSetPadMode(GPIOA, 4, PAL_MODE_INPUT_ANALOG)
 | 
			
		||||
#define START_CHANNEL_2()        \
 | 
			
		||||
    gptStart(&GPTD7, &gpt7cfg1); \
 | 
			
		||||
    gptStartContinuous(&GPTD7, 2U)
 | 
			
		||||
#define STOP_CHANNEL_1() gptStopTimer(&GPTD6)
 | 
			
		||||
#define STOP_CHANNEL_2() gptStopTimer(&GPTD7)
 | 
			
		||||
#define RESTART_CHANNEL_1() \
 | 
			
		||||
    gptStartContinuous(&GPTD7, 2U); \
 | 
			
		||||
    palSetPadMode(GPIOA, 5, PAL_MODE_INPUT_ANALOG)
 | 
			
		||||
#define STOP_CHANNEL_1()          \
 | 
			
		||||
    gptStopTimer(&GPTD6);         \
 | 
			
		||||
    palSetPadMode(GPIOA, 4, PAL_MODE_OUTPUT_PUSHPULL); \
 | 
			
		||||
    palSetPad(GPIOA, 4)
 | 
			
		||||
#define STOP_CHANNEL_2()         \
 | 
			
		||||
    gptStopTimer(&GPTD7);        \
 | 
			
		||||
    palSetPadMode(GPIOA, 5, PAL_MODE_OUTPUT_PUSHPULL); \
 | 
			
		||||
    palSetPad(GPIOA, 5)
 | 
			
		||||
    #define RESTART_CHANNEL_1() \
 | 
			
		||||
    STOP_CHANNEL_1();       \
 | 
			
		||||
    START_CHANNEL_1()
 | 
			
		||||
#define RESTART_CHANNEL_2() \
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -17,7 +17,9 @@
 | 
			
		|||
#pragma once
 | 
			
		||||
 | 
			
		||||
// Tempo Placeholder
 | 
			
		||||
#define TEMPO_DEFAULT 100
 | 
			
		||||
#ifndef TEMPO_DEFAULT
 | 
			
		||||
#    define TEMPO_DEFAULT 100
 | 
			
		||||
#endif
 | 
			
		||||
 | 
			
		||||
#define SONG(notes...) \
 | 
			
		||||
    { notes }
 | 
			
		||||
| 
						 | 
				
			
			@ -60,8 +62,9 @@
 | 
			
		|||
#define TIMBRE_25 0.250f
 | 
			
		||||
#define TIMBRE_50 0.500f
 | 
			
		||||
#define TIMBRE_75 0.750f
 | 
			
		||||
#define TIMBRE_DEFAULT TIMBRE_50
 | 
			
		||||
 | 
			
		||||
#ifndef TIMBRE_DEFAULT
 | 
			
		||||
#    define TIMBRE_DEFAULT TIMBRE_50
 | 
			
		||||
#endif
 | 
			
		||||
// Notes - # = Octave
 | 
			
		||||
 | 
			
		||||
#ifdef __arm__
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue