btclock/btclock_v3
3
1
Fork 2
Code Issues Pull requests 1 Projects Releases 14 Wiki Activity Actions

Finish V2 MsgPack WebSocket API implementation

Browse source
This commit is contained in:
Djuri Baars 2024-09-09 15:13:41 +02:00
parent c276d32807
commit 849e5ce439
5 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
data

@ -1 +1 @@
Subproject commit 2fffb3ef0284b4262ca97a81eb979259186604e5 Subproject commit 1fa62ca88dc9cf85109712082e2b0d3916d03323

2
dependencies.lock
View file

@ -4,6 +4,6 @@ dependencies:
source: source:
type: idf type: idf
version: 4.4.7 version: 4.4.7
manifest_hash: 615d994fdba8799111cf7825a85adb23ca6a2ae02b2335b53fde1188ff862f23 manifest_hash: 3117ab97df715ceaa7b9cacfc3cc7071408d26f122740eea130b5286dc5cd988
target: esp32s3 target: esp32s3
version: 1.0.0 version: 1.0.0

2
src/lib/block_notify.cpp
View file

@ -2,7 +2,7 @@
char *wsServer; char *wsServer;
esp_websocket_client_handle_t blockNotifyClient = NULL; esp_websocket_client_handle_t blockNotifyClient = NULL;
uint currentBlockHeight = 840000; uint currentBlockHeight = 860000;
uint blockMedianFee = 1; uint blockMedianFee = 1;
bool blockNotifyInit = false; bool blockNotifyInit = false;
unsigned long int lastBlockUpdate; unsigned long int lastBlockUpdate;

9
src/lib/screen_handler.cpp
View file

@ -8,14 +8,13 @@ TaskHandle_t workerTaskHandle;
esp_timer_handle_t screenRotateTimer; esp_timer_handle_t screenRotateTimer;
esp_timer_handle_t minuteTimer; esp_timer_handle_t minuteTimer;
std::array<std::string, NUM_SCREENS> taskEpdContent = {"", "", "", "", std::array<std::string, NUM_SCREENS> taskEpdContent = {};
"", "", ""};
std::string priceString; std::string priceString;
#define WORK_QUEUE_SIZE 10 #define WORK_QUEUE_SIZE 10
QueueHandle_t workQueue = NULL; QueueHandle_t workQueue = NULL;
uint currentScreen; uint currentScreen = SCREEN_BLOCK_HEIGHT;
uint currentCurrency = CURRENCY_USD; uint currentCurrency = CURRENCY_USD;
void workerTask(void *pvParameters) { void workerTask(void *pvParameters) {
@ -158,7 +157,9 @@ void setupTasks() {
&taskScreenRotateTaskHandle); &taskScreenRotateTaskHandle);
waitUntilNoneBusy(); waitUntilNoneBusy();
setCurrentScreen(preferences.getUInt("currentScreen", DEFAULT_CURRENT_SCREEN));
if (findScreenIndexByValue(preferences.getUInt("currentScreen", DEFAULT_CURRENT_SCREEN)) != -1)
setCurrentScreen(preferences.getUInt("currentScreen", DEFAULT_CURRENT_SCREEN));
} }
void setupTimeUpdateTimer(void *pvParameters) { void setupTimeUpdateTimer(void *pvParameters) {

2
src/lib/v2_notify.cpp
View file

@ -15,7 +15,7 @@ void setupV2Notify()
webSocket.onEvent(onWebsocketV2Event); webSocket.onEvent(onWebsocketV2Event);
webSocket.setReconnectInterval(5000); webSocket.setReconnectInterval(5000);
webSocket.enableHeartbeat(15000, 3000, 2); webSocket.enableHeartbeat(15000, 3000, 2);
setupV2NotifyTask(); setupV2NotifyTask();
} }