Skip to content

Feature/timezone by ip #1875

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Feature/timezone by ip #1875

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
baf14dc
Added support for ESP32-2432S028
Revers-BR Jun 11, 2025
46be586
Removing unnecessary library dependencies
Revers-BR Jun 12, 2025
329f58e
Reduce code size by removing duplication
Revers-BR Jun 12, 2025
0f00955
Add ezTime support to set timezone based on IP
Revers-BR Jun 17, 2025
5a929ea
Refactor pool selection logic and improve error handling in node fetc…
Revers-BR Jul 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
312 changes: 290 additions & 22 deletions ESP_Code/DisplayHal.h
View file
Open in desktop

Large diffs are not rendered by default.

281 changes: 218 additions & 63 deletions ESP_Code/ESP_Code.ino
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,10 +47,33 @@
#include <stdint.h>
#include <stdlib.h>
#include <string.h>

#include <ezTime.h>
#include "MiningJob.h"
#include "Settings.h"

Timezone tz;

//-----------------------------used for the balance display interval-------------------//
boolean runEvery(unsigned long interval) {
static unsigned long previousMillis = 0;
unsigned long currentMillis = millis();
if (currentMillis - previousMillis >= interval) {
previousMillis = currentMillis;
return true;
}
return false;
}
//-------------------------------------------------------------------------------------//

void handleSystemEvents(void) {
#if defined(ESP32) && CORE == 2
esp_task_wdt_reset();
#endif
delay(10); // Required vTaskDelay by ESP-IDF
yield();
ArduinoOTA.handle();
}

#ifdef USE_LAN
#include <ETH.h>
#endif
Expand All @@ -59,7 +82,7 @@
#include "Dashboard.h"
#endif

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
#include "DisplayHal.h"
#endif

Expand Down Expand Up @@ -140,8 +163,11 @@ void RestartESP(String msg) {
Serial.println("Restarting ESP...");
#endif

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
display_info("Restarting ESP...");
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
display_info("Restarting ESP...");
#if defined(DISPLAY_2432S08)
display_background();
#endif
#endif

#if defined(ESP8266)
Expand Down Expand Up @@ -213,7 +239,7 @@ namespace {
Serial.println("Poolpicker selected the best mining node: " + node_id);
#endif

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
display_info(node_id);
#endif
}
Expand Down Expand Up @@ -264,8 +290,11 @@ namespace {
Serial.printf("Error fetching node from poolpicker: %s\n", https.errorToString(httpCode).c_str());
VerifyWifi();
#endif
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
display_info(https.errorToString(httpCode));
#if defined(DISPLAY_2432S08)
display_background();
#endif
#endif
}
https.end();
Expand All @@ -274,6 +303,7 @@ namespace {

void SelectNode() {
String input = "";
String inputTemp = "";
int waitTime = 1;
int poolIndex = 0;

Expand All @@ -283,13 +313,28 @@ namespace {
#endif
delay(waitTime * 1000);

input = httpGetString("https://server.duinocoin.com/getPool");
inputTemp = httpGetString("https://server.duinocoin.com/getPool");

// Increase wait time till a maximum of 32 seconds
// (addresses: Limit connection requests on failure in ESP boards #1041)
waitTime *= 2;
if (waitTime > 32)
RestartESP("Node fetch unavailable");
if(inputTemp != ""){
input = inputTemp;
break;
}else{

// Increase wait time till a maximum of 32 seconds
// (addresses: Limit connection requests on failure in ESP boards #1041)
waitTime *= 2;
if (waitTime > 32){
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
input = inputTemp;
#else
RestartESP("Node fetch unavailable");
#endif
}

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
if(input == "") display_info("Node fetch unavailable, trying again");
#endif
}
}

UpdateHostPort(input);
Expand Down Expand Up @@ -384,7 +429,7 @@ namespace {

#endif

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
display_info("Waiting for node...");
#endif
SelectNode();
Expand Down Expand Up @@ -492,29 +537,52 @@ MiningJob *job[CORE];
EasyFreeRTOS32 task1, task2;
#endif

void showMiningStatsOnDisplay(){
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
float hashrate_float = (hashrate+hashrate_core_two) / 1000.0;
float accept_rate = (accepted_share_count / 0.01 / share_count);

long millisecs = millis();
int uptime_secs = int((millisecs / 1000) % 60);
int uptime_mins = int((millisecs / (1000 * 60)) % 60);
int uptime_hours = int((millisecs / (1000 * 60 * 60)) % 24);
String uptime = String(uptime_hours) + "h" + String(uptime_mins) + "m" + String(uptime_secs) + "s";

float sharerate = share_count / (millisecs / 1000.0);

#if defined(DISPLAY_2432S08)

while(displayLock) {
handleSystemEvents();
}
displayLock = true;

display_mining_results(String(hashrate_float, 1), String(accepted_share_count), String(share_count), String(uptime),
String(node_id), String(difficulty / 100), String(sharerate, 2),
String(ping), String(accept_rate, 1));

display_balance(String(result_balance_balance),String(total_miner),String(result_balance_username));

display_time(String(mytime));

displayLock = false;

#else
display_mining_results(String(hashrate_float, 1), String(accepted_share_count), String(share_count), String(uptime),
String(node_id), String(difficulty / 100), String(sharerate, 1),
String(ping), String(accept_rate, 1));
#endif
#endif
}

void task1_func(void *) {
#if defined(ESP32) && CORE == 2
VOID SETUP() { }

VOID LOOP() {
job[0]->mine();

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
float hashrate_float = (hashrate+hashrate_core_two) / 1000.0;
float accept_rate = (accepted_share_count / 0.01 / share_count);

long millisecs = millis();
int uptime_secs = int((millisecs / 1000) % 60);
int uptime_mins = int((millisecs / (1000 * 60)) % 60);
int uptime_hours = int((millisecs / (1000 * 60 * 60)) % 24);
String uptime = String(uptime_hours) + "h" + String(uptime_mins) + "m" + String(uptime_secs) + "s";

float sharerate = share_count / (millisecs / 1000.0);

display_mining_results(String(hashrate_float, 1), String(accepted_share_count), String(share_count), String(uptime),
String(node_id), String(difficulty / 100), String(sharerate, 1),
String(ping), String(accept_rate, 1));
#endif
showMiningStatsOnDisplay();
}
#endif
}
Expand All @@ -528,26 +596,76 @@ void task2_func(void *) {
VOID LOOP() {
job[1]->mine();

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
float hashrate_float = (hashrate+hashrate_core_two) / 1000.0;
float accept_rate = (accepted_share_count / 0.01 / share_count);

long millisecs = millis();
int uptime_secs = int((millisecs / 1000) % 60);
int uptime_mins = int((millisecs / (1000 * 60)) % 60);
int uptime_hours = int((millisecs / (1000 * 60 * 60)) % 24);
String uptime = String(uptime_hours) + "h" + String(uptime_mins) + "m" + String(uptime_secs) + "s";

float sharerate = share_count / (millisecs / 1000.0);

display_mining_results(String(hashrate_float, 1), String(accepted_share_count), String(share_count), String(uptime),
String(node_id), String(difficulty / 100), String(sharerate, 1),
String(ping), String(accept_rate, 1));
#endif
updateTimeDisplayData();

showMiningStatsOnDisplay();
}
#endif
}

//------------------------- Settings and code for time display on ESP32-2432S028 CYD-------------------------

void notify(struct timeval* t) {
#if defined(SERIAL_PRINTING)
Serial.println("SNTP synchronized");
#endif
}

void initSNTP() {
#if defined(DISPLAY_2432S08)
sntp_set_sync_interval(4 * 60 * 60 * 1000UL); // 1 hour
sntp_set_time_sync_notification_cb(notify);
esp_sntp_setoperatingmode(ESP_SNTP_OPMODE_POLL);
esp_sntp_setservername(0, "pool.ntp.org");
esp_sntp_init();
setTimezoneByIP();
#endif
}

void setTimezoneByIP() {
if (WiFi.status() == WL_CONNECTED) {
HTTPClient http;
http.begin("http://ip-api.com/json/");
int httpCode = http.GET();

if (httpCode == 200) {
String payload = http.getString();

StaticJsonDocument<512> doc;
DeserializationError error = deserializeJson(doc, payload);

if (!error) {
const char *timezone = doc["timezone"];
tz.setLocation(timezone);
waitForSync();
} else {
Serial.print(F("deserializeJson() failed: "));
Serial.println(error.c_str());
}
}

http.end();
}
}

void updateTimeDisplayData() {
if(runEvery(60000)){

time_t now = tz.now();
struct tm *tm = localtime(&now);

#if defined(SERIAL_PRINTING)
Serial.println(tm, "%A, %B %d %Y %H:%M:%S");
#endif

strftime(mytime, sizeof(mytime), "%H:%M", tm);
strftime(mydate, sizeof(mydate), "%d/%m/%Y", tm);
strftime(myday, sizeof(myday), "%A", tm);
}
}

//---------------------------------------------------------------------------------------------------------

void setup() {
#if !defined(ESP8266) && defined(DISABLE_BROWNOUT)
WRITE_PERI_REG(RTC_CNTL_BROWN_OUT_REG, 0);
Expand Down Expand Up @@ -578,7 +696,7 @@ void setup() {
}
#endif

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
screen_setup();
display_boot();
delay(2500);
Expand Down Expand Up @@ -711,7 +829,7 @@ void setup() {
blinker.detach();
#endif
#else
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2) || defined(DISPLAY_2432S08)
display_info("Waiting for WiFi...");
#endif
SetupWifi();
Expand Down Expand Up @@ -769,6 +887,16 @@ void setup() {
xTaskCreatePinnedToCore(task1_func, "task1_func", 10000, NULL, 1, &Task1, 0);
xTaskCreatePinnedToCore(task2_func, "task2_func", 10000, NULL, 1, &Task2, 1);
#endif

#if defined(DISPLAY_2432S08)
display_background();
#endif

//----------------------------------SNTP connect------------------------------------------------//

initSNTP();

//----------------------------------------------------------------------------------------------//
}

void system_events_func(void* parameter) {
Expand All @@ -786,22 +914,7 @@ void single_core_loop() {

lwdtFeed();

#if defined(DISPLAY_SSD1306) || defined(DISPLAY_16X2)
float hashrate_float = (hashrate+hashrate_core_two) / 1000.0;
float accept_rate = (accepted_share_count / 0.01 / share_count);

long millisecs = millis();
int uptime_secs = int((millisecs / 1000) % 60);
int uptime_mins = int((millisecs / (1000 * 60)) % 60);
int uptime_hours = int((millisecs / (1000 * 60 * 60)) % 24);
String uptime = String(uptime_hours) + "h" + String(uptime_mins) + "m" + String(uptime_secs) + "s";

float sharerate = share_count / (millisecs / 1000.0);

display_mining_results(String(hashrate_float, 1), String(accepted_share_count), String(share_count), String(uptime),
String(node_id), String(difficulty / 100), String(sharerate, 1),
String(ping), String(accept_rate, 1));
#endif
showMiningStatsOnDisplay();

VerifyWifi();
ArduinoOTA.handle();
Expand All @@ -815,4 +928,46 @@ void loop() {
single_core_loop();
#endif
delay(10);

// displaying user balance and number of miners, update every 300 s (can be changed in Settings.h)

#if defined(DISPLAY_2432S08)

if ((runEvery(run_in_ms)) || (first_start == true))
{

String ducoReportJsonUrl = ("https://server.duinocoin.com/balances/" + String(configuration->DUCO_USER));

#if defined(SERIAL_PRINTING)
Serial.println("retrieving balance from the API...");
Serial.println(String(ducoReportJsonUrl));
Serial.println();
#endif

first_start = false;
String input2 = httpGetString(ducoReportJsonUrl);
DynamicJsonDocument doc (30000);
DeserializationError error = deserializeJson(doc, input2);

if (error) {
Serial.print("deserializeJson() failed: ");
Serial.println(error.c_str());
return;
}

JsonObject result = doc["result"];

total_miner = result["max_miners"];
result_balance_balance = result["balance"];
result_balance_username = result["username"].as<String>(); // Assign as String

#if defined(SERIAL_PRINTING)
Serial.println();
Serial.println("Username : " + String(result_balance_username));
Serial.println("Balance : " + String(result_balance_balance) + " DUCO");
Serial.println("Total miners : " + String(total_miner));
#endif
}

#endif
}
Loading