Upgrade ArduinoJson to version 7, add Block Fee Rate screen
This commit is contained in:
parent
c49b8edcb8
commit
2ca85ff479
17 changed files with 128 additions and 43 deletions
|
@ -22,26 +22,28 @@ const PROGMEM int SCREEN_BTC_TICKER = 2;
|
|||
const PROGMEM int SCREEN_TIME = 3;
|
||||
const PROGMEM int SCREEN_HALVING_COUNTDOWN = 4;
|
||||
const PROGMEM int SCREEN_MARKET_CAP = 5;
|
||||
const PROGMEM int SCREEN_BLOCK_FEE_RATE = 6;
|
||||
|
||||
const PROGMEM int SCREEN_COUNTDOWN = 98;
|
||||
const PROGMEM int SCREEN_CUSTOM = 99;
|
||||
const int SCREEN_COUNT = 6;
|
||||
const int SCREEN_COUNT = 7;
|
||||
const PROGMEM int screens[SCREEN_COUNT] = {
|
||||
SCREEN_BLOCK_HEIGHT, SCREEN_MSCW_TIME, SCREEN_BTC_TICKER,
|
||||
SCREEN_TIME, SCREEN_HALVING_COUNTDOWN, SCREEN_MARKET_CAP};
|
||||
SCREEN_TIME, SCREEN_HALVING_COUNTDOWN, SCREEN_MARKET_CAP,
|
||||
SCREEN_BLOCK_FEE_RATE};
|
||||
const int usPerSecond = 1000000;
|
||||
const int usPerMinute = 60 * usPerSecond;
|
||||
|
||||
struct SpiRamAllocator {
|
||||
void *allocate(size_t size) {
|
||||
struct SpiRamAllocator : ArduinoJson::Allocator {
|
||||
void* allocate(size_t size) override {
|
||||
return heap_caps_malloc(size, MALLOC_CAP_SPIRAM);
|
||||
}
|
||||
|
||||
void deallocate(void *pointer) { heap_caps_free(pointer); }
|
||||
void deallocate(void* pointer) override {
|
||||
heap_caps_free(pointer);
|
||||
}
|
||||
|
||||
void *reallocate(void *ptr, size_t new_size) {
|
||||
void* reallocate(void* ptr, size_t new_size) override {
|
||||
return heap_caps_realloc(ptr, new_size, MALLOC_CAP_SPIRAM);
|
||||
}
|
||||
};
|
||||
|
||||
using SpiRamJsonDocument = BasicJsonDocument<SpiRamAllocator>;
|
||||
};
|
Loading…
Add table
Add a link
Reference in a new issue