diff --git a/.gitignore b/.gitignore index 5c228a4..8a9fb2f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,4 @@ .vscode/c_cpp_properties.json .vscode/launch.json .vscode/ipch -.vs/ -.vscode/ -.vscode/settings.json \ No newline at end of file +.vs/ \ No newline at end of file diff --git a/.vscode/settings.json b/.vscode/settings.json index 2975662..69aa100 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -1,77 +1,20 @@ { - "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 + "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" + } } \ No newline at end of file diff --git a/src/espmega_iot_core.cpp b/src/espmega_iot_core.cpp index af1b163..e797661 100644 --- a/src/espmega_iot_core.cpp +++ b/src/espmega_iot_core.cpp @@ -144,12 +144,6 @@ 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(); diff --git a/src/user_code.hpp b/src/user_code.hpp index f14d89b..2808306 100644 --- a/src/user_code.hpp +++ b/src/user_code.hpp @@ -6,12 +6,6 @@ #include "espmega_iot_timer.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) #define ENABLE_INTERNAL_LCD #define ENABLE_IR_MODULE