mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-23 16:16:13 +01:00
Compare commits
No commits in common. "5f65fd5944d6def87673a3d21881b4d21bfcac68" and "0c96d4ffc2e1af26b97977b6f575fd4451b407e5" have entirely different histories.
5f65fd5944
...
0c96d4ffc2
|
@ -76,13 +76,8 @@ int DCCTimer::freeMemory() {
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
#ifdef ARDUINO_ARCH_ESP32
|
#ifdef ARDUINO_ARCH_ESP32
|
||||||
|
|
||||||
#include "esp_idf_version.h"
|
|
||||||
#if ESP_IDF_VERSION_MAJOR > 4
|
|
||||||
#error "DCC-EX does not support compiling with IDF version 5.0 or later. Downgrade your ESP32 library to a version that contains IDE version 4. Arduino ESP32 library 3.0.0 is too new. Downgrade to one of 2.0.9 to 2.0.17"
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#include "DIAG.h"
|
#include "DIAG.h"
|
||||||
#include <driver/adc.h>
|
#include <driver/adc.h>
|
||||||
#include <soc/sens_reg.h>
|
#include <soc/sens_reg.h>
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202406021945Z"
|
#define GITHUB_SHA "devel-202405232026Z"
|
||||||
|
|
|
@ -164,11 +164,7 @@ monitor_echo = yes
|
||||||
build_flags = -mcall-prologues
|
build_flags = -mcall-prologues
|
||||||
|
|
||||||
[env:ESP32]
|
[env:ESP32]
|
||||||
; Lock version to 6.7.0 as that is
|
platform = espressif32
|
||||||
; Arduino v2.0.16 (based on IDF v4.4.7)
|
|
||||||
; which is the latest version based
|
|
||||||
; on IDF v4. We can not use IDF v5.
|
|
||||||
platform = espressif32 @ 6.7.0
|
|
||||||
board = esp32dev
|
board = esp32dev
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_deps = ${env.lib_deps}
|
lib_deps = ${env.lib_deps}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user