Airsoft/DarkEmergency-Timer
Airsoft/DarkEmergency-Timer
1
0
Fork 0
Code Issues Pull Requests Releases 9 Wiki Activity

moved to ESP32

Browse Source
This commit is contained in:
Marcel Peterkau 2022-07-15 13:36:29 +02:00
parent 893a57707d
commit 3c3feeb8b5
3 changed files with 33 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
platformio.ini
View File

@ -12,14 +12,14 @@
extra_configs = extra_configs =
wifi_credentials.ini wifi_credentials.ini
[env:d1_mini] [env:de-timer]
platform = espressif8266 platform = espressif32
board = d1_mini board = ttgo-lora32-v1
board_build.filesystem = littlefs board_build.filesystem = littlefs
board_build.f_flash = 80000000L ;board_build.f_flash = 80000000L
board_build.ldscript = eagle.flash.4m1m.ld ;board_build.ldscript = eagle.flash.4m1m.ld
monitor_filters = esp8266_exception_decoder monitor_filters = esp32_exception_decoder
monitor_speed = 115200 monitor_speed = 115200
upload_protocol = esptool upload_protocol = esptool
@ -49,9 +49,8 @@ build_flags=
framework = arduino framework = arduino
lib_deps = lib_deps =
smougenot/TM1637@0.0.0-alpha+sha.9486982048 smougenot/TM1637@0.0.0-alpha+sha.9486982048
joaolopesf/RemoteDebug @ ^2.1.2 ;me-no-dev/ESP Async WebServer @ ^1.2.3 ; local version included due to bug
me-no-dev/ESP Async WebServer @ ^1.2.3 me-no-dev/AsyncTCP @ ^1.1.1
sstaub/Ticker @ ^4.2.0 sstaub/Ticker @ ^4.2.0
adafruit/Adafruit INA219 @ ^1.1.1 adafruit/Adafruit INA219 @ ^1.1.1
robtillaart/I2C_EEPROM @ ^1.5.2 robtillaart/I2C_EEPROM @ ^1.5.2
me-no-dev/ESP Async WebServer @ ^1.2.3

31
src/main.cpp
View File

@ -2,9 +2,9 @@
#include <TM1637Display.h> #include <TM1637Display.h>
#include <Ticker.h> #include <Ticker.h>
#include <DNSServer.h> #include <DNSServer.h>
#include <ESP8266WiFi.h> #include <WiFi.h>
#include <ESPAsyncTCP.h> #include <AsyncTCP.h>
#include <ESP8266mDNS.h> #include <ESPmDNS.h>
#include <ArduinoOTA.h> #include <ArduinoOTA.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include <LittleFS.h> #include <LittleFS.h>
@ -20,13 +20,13 @@
#include "common.h" #include "common.h"
#ifdef WIFI_CLIENT #ifdef WIFI_CLIENT
#include <ESP8266WiFiMulti.h> #include <WiFiMulti.h>
const char *ssid = QUOTE(WIFI_SSID); const char *ssid = QUOTE(WIFI_SSID);
const char *password = QUOTE(WIFI_PASSWORD); const char *password = QUOTE(WIFI_PASSWORD);
const uint32_t connectTimeoutMs = 5000; const uint32_t connectTimeoutMs = 5000;
ESP8266WiFiMulti wifiMulti; WiFiMulti wifiMulti;
#endif #endif
void SevenSeg_Output(); void SevenSeg_Output();
@ -45,6 +45,8 @@ void wifiMaintainConnectionTicker_callback();
Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS); Ticker WiFiMaintainConnectionTicker(wifiMaintainConnectionTicker_callback, 1000, 0, MILLIS);
#endif #endif
uint32_t getESPChipID();
TM1637Display disp_FAC_1(CLK, DIO_FAC_1_7SEG); TM1637Display disp_FAC_1(CLK, DIO_FAC_1_7SEG);
TM1637Display disp_FAC_2(CLK, DIO_FAC_2_7SEG); TM1637Display disp_FAC_2(CLK, DIO_FAC_2_7SEG);
TM1637Display disp_FAC_3(CLK, DIO_FAC_3_7SEG); TM1637Display disp_FAC_3(CLK, DIO_FAC_3_7SEG);
@ -79,14 +81,16 @@ const uint8_t sevenSeg_file[] = {0x71, 0x30, 0x38, 0x79};
void setup() void setup()
{ {
system_update_cpu_freq(SYS_CPU_80MHZ); setCpuFrequencyMhz(80);
WiFi.setAutoReconnect (false);
WiFi.persistent(false); WiFi.persistent(false);
WiFi.disconnect();
Serial.begin(115200); Serial.begin(115200);
Serial.print("\n\n\n"); Serial.print("\n\n\n");
strcpy(globals.DeviceName, DEVICE_NAME); strcpy(globals.DeviceName, DEVICE_NAME);
snprintf(globals.DeviceName_ID, 42, "%s_%08X", globals.DeviceName, ESP.getChipId()); snprintf(globals.DeviceName_ID, 42, "%s_%08X", globals.DeviceName, getESPChipID());
pinMode(DIO_FAC_1_TRG, INPUT_PULLUP); pinMode(DIO_FAC_1_TRG, INPUT_PULLUP);
pinMode(DIO_FAC_2_TRG, INPUT_PULLUP); pinMode(DIO_FAC_2_TRG, INPUT_PULLUP);
@ -109,6 +113,9 @@ void setup()
wifiMulti.addAP(QUOTE(WIFI_SSID), QUOTE(WIFI_PASSWORD)); wifiMulti.addAP(QUOTE(WIFI_SSID), QUOTE(WIFI_PASSWORD));
WiFiMaintainConnectionTicker.start(); WiFiMaintainConnectionTicker.start();
#else #else
WiFi.mode(WIFI_AP);
WiFi.begin(QUOTE(DEVICE_NAME), QUOTE(WIFI_AP_PASSWORD));
WiFi.setSleep(true);
WiFi.mode(WIFI_OFF); WiFi.mode(WIFI_OFF);
#endif #endif
@ -465,3 +472,13 @@ void OverrideDisplay(const uint8_t *message, uint32_t time)
DisplayOverrideFlag = millis() + time; DisplayOverrideFlag = millis() + time;
DisplayOverrideValue = (uint8_t *)message; DisplayOverrideValue = (uint8_t *)message;
} }
uint32_t getESPChipID()
{
uint32_t chipId;
for (int i = 0; i < 17; i = i + 8)
{
chipId |= ((ESP.getEfuseMac() >> (40 - i)) & 0xff) << i;
}
return chipId;
}

2
src/webui.h
View File

@ -4,7 +4,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <FS.h> #include <FS.h>
#include <LittleFS.h> #include <LittleFS.h>
#include <ESPAsyncTCP.h> #include <AsyncTCP.h>
#include <ESPAsyncWebServer.h> #include <ESPAsyncWebServer.h>
#include "config.h" #include "config.h"
#include "globals.h" #include "globals.h"