Compare commits

..

No commits in common. "509f18b7cc281e6e3825d54df938a1ab20394524" and "e124c73f670fdb2f9eef71c6a538fa9a3bbd23b3" have entirely different histories.

4 changed files with 19 additions and 90 deletions

2
.gitignore vendored
View File

@ -4,5 +4,3 @@
.vscode/launch.json .vscode/launch.json
.vscode/ipch .vscode/ipch
.vs/ .vs/
.vscode/
.vscode/settings.json

93
.vscode/settings.json vendored
View File

@ -1,77 +1,20 @@
{ {
"C_Cpp.errorSquiggles": "enabled", "C_Cpp.errorSquiggles": "enabled",
"files.associations": { "files.associations": {
"*.cps": "javascript", "*.cps": "javascript",
"string": "cpp", "string": "cpp",
"optional": "cpp", "optional": "cpp",
"istream": "cpp", "istream": "cpp",
"ostream": "cpp", "ostream": "cpp",
"system_error": "cpp", "system_error": "cpp",
"array": "cpp", "array": "cpp",
"functional": "cpp", "functional": "cpp",
"tuple": "cpp", "tuple": "cpp",
"type_traits": "cpp", "type_traits": "cpp",
"utility": "cpp", "utility": "cpp",
"*.d": "cpp", "*.d": "cpp",
"*.html": "cpp", "*.html": "cpp",
"*.tcc": "cpp", "*.tcc": "cpp",
"regex": "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
} }

View File

@ -144,12 +144,6 @@ void setup()
#endif #endif
Serial.println("ESPMega R3 Initializing"); Serial.println("ESPMega R3 Initializing");
ESPMega_begin(); ESPMega_begin();
#ifdef OVERCLOCK_FM2
Wire.setClock(1000000);
#endif
#ifdef OVERCLOCK_FM
Wire.setClock(400000);
#endif
io_begin(); io_begin();
eeprom_retrieve_init(); eeprom_retrieve_init();
user_pre_init(); user_pre_init();

View File

@ -6,12 +6,6 @@
#include "espmega_iot_timer.hpp" #include "espmega_iot_timer.hpp"
#include "espmega_iot_external_lcd.hpp" #include "espmega_iot_external_lcd.hpp"
// 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) // Enable Software Module(s)
#define ENABLE_INTERNAL_LCD #define ENABLE_INTERNAL_LCD
#define ENABLE_IR_MODULE #define ENABLE_IR_MODULE