Merge branch 'master' into fork/atoktoto/midihost
# Conflicts: # src/host/usbh.c
This commit is contained in:
		
							
								
								
									
										6
									
								
								examples/host/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/bare_api/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/bare_api/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/cdc_msc_hid/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/cdc_msc_hid/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/cdc_msc_hid_freertos/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/cdc_msc_hid_freertos/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/device_info/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/device_info/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/hid_controller/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/hid_controller/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
							
								
								
									
										6
									
								
								examples/host/msc_file_explorer/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										6
									
								
								examples/host/msc_file_explorer/CMakePresets.json
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,6 @@ | ||||
| { | ||||
|   "version": 6, | ||||
|   "include": [ | ||||
|     "../../../hw/bsp/BoardPresets.json" | ||||
|   ] | ||||
| } | ||||
		Reference in New Issue
	
	Block a user
	 hathach
					hathach