btclock/btclock_v2
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Make mempool.space instance configurable, change ntp server to global pool

Browse source
This commit is contained in:
Djuri 2023-10-07 20:37:47 +02:00
parent 18faece660
commit cc28df888b
5 changed files with 34 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/config.h
View file

@ -1,6 +1,7 @@
#pragma once
#define NTP_SERVER "nl.pool.ntp.org"
#define NTP_SERVER "pool.ntp.org"
#define DEFAULT_MEMPOOL_INSTANCE "mempool.bitcoin.nl"
#define FONT_SMALL Antonio_SemiBold20pt7b
#define FONT_BIG Antonio_SemiBold90pt7b

12
src/lib/webserver.cpp
View file

@ -154,6 +154,8 @@ void onApiSettingsGet(AsyncWebServerRequest *request)
root["rpcPort"] = preferences.getUInt("rpcPort", BITCOIND_PORT);
root["rpcUser"] = preferences.getString("rpcUser", BITCOIND_RPC_USER);
root["rpcHost"] = preferences.getString("rpcHost", BITCOIND_HOST);
root["mempoolInstance"] = preferences.getString("mempoolInstance", DEFAULT_MEMPOOL_INSTANCE);
#ifdef IS_BW
root["epdColors"] = 2;
#else
@ -222,6 +224,16 @@ void onApiSettingsPost(AsyncWebServerRequest *request)
settingsChanged = true;
}
if (request->hasParam("mempoolInstance", true))
{
AsyncWebParameter *mempoolInstance = request->getParam("mempoolInstance", true);
preferences.putString("mempoolInstance", mempoolInstance->value().c_str());
Serial.print("Setting mempool instance to ");
Serial.println(mempoolInstance->value().c_str());
settingsChanged = true;
}
if (request->hasParam("ledBrightness", true))
{
AsyncWebParameter *ledBrightness = request->getParam("ledBrightness", true);

3
src/tasks/blocknotify.cpp
View file

@ -20,7 +20,6 @@ void checkBitcoinBlock(void *pvParameters)
int blockHeight = preferences.getUInt("blockHeight", currentBlockHeight);
HTTPClient http;
http.setReuse(true);
useBitcoind = preferences.getBool("useNode", false) && wifiClientInsecure.connect(preferences.getString("rpcHost", BITCOIND_HOST).c_str(), preferences.getUInt("rpcPort", BITCOIND_PORT));
if (useBitcoind)
Serial.println("bitcoind node is reachable, using this for blocks.");
@ -58,7 +57,7 @@ void checkBitcoinBlock(void *pvParameters)
}
else
{
http.begin("https://mempool.bitcoin.nl/api/blocks/tip/height");
http.begin("https://" + preferences.getString("mempoolInstance", DEFAULT_MEMPOOL_INSTANCE) + "/api/blocks/tip/height");
http.addHeader("User-Agent", "BTClock/1.0");
int httpCode = http.GET();