Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						6d39cc858f
					
				
					 1 changed files with 8 additions and 0 deletions
				
			
		| 
						 | 
				
			
			@ -152,3 +152,11 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 | 
			
		|||
/* Bootmagic Lite key configuration */
 | 
			
		||||
// #define BOOTMAGIC_LITE_ROW 0
 | 
			
		||||
// #define BOOTMAGIC_LITE_COLUMN 0
 | 
			
		||||
 | 
			
		||||
/* USB config */
 | 
			
		||||
#define USB_MAX_POWER_CONSUMPTION 100
 | 
			
		||||
#define USB_COUNT_SOF 0
 | 
			
		||||
#define USB_INTR_CFG_SET (1 << ISC01)
 | 
			
		||||
#define USB_INTR_ENABLE_BIT INT0
 | 
			
		||||
#define USB_INTR_PENDING_BIT INTF0
 | 
			
		||||
#define USB_INTR_VECTOR INT0_vect
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue