Merge branch 'main' into cud
This commit is contained in:
		
						commit
						d025ae25a3
					
				
					 3 changed files with 87 additions and 18 deletions
				
			
		
							
								
								
									
										93
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							
							
						
						
									
										93
									
								
								.vscode/settings.json
									
										
									
									
										vendored
									
									
								
							|  | @ -1,20 +1,77 @@ | |||
| { | ||||
|     "C_Cpp.errorSquiggles": "enabled", | ||||
|     "files.associations": { | ||||
|         "*.cps": "javascript", | ||||
|         "string": "cpp", | ||||
|         "optional": "cpp", | ||||
|         "istream": "cpp", | ||||
|         "ostream": "cpp", | ||||
|         "system_error": "cpp", | ||||
|         "array": "cpp", | ||||
|         "functional": "cpp", | ||||
|         "tuple": "cpp", | ||||
|         "type_traits": "cpp", | ||||
|         "utility": "cpp", | ||||
|         "*.d": "cpp", | ||||
|         "*.html": "cpp", | ||||
|         "*.tcc": "cpp", | ||||
|         "regex": "cpp" | ||||
|     } | ||||
|   "C_Cpp.errorSquiggles": "enabled", | ||||
|   "files.associations": { | ||||
|     "*.cps": "javascript", | ||||
|     "string": "cpp", | ||||
|     "optional": "cpp", | ||||
|     "istream": "cpp", | ||||
|     "ostream": "cpp", | ||||
|     "system_error": "cpp", | ||||
|     "array": "cpp", | ||||
|     "functional": "cpp", | ||||
|     "tuple": "cpp", | ||||
|     "type_traits": "cpp", | ||||
|     "utility": "cpp", | ||||
|     "*.d": "cpp", | ||||
|     "*.html": "cpp", | ||||
|     "*.tcc": "cpp", | ||||
|     "regex": "cpp" | ||||
|   }, | ||||
|   "C_Cpp_Runner.msvcBatchPath": "", | ||||
|   "C_Cpp_Runner.cCompilerPath": "gcc", | ||||
|   "C_Cpp_Runner.cppCompilerPath": "g++", | ||||
|   "C_Cpp_Runner.debuggerPath": "gdb", | ||||
|   "C_Cpp_Runner.cStandard": "", | ||||
|   "C_Cpp_Runner.cppStandard": "", | ||||
|   "C_Cpp_Runner.useMsvc": false, | ||||
|   "C_Cpp_Runner.warnings": [ | ||||
|     "-Wall", | ||||
|     "-Wextra", | ||||
|     "-Wpedantic", | ||||
|     "-Wshadow", | ||||
|     "-Wformat=2", | ||||
|     "-Wcast-align", | ||||
|     "-Wconversion", | ||||
|     "-Wsign-conversion", | ||||
|     "-Wnull-dereference" | ||||
|   ], | ||||
|   "C_Cpp_Runner.msvcWarnings": [ | ||||
|     "/W4", | ||||
|     "/permissive-", | ||||
|     "/w14242", | ||||
|     "/w14287", | ||||
|     "/w14296", | ||||
|     "/w14311", | ||||
|     "/w14826", | ||||
|     "/w44062", | ||||
|     "/w44242", | ||||
|     "/w14905", | ||||
|     "/w14906", | ||||
|     "/w14263", | ||||
|     "/w44265", | ||||
|     "/w14928" | ||||
|   ], | ||||
|   "C_Cpp_Runner.enableWarnings": true, | ||||
|   "C_Cpp_Runner.warningsAsError": false, | ||||
|   "C_Cpp_Runner.compilerArgs": [], | ||||
|   "C_Cpp_Runner.linkerArgs": [], | ||||
|   "C_Cpp_Runner.includePaths": [], | ||||
|   "C_Cpp_Runner.includeSearch": [ | ||||
|     "*", | ||||
|     "**/*" | ||||
|   ], | ||||
|   "C_Cpp_Runner.excludeSearch": [ | ||||
|     "**/build", | ||||
|     "**/build/**", | ||||
|     "**/.*", | ||||
|     "**/.*/**", | ||||
|     "**/.vscode", | ||||
|     "**/.vscode/**" | ||||
|   ], | ||||
|   "C_Cpp_Runner.useAddressSanitizer": false, | ||||
|   "C_Cpp_Runner.useUndefinedSanitizer": false, | ||||
|   "C_Cpp_Runner.useLeakSanitizer": false, | ||||
|   "C_Cpp_Runner.showCompilationTime": false, | ||||
|   "C_Cpp_Runner.useLinkTimeOptimization": false, | ||||
|   "C_Cpp_Runner.msvcSecureNoWarnings": false | ||||
| } | ||||
|  | @ -144,6 +144,12 @@ void setup() | |||
| #endif | ||||
|   Serial.println("ESPMega R3 Initializing"); | ||||
|   ESPMega_begin(); | ||||
|   #ifdef OVERCLOCK_FM2 | ||||
|   Wire.setClock(1000000); | ||||
|   #endif | ||||
|   #ifdef OVERCLOCK_FM | ||||
|   Wire.setClock(400000); | ||||
|   #endif | ||||
|   io_begin(); | ||||
|   eeprom_retrieve_init(); | ||||
|   user_pre_init(); | ||||
|  |  | |||
|  | @ -9,6 +9,12 @@ | |||
| // Device Info
 | ||||
| #define ESPMEGA_REV "ESPMega PRO R3.3b (CUD)" | ||||
| 
 | ||||
| // Bus Overclocking Configuration
 | ||||
| // Do not enable if you are using external I/O cards as it will cause signal integrity issues.
 | ||||
| // Choose only one mode
 | ||||
| //#define OVERCLOCK_FM
 | ||||
| //#define OVERCLOCK_FM2
 | ||||
| 
 | ||||
| // Enable Software Module(s)
 | ||||
| #define ENABLE_INTERNAL_LCD | ||||
| #define ENABLE_IR_MODULE | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue