jeans/openHASP
jeans/openHASP
1
0
Fork 0
mirror of https://github.com/HASwitchPlate/openHASP.git synced 2025-07-26 20:56:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Switch to LittleFS

Browse Source
This commit is contained in:
fvanroie 2021-01-20 18:46:07 +01:00
parent 8adc9ca93f
commit 199dff2c49
2 changed files with 86 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/lv_fs_if/lv_fs_spiffs.cpp
View File

@ -17,22 +17,19 @@
#if defined(ARDUINO_ARCH_ESP32)
#if HASP_USE_SPIFFS > 0
#include "SPIFFS.h"
#define LV_FS_SPIFFS SPIFFS
#elif HASP_USE_LITTLEFS > 0
#include "LITTLEFS.h"
#define LV_FS_SPIFFS LITTLEFS
#endif
#elif defined(ARDUINO_ARCH_ESP8266)
// included by default
#include "LittleFS.h"
#define LV_FS_SPIFFS LittleFS
#endif // ARDUINO_ARCH
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
#include <FS.h>
#include <Esp.h>
#if HASP_USE_SPIFFS > 0
#define LV_FS_SPIFFS SPIFFS
#elif HASP_USE_LITTLEFS > 0
#define LV_FS_SPIFFS LITTLEFS
#endif // HASP_USE
#endif // ARDUINO_ARCH
#define TAG_LVFS 91

76
lib/lv_lib_zifont/lv_zifont.cpp
View File

@ -7,22 +7,19 @@
#if defined(ARDUINO_ARCH_ESP32)
#if HASP_USE_SPIFFS > 0
#include "SPIFFS.h"
#define FS SPIFFS
#elif HASP_USE_LITTLEFS > 0
#include "LITTLEFS.h"
#define FS LITTLEFS
#endif
#elif defined(ARDUINO_ARCH_ESP8266)
// included by default
#include "LittleFS.h"
#define FS LittleFS
#endif // ARDUINO_ARCH
#if defined(ARDUINO_ARCH_ESP8266) || defined(ARDUINO_ARCH_ESP32)
#include <FS.h>
#include <Esp.h>
#if HASP_USE_SPIFFS > 0
#define FS SPIFFS
#elif HASP_USE_LITTLEFS > 0
#define FS LITTLEFS
#endif // HASP_USE
#endif // ARDUINO_ARCH
#include "lvgl.h"
@ -82,7 +79,7 @@ static uint8_t * charBitmap_p;
* GLOBAL FUNCTIONS
**********************/
static void IRAM_ATTR blackAdd(uint8_t * charBitmap_p, uint16_t pos);
// static void IRAM_ATTR blackAdd(uint8_t * charBitmap_p, uint16_t pos);
static void IRAM_ATTR colorsAdd(uint8_t * charBitmap_p, uint8_t color1, uint16_t pos);
// static uint16_t unicode2codepoint(uint32_t unicode, uint8_t codepage);
// static void printBuffer(uint8_t * charBitmap_p, uint8_t w, uint8_t h);
@ -362,7 +359,7 @@ const uint8_t * IRAM_ATTR lv_font_get_bitmap_fmt_zifont(const lv_font_t * font,
uint16_t fileindex = 0;
uint16_t arrindex = 0;
int k, len = 1; // enter while loop
uint8_t color1, color2;
uint8_t b, repeats, color1, color2;
// while((fileindex < charInfo->length) && len > 0) { //} && !feof(file)) {
while((arrindex < size * 2) && (len > 0)) { // read untill the bitmap is full, no need for datalength
@ -374,43 +371,50 @@ const uint8_t * IRAM_ATTR lv_font_get_bitmap_fmt_zifont(const lv_font_t * font,
fileindex += len;
for(k = 0; k < len; k++) {
uint8_t b = data[k];
b = data[k];
// Serial.printf("%d - %d > %x = %x arrindex:%d\n", fileindex, arrindex, b, ch[0], ftell(file));
uint8_t repeats = b & 0b00011111; /* last 5 bits indicate repetition as the same color */
repeats = b & 0b00011111; /* last 5 bits indicate repetition as the same color */
switch(b >> 5) {
case(0b000):
arrindex += repeats; // repeats are white
break;
case(0b001):
for(int i = 0; i < repeats; i++) { // repeats are black
blackAdd(charBitmap_p, arrindex++);
if(arrindex & 0x1) {
colorsAdd(charBitmap_p, ColorBlack, arrindex++);
repeats--;
}
for(; repeats >= 2; repeats -= 2) { // repeats are black
// colorsAdd(charBitmap_p, ColorBlack, arrindex++);
charBitmap_p[arrindex >> 1] = 0xff;
arrindex += 2;
}
if(repeats & 0x1) colorsAdd(charBitmap_p, ColorBlack, arrindex++);
break;
case(0b010):
arrindex += repeats; // repeats are white
blackAdd(charBitmap_p, arrindex++);
colorsAdd(charBitmap_p, ColorBlack, arrindex++);
break;
case(0b011):
arrindex += repeats; // repeats are white
blackAdd(charBitmap_p, arrindex++);
blackAdd(charBitmap_p, arrindex++);
colorsAdd(charBitmap_p, ColorBlack, arrindex++);
colorsAdd(charBitmap_p, ColorBlack, arrindex++);
break;
case(0b100):
case(0b101):
repeats = (uint8_t)((b & (0b111000)) >> 3); /* 3 bits indicate repetition as the same color */
color1 = (uint8_t)(b & (0b0111));
repeats = (b & (0b111000)) >> 3; // 3 bits indicate repetition as the same color
color1 = (b & (0b000111)) << 1; // << 1 to get 4bpp
arrindex += repeats;
colorsAdd(charBitmap_p, color1, arrindex++);
break;
default:
color1 = (b & 0b111000) >> 3;
color2 = b & 0b000111;
color1 = (b & 0b111000) >> 2; // >> 3 first and then << 1 to get 4bpp
color2 = (b & 0b000111) << 1; // << 1 to get 4bpp
colorsAdd(charBitmap_p, color1, arrindex++);
colorsAdd(charBitmap_p, color2, arrindex++);
}
@ -535,28 +539,26 @@ bool IRAM_ATTR lv_font_get_glyph_dsc_fmt_zifont(const lv_font_t * font, lv_font_
return true;
}
static void IRAM_ATTR blackAdd(uint8_t * charBitmap_p, uint16_t pos)
{
uint8_t col = pos & 0x0001; // remainder
uint16_t map_p = pos >> 1; // devide by 2
// static void IRAM_ATTR blackAdd(uint8_t * charBitmap_p, uint16_t pos)
// {
// // uint8_t col = pos & 0x0001; // remainder
// uint16_t map_p = pos >> 1; // devide by 2
if(col == 0) {
charBitmap_p[map_p] = 0xf0;
} else {
charBitmap_p[map_p] |= ColorBlack;
}
}
// if(pos & 0x1)
// charBitmap_p[map_p] |= ColorBlack;
// else
// charBitmap_p[map_p] = 0xf0;
// }
static inline void IRAM_ATTR colorsAdd(uint8_t * charBitmap_p, uint8_t color1, uint16_t pos)
{
uint32_t col = pos & 0x0001; // remainder
uint32_t map_p = pos >> 1; // devide by 2
// uint32_t col = pos & 0x0001; // remainder
uint16_t map_p = pos >> 1; // devide by 2
if(col == 0) {
charBitmap_p[map_p] = color1 << 5;
} else {
charBitmap_p[map_p] |= color1 << 1;
}
if(pos & 0x1)
charBitmap_p[map_p] |= color1;
else
charBitmap_p[map_p] = color1 << 4;
}
/*