Compare commits
40
Commits
master
..
1bd718fad9
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
1bd718fad9 | ||
|
|
61cb4946d6 | ||
|
|
4e352b9894 | ||
|
|
4e156e1617 | ||
|
|
3e0ba4488b | ||
|
|
e42503f1a4 | ||
|
|
c812091a4a | ||
|
|
beb4e82c9c | ||
|
|
a242397fa0 | ||
|
|
1511ab35d5 | ||
|
|
57c389c0b6 | ||
|
|
06ff5aa44a | ||
|
|
526cf1b6f9 | ||
|
|
6648a980cb | ||
|
|
e567620003 | ||
|
|
0b575d1965 | ||
|
|
4f55444f67 | ||
|
|
4a17d21d80 | ||
|
|
1c63847631 | ||
|
|
4a5b45409f | ||
|
|
e103cdfd11 | ||
|
|
cef0d267b7 | ||
|
|
9f3dddabe6 | ||
|
|
350fc8472a | ||
|
|
79ef9d6a35 | ||
|
|
0036a220be | ||
|
|
8ad538c98b | ||
|
|
f1b5da25b0 | ||
|
|
d739827db2 | ||
|
|
9176e76f5a | ||
|
|
7294610894 | ||
|
|
a51098725d | ||
|
|
6acecd8ea6 | ||
|
|
9b7b9e9094 | ||
|
|
204aff6be6 | ||
|
|
28d8ad565f | ||
|
|
ed6690c0cc | ||
|
|
1bc154da8b | ||
|
|
c308520f9c | ||
|
|
38ad4f9036 |
No files matched your search
+4
-3
@@ -1,3 +1,4 @@
|
|||||||
[submodule "open-x4-sdk"]
|
[submodule "freeink-sdk"]
|
||||||
path = open-x4-sdk
|
path = freeink-sdk
|
||||||
url = https://github.com/crosspoint-reader/community-sdk.git
|
url = https://github.com/Free-Ink/freeink-sdk.git
|
||||||
|
branch = main
|
||||||
+10
-36
@@ -122,43 +122,19 @@ A **Wi-Fi signal strength indicator** (dBm) is displayed on-screen during joined
|
|||||||
|
|
||||||
CrossPoint supports sending books from Calibre using the CrossPoint Reader device plugin.
|
CrossPoint supports sending books from Calibre using the CrossPoint Reader device plugin.
|
||||||
|
|
||||||
#### Installing the Plugin in Calibre
|
1. Install the plugin in Calibre:
|
||||||
|
|
||||||
|
- Head to https://github.com/crosspoint-reader/calibre-plugins/releases to download the latest version of the crosspoint_reader plugin.
|
||||||
|
|
||||||
|
- Download the zip file.
|
||||||
|
|
||||||
|
- Open Calibre → Preferences → Plugins → Load plugin from file → Select the zip file.
|
||||||
|
|
||||||
If you don't already have the plugin installed:
|
2. On the device: File Transfer -> Calibre Wireless, then join a network.
|
||||||
|
|
||||||
1. Head to https://github.com/crosspoint-reader/calibre-plugins/releases to download the latest version of the crosspoint_reader plugin.
|
3. Make sure your computer is on the same Wi-Fi network.
|
||||||
2. Download the zip file.
|
|
||||||
3. Open Calibre → Preferences → Plugins → Load plugin from file → Select the zip file.
|
|
||||||
4. Restart Calibre.
|
|
||||||
|
|
||||||
#### Configuring the CrossPoint Plugin in Calibre
|
4. In Calibre, click "Send to device" to transfer books.
|
||||||
1. In Calibre select Preferences.
|
|
||||||
2. In the Preferences dialog select Plugins.
|
|
||||||
3. In Plugins search for "crosspoint".
|
|
||||||
4. Click on "Customize plugin".
|
|
||||||
5. Update the value for "Host" to match the IP for your device.
|
|
||||||
6. Leave the other settings as they are.
|
|
||||||
7. [optional] Modify the "Upload path" to point to a subfolder other than the root "/" folder. Enter this as a path relative to the root folder. Example: `/mybooks`
|
|
||||||
8. Restart Calibre.
|
|
||||||
|
|
||||||
<img width="420" height="385" alt="Image" src="https://github.com/user-attachments/assets/01fc7e33-a9a7-48ba-9e26-2e68d1f9daec" />
|
|
||||||
|
|
||||||
#### Uploading Books
|
|
||||||
|
|
||||||
To upload a book using the CrossPoint plugin in Calibre:
|
|
||||||
|
|
||||||
1. On the device: File Transfer -> Calibre Wireless, then join a network.
|
|
||||||
2. Select one or more books.
|
|
||||||
3. Right-click on that selection.
|
|
||||||
4. Select "Send to Device" > "Send to main memory"
|
|
||||||
|
|
||||||
The CrossPoint plugin will connect to your device, create a folder for the book's author in the root folder (or the folder you configured for the plugin), then copy the book into that folder.
|
|
||||||
|
|
||||||
<img width="783" height="310" alt="Image" src="https://github.com/user-attachments/assets/741b0909-2e1d-4f16-8af0-2c43fbda5ce6" />
|
|
||||||
|
|
||||||
#### Removing a Book
|
|
||||||
|
|
||||||
Books cannot be removed from your device through Calibre. Use the web interface instead.
|
|
||||||
|
|
||||||
### 3.6 Settings
|
### 3.6 Settings
|
||||||
|
|
||||||
@@ -551,8 +527,6 @@ On the **Xteink X3**, the gyroscope can be used to turn pages by tilting the dev
|
|||||||
|
|
||||||
When reading an EPUB that contains footnotes, you can navigate to the footnote text by selecting the footnote reference in the book. From the footnote, you can return to your original reading position.
|
When reading an EPUB that contains footnotes, you can navigate to the footnote text by selecting the footnote reference in the book. From the footnote, you can return to your original reading position.
|
||||||
|
|
||||||
If the device goes to sleep or you close the book while viewing a footnote, the book reopens to your original reading position, not the footnote.
|
|
||||||
|
|
||||||
### System Navigation
|
### System Navigation
|
||||||
|
|
||||||
* **Return to Home:** Press the **Back** button to close the book and return to the **[Home](#31-home-screen)** screen.
|
* **Return to Home:** Press the **Back** button to close the book and return to the **[Home](#31-home-screen)** screen.
|
||||||
|
|||||||
Submodule
+1
Submodule freeink-sdk added at c3b3ab3d11.
@@ -19,26 +19,6 @@ const SdCardFontFileInfo* SdCardFontFamilyInfo::findClosestReaderSize(const uint
|
|||||||
const uint8_t style) const {
|
const uint8_t style) const {
|
||||||
if (files.empty()) return nullptr;
|
if (files.empty()) return nullptr;
|
||||||
|
|
||||||
// Collect sizes matching the requested style, sorted ascending.
|
|
||||||
std::vector<uint8_t> sizes;
|
|
||||||
for (const auto& f : files) {
|
|
||||||
if (f.style != style) continue;
|
|
||||||
sizes.push_back(f.pointSize);
|
|
||||||
}
|
|
||||||
if (sizes.empty()) return nullptr;
|
|
||||||
std::sort(sizes.begin(), sizes.end());
|
|
||||||
|
|
||||||
// When the family provides at least 4 sizes, use ordinal (index-based)
|
|
||||||
// selection so custom-built font sets (e.g. 10/12/14/16) map SMALL to
|
|
||||||
// the smallest file, not to a hardcoded 12pt target.
|
|
||||||
if (sizes.size() >= 4) {
|
|
||||||
uint8_t idx = fontSizeEnum;
|
|
||||||
if (idx >= sizes.size()) idx = sizes.size() - 1;
|
|
||||||
return findFile(sizes[idx], style);
|
|
||||||
}
|
|
||||||
|
|
||||||
// Fewer sizes than enum slots (e.g. CJK packs with only 2-3 sizes):
|
|
||||||
// fall back to closest-match against the built-in reader targets.
|
|
||||||
uint8_t target = 14;
|
uint8_t target = 14;
|
||||||
switch (fontSizeEnum) {
|
switch (fontSizeEnum) {
|
||||||
case 0:
|
case 0:
|
||||||
|
|||||||
@@ -37,3 +37,5 @@
|
|||||||
#include <builtinFonts/ubuntu_10_regular.h>
|
#include <builtinFonts/ubuntu_10_regular.h>
|
||||||
#include <builtinFonts/ubuntu_12_bold.h>
|
#include <builtinFonts/ubuntu_12_bold.h>
|
||||||
#include <builtinFonts/ubuntu_12_regular.h>
|
#include <builtinFonts/ubuntu_12_regular.h>
|
||||||
|
#include <builtinFonts/ubuntu_14_bold.h>
|
||||||
|
#include <builtinFonts/ubuntu_14_regular.h>
|
||||||
File diff suppressed because it is too large.
Load diff
File diff suppressed because it is too large.
Load diff
@@ -94,6 +94,13 @@ ruby -rdigest -e 'puts [
|
|||||||
].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
|
].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
|
||||||
))"
|
))"
|
||||||
|
|
||||||
|
echo "#define UI_14_FONT_ID ($(
|
||||||
|
ruby -rdigest -e 'puts [
|
||||||
|
"./ubuntu_14_regular.h",
|
||||||
|
"./ubuntu_14_bold.h",
|
||||||
|
].map{|f| Digest::SHA256.hexdigest(File.read(f)).to_i(16) }.sum % (2 ** 32) - (2 ** 31)'
|
||||||
|
))"
|
||||||
|
|
||||||
echo "#define SMALL_FONT_ID ($(
|
echo "#define SMALL_FONT_ID ($(
|
||||||
ruby -rdigest -e 'puts [
|
ruby -rdigest -e 'puts [
|
||||||
"./notosans_8_regular.h",
|
"./notosans_8_regular.h",
|
||||||
|
|||||||
@@ -28,23 +28,42 @@ for size in ${NOTOSANS_FONT_SIZES[@]}; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Small UI chrome (button devices, uiScale 1.0). Rendered 1-bit: crisp at these
|
||||||
|
# sizes and half the flash of 2-bit.
|
||||||
UI_FONT_SIZES=(10 12)
|
UI_FONT_SIZES=(10 12)
|
||||||
|
# Larger UI chrome substituted in on touch/high-density boards via the uiScale
|
||||||
|
# remap (see src/main.cpp setupFonts). Rendered 2-bit so it stays smooth when
|
||||||
|
# enlarged. Touch boards use uiScale 1.2, so UI_12 -> 14.4 -> 14 is the size the
|
||||||
|
# remap actually lands on; add larger sizes here if a board adopts a higher scale.
|
||||||
|
UI_FONT_SIZES_LARGE=(14)
|
||||||
UI_FONT_STYLES=("Regular" "Bold")
|
UI_FONT_STYLES=("Regular" "Bold")
|
||||||
|
|
||||||
|
# Ubuntu lacks the Latin Extended Additional block (U+1EA0-U+1EF9) used for
|
||||||
|
# Vietnamese tone marks. Append a Vietnamese-only Ubuntu cut so those glyphs are
|
||||||
|
# filled from it while every glyph Ubuntu already has stays unchanged (fontstack
|
||||||
|
# is ordered by descending priority). NotoSansHebrew fills U+05D0-U+05EA so the
|
||||||
|
# Hebrew UI translation renders in menus and settings.
|
||||||
|
generate_ui_font() {
|
||||||
|
local size="$1" style="$2" extra_flags="$3"
|
||||||
|
local font_name="ubuntu_${size}_$(echo $style | tr '[:upper:]' '[:lower:]')"
|
||||||
|
local font_path="../builtinFonts/source/Ubuntu/Ubuntu-${style}.ttf"
|
||||||
|
local hebrew_path="../builtinFonts/source/NotoSansHebrew/NotoSansHebrew-${style}.ttf"
|
||||||
|
local viet_path="../builtinFonts/source/Ubuntu/Ubuntu-Vietnamese-${style}.ttf"
|
||||||
|
local output_path="../builtinFonts/${font_name}.h"
|
||||||
|
python fontconvert.py $font_name $size $font_path $hebrew_path $viet_path \
|
||||||
|
--additional-intervals 0x05D0,0x05EA $extra_flags > $output_path
|
||||||
|
echo "Generated $output_path"
|
||||||
|
}
|
||||||
|
|
||||||
for size in ${UI_FONT_SIZES[@]}; do
|
for size in ${UI_FONT_SIZES[@]}; do
|
||||||
for style in ${UI_FONT_STYLES[@]}; do
|
for style in ${UI_FONT_STYLES[@]}; do
|
||||||
font_name="ubuntu_${size}_$(echo $style | tr '[:upper:]' '[:lower:]')"
|
generate_ui_font $size $style ""
|
||||||
font_path="../builtinFonts/source/Ubuntu/Ubuntu-${style}.ttf"
|
done
|
||||||
hebrew_path="../builtinFonts/source/NotoSansHebrew/NotoSansHebrew-${style}.ttf"
|
done
|
||||||
# Ubuntu lacks the Latin Extended Additional block (U+1EA0-U+1EF9) used for
|
|
||||||
# Vietnamese tone marks. Append a Vietnamese-only Ubuntu cut so those glyphs
|
for size in ${UI_FONT_SIZES_LARGE[@]}; do
|
||||||
# are filled from it while every glyph Ubuntu already has stays unchanged
|
for style in ${UI_FONT_STYLES[@]}; do
|
||||||
# (fontstack is ordered by descending priority).
|
generate_ui_font $size $style "--2bit --compress"
|
||||||
viet_path="../builtinFonts/source/Ubuntu/Ubuntu-Vietnamese-${style}.ttf"
|
|
||||||
output_path="../builtinFonts/${font_name}.h"
|
|
||||||
python fontconvert.py $font_name $size $font_path $hebrew_path $viet_path \
|
|
||||||
--additional-intervals 0x05D0,0x05EA > $output_path
|
|
||||||
echo "Generated $output_path"
|
|
||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
|||||||
@@ -40,8 +40,7 @@ INTERVAL_PRESETS = {
|
|||||||
"ascii": [(0x0020, 0x007E)],
|
"ascii": [(0x0020, 0x007E)],
|
||||||
"latin1": [(0x0080, 0x00FF)],
|
"latin1": [(0x0080, 0x00FF)],
|
||||||
"latin-ext": [(0x0020, 0x007E), (0x0080, 0x00FF), (0x0100, 0x024F),
|
"latin-ext": [(0x0020, 0x007E), (0x0080, 0x00FF), (0x0100, 0x024F),
|
||||||
(0x02B0, 0x02FF), (0x1E00, 0x1EFF), (0x2000, 0x206F),
|
(0x1E00, 0x1EFF), (0x2000, 0x206F), (0xFB00, 0xFB06)],
|
||||||
(0xFB00, 0xFB06)],
|
|
||||||
"greek": [(0x0370, 0x03FF), (0x1F00, 0x1FFF)],
|
"greek": [(0x0370, 0x03FF), (0x1F00, 0x1FFF)],
|
||||||
"cyrillic": [(0x0400, 0x04FF), (0x0500, 0x052F)],
|
"cyrillic": [(0x0400, 0x04FF), (0x0500, 0x052F)],
|
||||||
"hebrew": [(0x0590, 0x05FF), (0xFB1D, 0xFB4F)],
|
"hebrew": [(0x0590, 0x05FF), (0xFB1D, 0xFB4F)],
|
||||||
@@ -63,7 +62,7 @@ INTERVAL_PRESETS = {
|
|||||||
# Composite preset for English-language literary fiction including scifi/popsci.
|
# Composite preset for English-language literary fiction including scifi/popsci.
|
||||||
# Greek for physics terms, math operators, geometric shapes, uncommon
|
# Greek for physics terms, math operators, geometric shapes, uncommon
|
||||||
# dialogue punctuation, CJK quote marks, miscellaneous symbols (♪♫♬), dingbats.
|
# dialogue punctuation, CJK quote marks, miscellaneous symbols (♪♫♬), dingbats.
|
||||||
"reading": [(0x0020, 0x024F), (0x02B0, 0x02FF), (0x0300, 0x036F), (0x0370, 0x03FF),
|
"reading": [(0x0020, 0x024F), (0x0300, 0x036F), (0x0370, 0x03FF),
|
||||||
(0x0400, 0x04FF), (0x1E00, 0x1EFF), (0x2000, 0x206F),
|
(0x0400, 0x04FF), (0x1E00, 0x1EFF), (0x2000, 0x206F),
|
||||||
(0x2070, 0x209F), (0x20A0, 0x20CF), (0x2150, 0x218F),
|
(0x2070, 0x209F), (0x20A0, 0x20CF), (0x2150, 0x218F),
|
||||||
(0x2190, 0x21FF), (0x2200, 0x22FF), (0x2500, 0x257F),
|
(0x2190, 0x21FF), (0x2200, 0x22FF), (0x2500, 0x257F),
|
||||||
|
|||||||
@@ -132,16 +132,7 @@ families:
|
|||||||
bold: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-Bold.ttf"}
|
bold: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-Bold.ttf"}
|
||||||
italic: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-Italic.ttf"}
|
italic: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-Italic.ttf"}
|
||||||
bolditalic: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-BoldItalic.ttf"}
|
bolditalic: {url: "https://raw.githubusercontent.com/impallari/Libre-Baskerville/master/fonts/ttf/LibreBaskerville-BoldItalic.ttf"}
|
||||||
|
|
||||||
- name: Vollkorn
|
|
||||||
description: "A serif for bread and butter use by Friedrich Althausen (Latin, Greek, Cyrillic)"
|
|
||||||
intervals: latin-ext,greek,cyrillic
|
|
||||||
sizes: [12, 14, 16, 18]
|
|
||||||
styles:
|
|
||||||
regular: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/vollkorn/Vollkorn%5Bwght%5D.ttf", variable: {wght: 400}}
|
|
||||||
bold: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/vollkorn/Vollkorn%5Bwght%5D.ttf", variable: {wght: 700}}
|
|
||||||
italic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/vollkorn/Vollkorn-Italic%5Bwght%5D.ttf", variable: {wght: 400}}
|
|
||||||
bolditalic: {url: "https://raw.githubusercontent.com/google/fonts/main/ofl/vollkorn/Vollkorn-Italic%5Bwght%5D.ttf", variable: {wght: 700}}
|
|
||||||
|
|
||||||
# ── Sans-serif ─────────────────────────────────────────────────────────
|
# ── Sans-serif ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
|
|||||||
@@ -14,8 +14,47 @@ constexpr uint8_t BOOK_CACHE_VERSION = 8; // v8: TOC/book titles stored NFC-com
|
|||||||
constexpr char bookBinFile[] = "/book.bin";
|
constexpr char bookBinFile[] = "/book.bin";
|
||||||
constexpr char tmpSpineBinFile[] = "/spine.bin.tmp";
|
constexpr char tmpSpineBinFile[] = "/spine.bin.tmp";
|
||||||
constexpr char tmpTocBinFile[] = "/toc.bin.tmp";
|
constexpr char tmpTocBinFile[] = "/toc.bin.tmp";
|
||||||
|
constexpr uint32_t MAX_CACHE_STRING_LEN = 4096;
|
||||||
|
|
||||||
|
bool readStringBounded(HalFile& file, std::string& out, const uint32_t maxLen = MAX_CACHE_STRING_LEN) {
|
||||||
|
uint32_t len = 0;
|
||||||
|
if (file.read(&len, sizeof(len)) != static_cast<int>(sizeof(len))) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
if (len > maxLen || len > static_cast<uint32_t>(file.available())) {
|
||||||
|
LOG_ERR("BMC", "Invalid cache string length: %lu (max=%lu available=%d)", static_cast<unsigned long>(len),
|
||||||
|
static_cast<unsigned long>(maxLen), file.available());
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
out.clear();
|
||||||
|
if (len == 0) {
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
out.resize(len);
|
||||||
|
return file.read(out.data(), len) == static_cast<int>(len);
|
||||||
|
}
|
||||||
|
|
||||||
|
class CacheIoLock {
|
||||||
|
public:
|
||||||
|
explicit CacheIoLock(SemaphoreHandle_t mutex) : mutex(mutex) {
|
||||||
|
if (mutex) xSemaphoreTakeRecursive(mutex, portMAX_DELAY);
|
||||||
|
}
|
||||||
|
~CacheIoLock() {
|
||||||
|
if (mutex) xSemaphoreGiveRecursive(mutex);
|
||||||
|
}
|
||||||
|
|
||||||
|
private:
|
||||||
|
SemaphoreHandle_t mutex;
|
||||||
|
};
|
||||||
} // namespace
|
} // namespace
|
||||||
|
|
||||||
|
BookMetadataCache::~BookMetadataCache() {
|
||||||
|
if (ioMutex) {
|
||||||
|
vSemaphoreDelete(ioMutex);
|
||||||
|
ioMutex = nullptr;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* ============= WRITING / BUILDING FUNCTIONS ================ */
|
/* ============= WRITING / BUILDING FUNCTIONS ================ */
|
||||||
|
|
||||||
bool BookMetadataCache::beginWrite() {
|
bool BookMetadataCache::beginWrite() {
|
||||||
@@ -375,6 +414,7 @@ void BookMetadataCache::createTocEntry(const std::string& title, const std::stri
|
|||||||
/* ============= READING / LOADING FUNCTIONS ================ */
|
/* ============= READING / LOADING FUNCTIONS ================ */
|
||||||
|
|
||||||
bool BookMetadataCache::load() {
|
bool BookMetadataCache::load() {
|
||||||
|
CacheIoLock ioLock(ioMutex);
|
||||||
if (!Storage.openFileForRead("BMC", cachePath + bookBinFile, bookFile)) {
|
if (!Storage.openFileForRead("BMC", cachePath + bookBinFile, bookFile)) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
@@ -392,11 +432,13 @@ bool BookMetadataCache::load() {
|
|||||||
serialization::readPod(bookFile, spineCount);
|
serialization::readPod(bookFile, spineCount);
|
||||||
serialization::readPod(bookFile, tocCount);
|
serialization::readPod(bookFile, tocCount);
|
||||||
|
|
||||||
serialization::readString(bookFile, coreMetadata.title);
|
if (!readStringBounded(bookFile, coreMetadata.title) || !readStringBounded(bookFile, coreMetadata.author) ||
|
||||||
serialization::readString(bookFile, coreMetadata.author);
|
!readStringBounded(bookFile, coreMetadata.language) || !readStringBounded(bookFile, coreMetadata.coverItemHref) ||
|
||||||
serialization::readString(bookFile, coreMetadata.language);
|
!readStringBounded(bookFile, coreMetadata.textReferenceHref)) {
|
||||||
serialization::readString(bookFile, coreMetadata.coverItemHref);
|
LOG_ERR("BMC", "Invalid cache metadata strings");
|
||||||
serialization::readString(bookFile, coreMetadata.textReferenceHref);
|
bookFile.close();
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
loaded = true;
|
loaded = true;
|
||||||
LOG_DBG("BMC", "Loaded cache data: %d spine, %d TOC entries", spineCount, tocCount);
|
LOG_DBG("BMC", "Loaded cache data: %d spine, %d TOC entries", spineCount, tocCount);
|
||||||
@@ -404,6 +446,7 @@ bool BookMetadataCache::load() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
BookMetadataCache::SpineEntry BookMetadataCache::getSpineEntry(const int index) {
|
BookMetadataCache::SpineEntry BookMetadataCache::getSpineEntry(const int index) {
|
||||||
|
CacheIoLock ioLock(ioMutex);
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
LOG_ERR("BMC", "getSpineEntry called but cache not loaded");
|
LOG_ERR("BMC", "getSpineEntry called but cache not loaded");
|
||||||
return {};
|
return {};
|
||||||
@@ -418,11 +461,16 @@ BookMetadataCache::SpineEntry BookMetadataCache::getSpineEntry(const int index)
|
|||||||
bookFile.seek(lutOffset + sizeof(uint32_t) * index);
|
bookFile.seek(lutOffset + sizeof(uint32_t) * index);
|
||||||
uint32_t spineEntryPos;
|
uint32_t spineEntryPos;
|
||||||
serialization::readPod(bookFile, spineEntryPos);
|
serialization::readPod(bookFile, spineEntryPos);
|
||||||
|
if (spineEntryPos >= bookFile.size()) {
|
||||||
|
LOG_ERR("BMC", "Spine entry offset out of range: %lu", static_cast<unsigned long>(spineEntryPos));
|
||||||
|
return {};
|
||||||
|
}
|
||||||
bookFile.seek(spineEntryPos);
|
bookFile.seek(spineEntryPos);
|
||||||
return readSpineEntry(bookFile);
|
return readSpineEntry(bookFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
BookMetadataCache::TocEntry BookMetadataCache::getTocEntry(const int index) {
|
BookMetadataCache::TocEntry BookMetadataCache::getTocEntry(const int index) {
|
||||||
|
CacheIoLock ioLock(ioMutex);
|
||||||
if (!loaded) {
|
if (!loaded) {
|
||||||
LOG_ERR("BMC", "getTocEntry called but cache not loaded");
|
LOG_ERR("BMC", "getTocEntry called but cache not loaded");
|
||||||
return {};
|
return {};
|
||||||
@@ -437,24 +485,34 @@ BookMetadataCache::TocEntry BookMetadataCache::getTocEntry(const int index) {
|
|||||||
bookFile.seek(lutOffset + sizeof(uint32_t) * spineCount + sizeof(uint32_t) * index);
|
bookFile.seek(lutOffset + sizeof(uint32_t) * spineCount + sizeof(uint32_t) * index);
|
||||||
uint32_t tocEntryPos;
|
uint32_t tocEntryPos;
|
||||||
serialization::readPod(bookFile, tocEntryPos);
|
serialization::readPod(bookFile, tocEntryPos);
|
||||||
|
if (tocEntryPos >= bookFile.size()) {
|
||||||
|
LOG_ERR("BMC", "TOC entry offset out of range: %lu", static_cast<unsigned long>(tocEntryPos));
|
||||||
|
return {};
|
||||||
|
}
|
||||||
bookFile.seek(tocEntryPos);
|
bookFile.seek(tocEntryPos);
|
||||||
return readTocEntry(bookFile);
|
return readTocEntry(bookFile);
|
||||||
}
|
}
|
||||||
|
|
||||||
BookMetadataCache::SpineEntry BookMetadataCache::readSpineEntry(HalFile& file) const {
|
BookMetadataCache::SpineEntry BookMetadataCache::readSpineEntry(HalFile& file) const {
|
||||||
SpineEntry entry;
|
SpineEntry entry;
|
||||||
serialization::readString(file, entry.href);
|
if (!readStringBounded(file, entry.href) ||
|
||||||
serialization::readPod(file, entry.cumulativeSize);
|
file.read(&entry.cumulativeSize, sizeof(entry.cumulativeSize)) !=
|
||||||
serialization::readPod(file, entry.tocIndex);
|
static_cast<int>(sizeof(entry.cumulativeSize)) ||
|
||||||
|
file.read(&entry.tocIndex, sizeof(entry.tocIndex)) != static_cast<int>(sizeof(entry.tocIndex))) {
|
||||||
|
LOG_ERR("BMC", "Invalid spine cache entry");
|
||||||
|
return {};
|
||||||
|
}
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
|
|
||||||
BookMetadataCache::TocEntry BookMetadataCache::readTocEntry(HalFile& file) const {
|
BookMetadataCache::TocEntry BookMetadataCache::readTocEntry(HalFile& file) const {
|
||||||
TocEntry entry;
|
TocEntry entry;
|
||||||
serialization::readString(file, entry.title);
|
if (!readStringBounded(file, entry.title) || !readStringBounded(file, entry.href) ||
|
||||||
serialization::readString(file, entry.href);
|
!readStringBounded(file, entry.anchor) ||
|
||||||
serialization::readString(file, entry.anchor);
|
file.read(&entry.level, sizeof(entry.level)) != static_cast<int>(sizeof(entry.level)) ||
|
||||||
serialization::readPod(file, entry.level);
|
file.read(&entry.spineIndex, sizeof(entry.spineIndex)) != static_cast<int>(sizeof(entry.spineIndex))) {
|
||||||
serialization::readPod(file, entry.spineIndex);
|
LOG_ERR("BMC", "Invalid TOC cache entry");
|
||||||
|
return {};
|
||||||
|
}
|
||||||
return entry;
|
return entry;
|
||||||
}
|
}
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <HalStorage.h>
|
#include <HalStorage.h>
|
||||||
|
#include <freertos/semphr.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <deque>
|
#include <deque>
|
||||||
@@ -54,6 +55,7 @@ class BookMetadataCache {
|
|||||||
// Temp file handles during build
|
// Temp file handles during build
|
||||||
HalFile spineFile;
|
HalFile spineFile;
|
||||||
HalFile tocFile;
|
HalFile tocFile;
|
||||||
|
SemaphoreHandle_t ioMutex;
|
||||||
|
|
||||||
// Index for fast href→spineIndex lookup (used only for large EPUBs)
|
// Index for fast href→spineIndex lookup (used only for large EPUBs)
|
||||||
struct SpineHrefIndexEntry {
|
struct SpineHrefIndexEntry {
|
||||||
@@ -85,8 +87,14 @@ class BookMetadataCache {
|
|||||||
BookMetadata coreMetadata;
|
BookMetadata coreMetadata;
|
||||||
|
|
||||||
explicit BookMetadataCache(std::string cachePath)
|
explicit BookMetadataCache(std::string cachePath)
|
||||||
: cachePath(std::move(cachePath)), lutOffset(0), spineCount(0), tocCount(0), loaded(false), buildMode(false) {}
|
: cachePath(std::move(cachePath)),
|
||||||
~BookMetadataCache() = default;
|
lutOffset(0),
|
||||||
|
spineCount(0),
|
||||||
|
tocCount(0),
|
||||||
|
loaded(false),
|
||||||
|
buildMode(false),
|
||||||
|
ioMutex(xSemaphoreCreateRecursiveMutex()) {}
|
||||||
|
~BookMetadataCache();
|
||||||
|
|
||||||
// Building phase (stream to disk immediately)
|
// Building phase (stream to disk immediately)
|
||||||
bool beginWrite();
|
bool beginWrite();
|
||||||
|
|||||||
+3
-20
@@ -6,20 +6,6 @@
|
|||||||
|
|
||||||
#include <new>
|
#include <new>
|
||||||
|
|
||||||
namespace {
|
|
||||||
|
|
||||||
template <typename Predicate>
|
|
||||||
void renderFilteredPageElements(const std::vector<std::shared_ptr<PageElement>>& elements, GfxRenderer& renderer,
|
|
||||||
const int fontId, const int xOffset, const int yOffset, Predicate&& predicate) {
|
|
||||||
for (const auto& element : elements) {
|
|
||||||
if (predicate(*element)) {
|
|
||||||
element->render(renderer, fontId, xOffset, yOffset);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
} // namespace
|
|
||||||
|
|
||||||
void PageLine::render(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) {
|
void PageLine::render(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) {
|
||||||
block->render(renderer, fontId, xPos + xOffset, yPos + yOffset);
|
block->render(renderer, fontId, xPos + xOffset, yPos + yOffset);
|
||||||
}
|
}
|
||||||
@@ -107,12 +93,9 @@ std::unique_ptr<PageHorizontalRule> PageHorizontalRule::deserialize(HalFile& fil
|
|||||||
}
|
}
|
||||||
|
|
||||||
void Page::render(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) const {
|
void Page::render(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) const {
|
||||||
renderFilteredPageElements(elements, renderer, fontId, xOffset, yOffset, [](const PageElement&) { return true; });
|
for (auto& element : elements) {
|
||||||
}
|
element->render(renderer, fontId, xOffset, yOffset);
|
||||||
|
}
|
||||||
void Page::renderImages(GfxRenderer& renderer, const int fontId, const int xOffset, const int yOffset) const {
|
|
||||||
renderFilteredPageElements(elements, renderer, fontId, xOffset, yOffset,
|
|
||||||
[](const PageElement& element) { return element.getTag() == TAG_PageImage; });
|
|
||||||
}
|
}
|
||||||
|
|
||||||
bool Page::serialize(HalFile& file) const {
|
bool Page::serialize(HalFile& file) const {
|
||||||
|
|||||||
@@ -88,7 +88,6 @@ class Page {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void render(GfxRenderer& renderer, int fontId, int xOffset, int yOffset) const;
|
void render(GfxRenderer& renderer, int fontId, int xOffset, int yOffset) const;
|
||||||
void renderImages(GfxRenderer& renderer, int fontId, int xOffset, int yOffset) const;
|
|
||||||
bool serialize(HalFile& file) const;
|
bool serialize(HalFile& file) const;
|
||||||
static std::unique_ptr<Page> deserialize(HalFile& file);
|
static std::unique_ptr<Page> deserialize(HalFile& file);
|
||||||
|
|
||||||
|
|||||||
@@ -1006,10 +1006,7 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
|
|||||||
int advance =
|
int advance =
|
||||||
renderer.getKerning(fontId, lastCodepoint(reorderedWordsScratch[wordIdx]),
|
renderer.getKerning(fontId, lastCodepoint(reorderedWordsScratch[wordIdx]),
|
||||||
firstCodepoint(reorderedWordsScratch[wordIdx + 1]), reorderedStylesScratch[wordIdx]);
|
firstCodepoint(reorderedWordsScratch[wordIdx + 1]), reorderedStylesScratch[wordIdx]);
|
||||||
// wordIdx > 0 mirrors the gap accounting above (which skips index 0): a leading
|
if (reorderedWordsScratch[wordIdx] == " " && reorderedContinuesScratch[wordIdx] &&
|
||||||
// no-break space must not receive justifyExtra, or the line over-stretches by one
|
|
||||||
// gap and the last word is pushed past the right margin (issue #2185).
|
|
||||||
if (wordIdx > 0 && reorderedWordsScratch[wordIdx] == " " && reorderedContinuesScratch[wordIdx] &&
|
|
||||||
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
||||||
advance += reorderedJustifyExtra;
|
advance += reorderedJustifyExtra;
|
||||||
}
|
}
|
||||||
@@ -1051,8 +1048,7 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
|
|||||||
// Cross-boundary kerning for continuation words
|
// Cross-boundary kerning for continuation words
|
||||||
int advance = renderer.getKerning(fontId, lastCodepoint(lineWords[wordIdx]),
|
int advance = renderer.getKerning(fontId, lastCodepoint(lineWords[wordIdx]),
|
||||||
firstCodepoint(lineWords[wordIdx + 1]), lineWordStyles[wordIdx]);
|
firstCodepoint(lineWords[wordIdx + 1]), lineWordStyles[wordIdx]);
|
||||||
// wordIdx > 0: see the LTR branch — a leading no-break space is not a justifiable gap.
|
if (lineWords[wordIdx] == " " && continuesVec[lastBreakAt + wordIdx] &&
|
||||||
if (wordIdx > 0 && lineWords[wordIdx] == " " && continuesVec[lastBreakAt + wordIdx] &&
|
|
||||||
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
||||||
advance += justifyExtra;
|
advance += justifyExtra;
|
||||||
}
|
}
|
||||||
@@ -1090,10 +1086,7 @@ void ParsedText::extractLine(const size_t breakIndex, const int pageWidth, const
|
|||||||
int advance = wordWidths[lastBreakAt + wordIdx];
|
int advance = wordWidths[lastBreakAt + wordIdx];
|
||||||
advance += renderer.getKerning(fontId, lastCodepoint(lineWords[wordIdx]),
|
advance += renderer.getKerning(fontId, lastCodepoint(lineWords[wordIdx]),
|
||||||
firstCodepoint(lineWords[wordIdx + 1]), lineWordStyles[wordIdx]);
|
firstCodepoint(lineWords[wordIdx + 1]), lineWordStyles[wordIdx]);
|
||||||
// wordIdx > 0 mirrors the gap accounting above (which skips index 0): a leading
|
if (lineWords[wordIdx] == " " && continuesVec[lastBreakAt + wordIdx] &&
|
||||||
// no-break space must not receive justifyExtra, or the line over-stretches by one
|
|
||||||
// gap and the last word is pushed past the right margin (issue #2185).
|
|
||||||
if (wordIdx > 0 && lineWords[wordIdx] == " " && continuesVec[lastBreakAt + wordIdx] &&
|
|
||||||
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
effectiveAlignment == CssTextAlign::Justify && !isLastLine) {
|
||||||
advance += justifyExtra;
|
advance += justifyExtra;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -317,14 +317,6 @@ void XMLCALL ChapterHtmlSlimParser::startElement(void* userData, const XML_Char*
|
|||||||
const bool isTocAnchor =
|
const bool isTocAnchor =
|
||||||
std::find(self->tocAnchors.begin(), self->tocAnchors.end(), idValue) != self->tocAnchors.end();
|
std::find(self->tocAnchors.begin(), self->tocAnchors.end(), idValue) != self->tocAnchors.end();
|
||||||
if (isTocAnchor || (!isNonNavigableInlineElement(name) && self->anchorData.size() < MAX_ANCHORS_PER_CHAPTER)) {
|
if (isTocAnchor || (!isNonNavigableInlineElement(name) && self->anchorData.size() < MAX_ANCHORS_PER_CHAPTER)) {
|
||||||
// Flush a displaced anchor before overwriting. Consecutive non-block elements
|
|
||||||
// (e.g. <aside id="fn1">text</aside><aside id="fn2">) with no intervening block
|
|
||||||
// never trigger startNewTextBlock, so fn1 gets silently overwritten. That leaves
|
|
||||||
// fn1 missing from the anchor map -> getPageForAnchor returns nullopt -> reader
|
|
||||||
// lands at page 0 (section start) instead of the footnote.
|
|
||||||
if (!self->pendingAnchorId.empty()) {
|
|
||||||
self->flushPendingAnchor();
|
|
||||||
}
|
|
||||||
self->pendingAnchorId = idValue;
|
self->pendingAnchorId = idValue;
|
||||||
}
|
}
|
||||||
} else if (strcmp(atts[i], "dir") == 0) {
|
} else if (strcmp(atts[i], "dir") == 0) {
|
||||||
|
|||||||
@@ -150,7 +150,6 @@ void XMLCALL ContentOpfParser::startElement(void* userData, const XML_Char* name
|
|||||||
|
|
||||||
if (self->state == IN_PACKAGE && (strcmp(name, "guide") == 0 || strcmp(name, "opf:guide") == 0)) {
|
if (self->state == IN_PACKAGE && (strcmp(name, "guide") == 0 || strcmp(name, "opf:guide") == 0)) {
|
||||||
self->state = IN_GUIDE;
|
self->state = IN_GUIDE;
|
||||||
// TODO Remove print
|
|
||||||
LOG_DBG("COF", "Entering guide state.");
|
LOG_DBG("COF", "Entering guide state.");
|
||||||
if (!Storage.openFileForRead("COF", self->cachePath + itemCacheFile, self->tempItemStore)) {
|
if (!Storage.openFileForRead("COF", self->cachePath + itemCacheFile, self->tempItemStore)) {
|
||||||
LOG_ERR("COF", "Couldn't open temp items file for reading. This is probably going to be a fatal error.");
|
LOG_ERR("COF", "Couldn't open temp items file for reading. This is probably going to be a fatal error.");
|
||||||
|
|||||||
+14
-22
@@ -3,7 +3,6 @@
|
|||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
#include <cctype>
|
#include <cctype>
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <string_view>
|
|
||||||
#include <vector>
|
#include <vector>
|
||||||
|
|
||||||
namespace FsHelpers {
|
namespace FsHelpers {
|
||||||
@@ -37,14 +36,12 @@ std::string decodeUriEscapes(const std::string& path) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
std::string normalisePath(const std::string& path) {
|
std::string normalisePath(const std::string& path) {
|
||||||
std::vector<std::string_view> components;
|
std::vector<std::string> components;
|
||||||
components.reserve(8); // Eight nested folders is more than we might expect
|
std::string component;
|
||||||
|
|
||||||
size_t start = 0;
|
for (const auto c : path) {
|
||||||
for (size_t i = 0; i <= path.length(); ++i) {
|
if (c == '/') {
|
||||||
if (i == path.length() || path[i] == '/') {
|
if (!component.empty()) {
|
||||||
if (i > start) {
|
|
||||||
std::string_view component(path.data() + start, i - start);
|
|
||||||
if (component == "..") {
|
if (component == "..") {
|
||||||
if (!components.empty()) {
|
if (!components.empty()) {
|
||||||
components.pop_back();
|
components.pop_back();
|
||||||
@@ -52,28 +49,23 @@ std::string normalisePath(const std::string& path) {
|
|||||||
} else {
|
} else {
|
||||||
components.push_back(component);
|
components.push_back(component);
|
||||||
}
|
}
|
||||||
|
component.clear();
|
||||||
}
|
}
|
||||||
start = i + 1;
|
} else {
|
||||||
|
component += c;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (components.empty()) {
|
if (!component.empty()) {
|
||||||
return "";
|
components.push_back(component);
|
||||||
}
|
|
||||||
|
|
||||||
size_t total_len = 0;
|
|
||||||
for (const auto& c : components) {
|
|
||||||
total_len += c.length() + 1;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
std::string result;
|
std::string result;
|
||||||
result.reserve(total_len - 1);
|
for (const auto& c : components) {
|
||||||
|
if (!result.empty()) {
|
||||||
for (size_t i = 0; i < components.size(); ++i) {
|
result += "/";
|
||||||
if (i > 0) {
|
|
||||||
result += '/';
|
|
||||||
}
|
}
|
||||||
result.append(components[i].data(), components[i].length());
|
result += c;
|
||||||
}
|
}
|
||||||
|
|
||||||
return result;
|
return result;
|
||||||
|
|||||||
+111
-219
@@ -3,6 +3,7 @@
|
|||||||
#include <BidiUtils.h>
|
#include <BidiUtils.h>
|
||||||
#include <FontDecompressor.h>
|
#include <FontDecompressor.h>
|
||||||
#include <HalGPIO.h>
|
#include <HalGPIO.h>
|
||||||
|
#include <Icon.h>
|
||||||
#include <Logging.h>
|
#include <Logging.h>
|
||||||
#include <SdCardFont.h>
|
#include <SdCardFont.h>
|
||||||
#include <Utf8.h>
|
#include <Utf8.h>
|
||||||
@@ -100,6 +101,23 @@ void GfxRenderer::insertFont(const int fontId, EpdFontFamily font) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GfxRenderer::setUiFontRemap(const int* from, const int* to, int count) {
|
||||||
|
if (count < 0) count = 0;
|
||||||
|
if (count > MAX_UI_FONT_REMAP) count = MAX_UI_FONT_REMAP;
|
||||||
|
for (int i = 0; i < count; ++i) {
|
||||||
|
uiFontFrom_[i] = from[i];
|
||||||
|
uiFontTo_[i] = to[i];
|
||||||
|
}
|
||||||
|
uiFontRemapCount_ = count;
|
||||||
|
}
|
||||||
|
|
||||||
|
int GfxRenderer::remapUiFont(const int fontId) const {
|
||||||
|
for (int i = 0; i < uiFontRemapCount_; ++i) {
|
||||||
|
if (uiFontFrom_[i] == fontId) return uiFontTo_[i];
|
||||||
|
}
|
||||||
|
return fontId;
|
||||||
|
}
|
||||||
|
|
||||||
// Translate logical (x,y) coordinates to physical panel coordinates based on current orientation
|
// Translate logical (x,y) coordinates to physical panel coordinates based on current orientation
|
||||||
// This should always be inlined for better performance
|
// This should always be inlined for better performance
|
||||||
static inline void rotateCoordinates(const GfxRenderer::Orientation orientation, const int x, const int y, int* phyX,
|
static inline void rotateCoordinates(const GfxRenderer::Orientation orientation, const int x, const int y, int* phyX,
|
||||||
@@ -365,7 +383,7 @@ int GfxRenderer::getTextWidth(const int fontId, const char* text, const EpdFontF
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -407,7 +425,7 @@ void GfxRenderer::drawText(const int fontId, const int x, const int y, const cha
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return;
|
return;
|
||||||
@@ -661,10 +679,8 @@ void GfxRenderer::drawRoundedRect(const int x, const int y, const int width, con
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GfxRenderer::fillRect(const int x, const int y, const int width, const int height, const bool state) const {
|
void GfxRenderer::fillRect(const int x, const int y, const int width, const int height, const bool state) const {
|
||||||
if (state) {
|
for (int fillY = y; fillY < y + height; fillY++) {
|
||||||
fillRectImpl<Color::Black>(x, y, width, height);
|
drawLine(x, fillY, x + width - 1, fillY, state);
|
||||||
} else {
|
|
||||||
fillRectImpl<Color::White>(x, y, width, height);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -696,194 +712,26 @@ void GfxRenderer::drawPixelDither<Color::DarkGray>(const int x, const int y) con
|
|||||||
}
|
}
|
||||||
|
|
||||||
void GfxRenderer::fillRectDither(const int x, const int y, const int width, const int height, Color color) const {
|
void GfxRenderer::fillRectDither(const int x, const int y, const int width, const int height, Color color) const {
|
||||||
switch (color) {
|
if (color == Color::Clear) {
|
||||||
case Color::Clear:
|
} else if (color == Color::Black) {
|
||||||
break;
|
fillRect(x, y, width, height, true);
|
||||||
case Color::Black:
|
} else if (color == Color::White) {
|
||||||
fillRectImpl<Color::Black>(x, y, width, height);
|
fillRect(x, y, width, height, false);
|
||||||
break;
|
} else if (color == Color::LightGray) {
|
||||||
case Color::White:
|
for (int fillY = y; fillY < y + height; fillY++) {
|
||||||
fillRectImpl<Color::White>(x, y, width, height);
|
for (int fillX = x; fillX < x + width; fillX++) {
|
||||||
break;
|
drawPixelDither<Color::LightGray>(fillX, fillY);
|
||||||
case Color::LightGray:
|
|
||||||
fillRectImpl<Color::LightGray>(x, y, width, height);
|
|
||||||
break;
|
|
||||||
case Color::DarkGray:
|
|
||||||
fillRectImpl<Color::DarkGray>(x, y, width, height);
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
template <Color C>
|
|
||||||
void GfxRenderer::fillRectImpl(const int x, const int y, const int width, const int height) const {
|
|
||||||
if constexpr (C == Color::Clear) return;
|
|
||||||
if (width <= 0 || height <= 0) return;
|
|
||||||
if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
|
|
||||||
|
|
||||||
// Clip in logical space.
|
|
||||||
const int screenW = getScreenWidth();
|
|
||||||
const int screenH = getScreenHeight();
|
|
||||||
const int lx0 = std::max(0, x);
|
|
||||||
const int ly0 = std::max(0, y);
|
|
||||||
const int lx1 = std::min(screenW, x + width);
|
|
||||||
const int ly1 = std::min(screenH, y + height);
|
|
||||||
if (lx0 >= lx1 || ly0 >= ly1) return;
|
|
||||||
|
|
||||||
// Rotate the two opposing logical corners into physical-framebuffer space.
|
|
||||||
// The bounding rect in physical space is the rect we need to fill — rotation
|
|
||||||
// is rigid (no shear/stretch) so the bbox of the two corners IS the rect.
|
|
||||||
int paX, paY, pbX, pbY;
|
|
||||||
rotateCoordinates(orientation, lx0, ly0, &paX, &paY, panelWidth, panelHeight);
|
|
||||||
rotateCoordinates(orientation, lx1 - 1, ly1 - 1, &pbX, &pbY, panelWidth, panelHeight);
|
|
||||||
|
|
||||||
const int phyX0 = std::min(paX, pbX);
|
|
||||||
const int phyX1 = std::max(paX, pbX); // inclusive
|
|
||||||
int phyY0 = std::min(paY, pbY);
|
|
||||||
int phyY1 = std::max(paY, pbY);
|
|
||||||
|
|
||||||
// Strip mode: clip Y range to the active band and redirect writes.
|
|
||||||
uint8_t* target = getWriteTarget();
|
|
||||||
const int originY = getWriteOriginY();
|
|
||||||
const int writeRows = getWriteRows();
|
|
||||||
phyY0 = std::max(phyY0, originY);
|
|
||||||
phyY1 = std::min(phyY1, originY + writeRows - 1);
|
|
||||||
if (phyY0 > phyY1) return;
|
|
||||||
|
|
||||||
// Bit/byte layout: MSB-first within a byte, so phyX → bit (7 - (phyX & 7)).
|
|
||||||
// Head and tail masks cover only the in-rect bits of the first/last byte.
|
|
||||||
const int byteStart = phyX0 >> 3;
|
|
||||||
const int byteEnd = phyX1 >> 3; // inclusive
|
|
||||||
const uint8_t headMask = static_cast<uint8_t>(0xFFu >> (phyX0 & 7));
|
|
||||||
const uint8_t tailMask = static_cast<uint8_t>(0xFFu << (7 - (phyX1 & 7)));
|
|
||||||
const int32_t panelStride = static_cast<int32_t>(panelWidthBytes);
|
|
||||||
|
|
||||||
if constexpr (C == Color::Black || C == Color::White) {
|
|
||||||
// Solid fill. Framebuffer: 0 = black, 1 = white.
|
|
||||||
const uint8_t fillByte = (C == Color::Black) ? 0x00u : 0xFFu;
|
|
||||||
for (int py = phyY0; py <= phyY1; ++py) {
|
|
||||||
uint8_t* row = target + static_cast<int32_t>(py - originY) * panelStride;
|
|
||||||
if (byteStart == byteEnd) {
|
|
||||||
const uint8_t mask = headMask & tailMask;
|
|
||||||
if constexpr (C == Color::Black) {
|
|
||||||
row[byteStart] &= static_cast<uint8_t>(~mask);
|
|
||||||
} else {
|
|
||||||
row[byteStart] |= mask;
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if constexpr (C == Color::Black) {
|
|
||||||
row[byteStart] &= static_cast<uint8_t>(~headMask);
|
|
||||||
if (byteEnd > byteStart + 1) {
|
|
||||||
memset(row + byteStart + 1, fillByte, byteEnd - byteStart - 1);
|
|
||||||
}
|
|
||||||
row[byteEnd] &= static_cast<uint8_t>(~tailMask);
|
|
||||||
} else {
|
|
||||||
row[byteStart] |= headMask;
|
|
||||||
if (byteEnd > byteStart + 1) {
|
|
||||||
memset(row + byteStart + 1, fillByte, byteEnd - byteStart - 1);
|
|
||||||
}
|
|
||||||
row[byteEnd] |= tailMask;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else if (color == Color::DarkGray) {
|
||||||
// Dither (LightGray / DarkGray). Both patterns have period 2 in logical
|
for (int fillY = y; fillY < y + height; fillY++) {
|
||||||
// (x, y), so per physical row we precompute one byte that represents the
|
for (int fillX = x; fillX < x + width; fillX++) {
|
||||||
// pattern across an 8-pixel stretch — every full byte in the row uses
|
drawPixelDither<Color::DarkGray>(fillX, fillY);
|
||||||
// that same value.
|
|
||||||
//
|
|
||||||
// dlxPerPhyX / dlyPerPhyX: how logical (x, y) change as phyX increments
|
|
||||||
// along a physical row. Derived from inverting rotateCoordinates.
|
|
||||||
int dlxPerPhyX = 0, dlyPerPhyX = 0;
|
|
||||||
switch (orientation) {
|
|
||||||
case Portrait:
|
|
||||||
dlxPerPhyX = 0;
|
|
||||||
dlyPerPhyX = 1;
|
|
||||||
break;
|
|
||||||
case PortraitInverted:
|
|
||||||
dlxPerPhyX = 0;
|
|
||||||
dlyPerPhyX = -1;
|
|
||||||
break;
|
|
||||||
case LandscapeClockwise:
|
|
||||||
dlxPerPhyX = -1;
|
|
||||||
dlyPerPhyX = 0;
|
|
||||||
break;
|
|
||||||
case LandscapeCounterClockwise:
|
|
||||||
dlxPerPhyX = 1;
|
|
||||||
dlyPerPhyX = 0;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// The dither pattern has period 2 in logical space, and each orientation
|
|
||||||
// maps py to logical coords with a fixed parity relationship. The
|
|
||||||
// blackMask byte therefore repeats with period 2 in py. Precompute both
|
|
||||||
// variants outside the row loop to eliminate the per-row switch + 8-bit
|
|
||||||
// construction loop.
|
|
||||||
uint8_t blackMasks[2];
|
|
||||||
for (int parityIdx = 0; parityIdx < 2; ++parityIdx) {
|
|
||||||
const int samplePy = phyY0 + parityIdx;
|
|
||||||
int lxBase = 0, lyBase = 0;
|
|
||||||
switch (orientation) {
|
|
||||||
case Portrait:
|
|
||||||
lxBase = panelHeight - 1 - samplePy;
|
|
||||||
lyBase = byteStart * 8;
|
|
||||||
break;
|
|
||||||
case PortraitInverted:
|
|
||||||
lxBase = samplePy;
|
|
||||||
lyBase = panelWidth - 1 - byteStart * 8;
|
|
||||||
break;
|
|
||||||
case LandscapeClockwise:
|
|
||||||
lxBase = panelWidth - 1 - byteStart * 8;
|
|
||||||
lyBase = panelHeight - 1 - samplePy;
|
|
||||||
break;
|
|
||||||
case LandscapeCounterClockwise:
|
|
||||||
lxBase = byteStart * 8;
|
|
||||||
lyBase = samplePy;
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
uint8_t mask = 0;
|
|
||||||
for (int b = 0; b < 8; ++b) {
|
|
||||||
const int lx = lxBase + b * dlxPerPhyX;
|
|
||||||
const int ly = lyBase + b * dlyPerPhyX;
|
|
||||||
bool isBlack;
|
|
||||||
if constexpr (C == Color::LightGray) {
|
|
||||||
isBlack = ((lx & 1) == 0) && ((ly & 1) == 0);
|
|
||||||
} else { // DarkGray
|
|
||||||
isBlack = (((lx + ly) & 1) == 0);
|
|
||||||
}
|
|
||||||
if (isBlack) mask |= static_cast<uint8_t>(1u << (7 - b));
|
|
||||||
}
|
|
||||||
blackMasks[samplePy & 1] = mask;
|
|
||||||
}
|
|
||||||
|
|
||||||
for (int py = phyY0; py <= phyY1; ++py) {
|
|
||||||
const uint8_t blackMask = blackMasks[py & 1];
|
|
||||||
const uint8_t whiteMask = static_cast<uint8_t>(~blackMask);
|
|
||||||
|
|
||||||
// Dither writes BOTH inks (the slow path called drawPixel for every
|
|
||||||
// pixel — setting or clearing — so we must do the same). Inside the
|
|
||||||
// rect mask: write whiteMask (1s where white, 0s where black). Outside
|
|
||||||
// the rect mask: leave the framebuffer untouched.
|
|
||||||
uint8_t* row = target + static_cast<int32_t>(py - originY) * panelStride;
|
|
||||||
if (byteStart == byteEnd) {
|
|
||||||
const uint8_t rectMask = headMask & tailMask;
|
|
||||||
row[byteStart] = static_cast<uint8_t>((row[byteStart] & ~rectMask) | (rectMask & whiteMask));
|
|
||||||
} else {
|
|
||||||
row[byteStart] = static_cast<uint8_t>((row[byteStart] & ~headMask) | (headMask & whiteMask));
|
|
||||||
if (byteEnd > byteStart + 1) {
|
|
||||||
// Period 2, so every full byte in this row is exactly whiteMask.
|
|
||||||
memset(row + byteStart + 1, whiteMask, byteEnd - byteStart - 1);
|
|
||||||
}
|
|
||||||
row[byteEnd] = static_cast<uint8_t>((row[byteEnd] & ~tailMask) | (tailMask & whiteMask));
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
template void GfxRenderer::fillRectImpl<Color::Black>(int, int, int, int) const;
|
|
||||||
template void GfxRenderer::fillRectImpl<Color::White>(int, int, int, int) const;
|
|
||||||
template void GfxRenderer::fillRectImpl<Color::LightGray>(int, int, int, int) const;
|
|
||||||
template void GfxRenderer::fillRectImpl<Color::DarkGray>(int, int, int, int) const;
|
|
||||||
|
|
||||||
void GfxRenderer::maskRoundedRectOutsideCorners(const int x, const int y, const int width, const int height,
|
void GfxRenderer::maskRoundedRectOutsideCorners(const int x, const int y, const int width, const int height,
|
||||||
const int radius, const Color color) const {
|
const int radius, const Color color) const {
|
||||||
if (radius <= 0 || color == Color::Clear) {
|
if (radius <= 0 || color == Color::Clear) {
|
||||||
@@ -1058,6 +906,21 @@ void GfxRenderer::drawIcon(const uint8_t bitmap[], const int x, const int y, con
|
|||||||
display.drawImageTransparent(bitmap, y, getScreenWidth() - width - x, height, width);
|
display.drawImageTransparent(bitmap, y, getScreenWidth() - width - x, height, width);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GfxRenderer::drawIcon(const freeink::Icon& icon, const int x, const int y, const bool black) const {
|
||||||
|
// Bits are un-rotated, so each drawn pixel goes through drawPixel (which applies
|
||||||
|
// the orientation transform) — correct in every orientation, unlike the legacy
|
||||||
|
// uint8_t* overload that pre-rotates for one orientation.
|
||||||
|
const int rowBytes = (icon.w + 7) / 8;
|
||||||
|
for (int row = 0; row < icon.h; ++row) {
|
||||||
|
const uint8_t* r = icon.bits + static_cast<int>(row) * rowBytes;
|
||||||
|
for (int col = 0; col < icon.w; ++col) {
|
||||||
|
if (((r[col >> 3] >> (7 - (col & 7))) & 1) == 0) { // 0 = drawn
|
||||||
|
drawPixel(x + col, y + row, black);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, const int maxWidth, const int maxHeight,
|
void GfxRenderer::drawBitmap(const Bitmap& bitmap, const int x, const int y, const int maxWidth, const int maxHeight,
|
||||||
const float cropX, const float cropY) const {
|
const float cropX, const float cropY) const {
|
||||||
if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
|
if (fontCacheManager_ && fontCacheManager_->isScanning()) return;
|
||||||
@@ -1466,6 +1329,38 @@ int GfxRenderer::getScreenHeight() const {
|
|||||||
return panelWidth;
|
return panelWidth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void GfxRenderer::tapToLogical(float nx, float ny, int& outX, int& outY) const {
|
||||||
|
// Native panel pixel of the tap (wasTouchTap normalizes over the native panel).
|
||||||
|
int phyX = static_cast<int>(nx * panelWidth);
|
||||||
|
int phyY = static_cast<int>(ny * panelHeight);
|
||||||
|
if (phyX < 0) phyX = 0;
|
||||||
|
if (phyX > panelWidth - 1) phyX = panelWidth - 1;
|
||||||
|
if (phyY < 0) phyY = 0;
|
||||||
|
if (phyY > panelHeight - 1) phyY = panelHeight - 1;
|
||||||
|
|
||||||
|
// Inverse of rotateCoordinates() (see the forward transform above): map a
|
||||||
|
// physical/native point back into the current orientation's logical frame.
|
||||||
|
switch (orientation) {
|
||||||
|
case Portrait: // forward: phyX=logY, phyY=panelHeight-1-logX
|
||||||
|
outX = panelHeight - 1 - phyY;
|
||||||
|
outY = phyX;
|
||||||
|
break;
|
||||||
|
case PortraitInverted: // forward: phyX=panelWidth-1-logY, phyY=logX
|
||||||
|
outX = phyY;
|
||||||
|
outY = panelWidth - 1 - phyX;
|
||||||
|
break;
|
||||||
|
case LandscapeClockwise: // forward: phyX=panelWidth-1-logX, phyY=panelHeight-1-logY
|
||||||
|
outX = panelWidth - 1 - phyX;
|
||||||
|
outY = panelHeight - 1 - phyY;
|
||||||
|
break;
|
||||||
|
case LandscapeCounterClockwise: // forward: identity
|
||||||
|
default:
|
||||||
|
outX = phyX;
|
||||||
|
outY = phyY;
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Translate a logical rect through rotateCoordinates and take the bounding
|
// Translate a logical rect through rotateCoordinates and take the bounding
|
||||||
// box of its four corners on the physical panel. Output coords are inclusive
|
// box of its four corners on the physical panel. Output coords are inclusive
|
||||||
// and clamped. Returns false if the rect ends up fully off-panel.
|
// and clamped. Returns false if the rect ends up fully off-panel.
|
||||||
@@ -1557,7 +1452,7 @@ int GfxRenderer::getSpaceWidth(const int fontId, const EpdFontFamily::Style styl
|
|||||||
return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
|
return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1578,7 +1473,7 @@ int GfxRenderer::getSpaceAdvance(const int fontId, const uint32_t leftCp, const
|
|||||||
return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
|
return fp4::toPixel(sdIt->second->getAdvance(' ', resolvedStyle));
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) return 0;
|
if (fontIt == fontMap.end()) return 0;
|
||||||
const auto& font = fontIt->second;
|
const auto& font = fontIt->second;
|
||||||
const EpdGlyph* spaceGlyph = font.getGlyph(' ', style);
|
const EpdGlyph* spaceGlyph = font.getGlyph(' ', style);
|
||||||
@@ -1592,7 +1487,7 @@ int GfxRenderer::getSpaceAdvance(const int fontId, const uint32_t leftCp, const
|
|||||||
|
|
||||||
int GfxRenderer::getKerning(const int fontId, const uint32_t leftCp, const uint32_t rightCp,
|
int GfxRenderer::getKerning(const int fontId, const uint32_t leftCp, const uint32_t rightCp,
|
||||||
const EpdFontFamily::Style style) const {
|
const EpdFontFamily::Style style) const {
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) return 0;
|
if (fontIt == fontMap.end()) return 0;
|
||||||
const int kernFP = fontIt->second.getKerning(leftCp, rightCp, style); // 4.4 fixed-point
|
const int kernFP = fontIt->second.getKerning(leftCp, rightCp, style); // 4.4 fixed-point
|
||||||
return fp4::toPixel(kernFP); // snap 4.4 fixed-point to nearest pixel
|
return fp4::toPixel(kernFP); // snap 4.4 fixed-point to nearest pixel
|
||||||
@@ -1624,7 +1519,7 @@ int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, EpdFontFami
|
|||||||
return fp4::toPixel(widthFP);
|
return fp4::toPixel(widthFP);
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1660,7 +1555,7 @@ int GfxRenderer::getTextAdvanceX(const int fontId, const char* text, EpdFontFami
|
|||||||
}
|
}
|
||||||
|
|
||||||
int GfxRenderer::getFontAscenderSize(const int fontId) const {
|
int GfxRenderer::getFontAscenderSize(const int fontId) const {
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1670,7 +1565,7 @@ int GfxRenderer::getFontAscenderSize(const int fontId) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int GfxRenderer::getLineHeight(const int fontId) const {
|
int GfxRenderer::getLineHeight(const int fontId) const {
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1680,7 +1575,7 @@ int GfxRenderer::getLineHeight(const int fontId) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
int GfxRenderer::getTextHeight(const int fontId) const {
|
int GfxRenderer::getTextHeight(const int fontId) const {
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return 0;
|
return 0;
|
||||||
@@ -1688,6 +1583,27 @@ int GfxRenderer::getTextHeight(const int fontId) const {
|
|||||||
return fontIt->second.getData(EpdFontFamily::REGULAR)->ascender;
|
return fontIt->second.getData(EpdFontFamily::REGULAR)->ascender;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Height of a reference glyph above the baseline (glyph->top): 'H' gives the real
|
||||||
|
// cap height, the actual visible font extent for vertical centering.
|
||||||
|
int GfxRenderer::glyphTop(const int fontId, const uint32_t cp) const {
|
||||||
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
|
if (fontIt == fontMap.end()) return 0;
|
||||||
|
const EpdGlyph* g = fontIt->second.getGlyph(cp, EpdFontFamily::REGULAR);
|
||||||
|
return g ? g->top : 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
int GfxRenderer::getFontCapHeight(const int fontId) const { return glyphTop(fontId, 'H'); }
|
||||||
|
|
||||||
|
int GfxRenderer::getTextVisualCenterOffset(const int fontId) const {
|
||||||
|
// Cap-height middle: baseline is at top + ascender, caps reach capHeight above it,
|
||||||
|
// so the optical center is ascender - capHeight/2 below the top. Cap (not x) height
|
||||||
|
// because UI labels are capital-led. Falls back to ascender*0.65 without an 'H'.
|
||||||
|
const int ascender = getFontAscenderSize(fontId);
|
||||||
|
const int capHeight = getFontCapHeight(fontId);
|
||||||
|
if (capHeight <= 0) return (ascender * 65) / 100;
|
||||||
|
return ascender - capHeight / 2;
|
||||||
|
}
|
||||||
|
|
||||||
void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y, const char* text, const bool black,
|
void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y, const char* text, const bool black,
|
||||||
const EpdFontFamily::Style style) const {
|
const EpdFontFamily::Style style) const {
|
||||||
// Cannot draw a NULL / empty string
|
// Cannot draw a NULL / empty string
|
||||||
@@ -1695,7 +1611,7 @@ void GfxRenderer::drawTextRotated90CW(const int fontId, const int x, const int y
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto fontIt = fontMap.find(fontId);
|
const auto fontIt = fontMap.find(remapUiFont(fontId));
|
||||||
if (fontIt == fontMap.end()) {
|
if (fontIt == fontMap.end()) {
|
||||||
LOG_ERR("GFX", "Font %d not found", fontId);
|
LOG_ERR("GFX", "Font %d not found", fontId);
|
||||||
return;
|
return;
|
||||||
@@ -1757,30 +1673,6 @@ size_t GfxRenderer::getBufferSize() const { return frameBufferSize; }
|
|||||||
// unused
|
// unused
|
||||||
// void GfxRenderer::grayscaleRevert() const { display.grayscaleRevert(); }
|
// void GfxRenderer::grayscaleRevert() const { display.grayscaleRevert(); }
|
||||||
|
|
||||||
void GfxRenderer::displayGrayscaleBase(HalDisplay::RefreshMode fallback) const {
|
|
||||||
display.displayGrayscaleBase(fallback, fadingFix);
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxRenderer::preconditionGrayscale() const { display.preconditionGrayscale(); }
|
|
||||||
|
|
||||||
void GfxRenderer::preconditionGrayscale(int x, int y, int w, int h) const {
|
|
||||||
if (w <= 0 || h <= 0) return;
|
|
||||||
// Rotate the logical rect's opposite corners to physical panel coords; the
|
|
||||||
// physical bbox stays axis-aligned for all four orientations.
|
|
||||||
int ax, ay, bx, by;
|
|
||||||
rotateCoordinates(orientation, x, y, &ax, &ay, panelWidth, panelHeight);
|
|
||||||
rotateCoordinates(orientation, x + w - 1, y + h - 1, &bx, &by, panelWidth, panelHeight);
|
|
||||||
int x0 = ax < bx ? ax : bx, x1 = ax > bx ? ax : bx;
|
|
||||||
int y0 = ay < by ? ay : by, y1 = ay > by ? ay : by;
|
|
||||||
if (x0 < 0) x0 = 0;
|
|
||||||
if (y0 < 0) y0 = 0;
|
|
||||||
if (x1 >= panelWidth) x1 = panelWidth - 1;
|
|
||||||
if (y1 >= panelHeight) y1 = panelHeight - 1;
|
|
||||||
if (x1 < x0 || y1 < y0) return;
|
|
||||||
display.preconditionGrayscale(static_cast<uint16_t>(x0), static_cast<uint16_t>(y0),
|
|
||||||
static_cast<uint16_t>(x1 - x0 + 1), static_cast<uint16_t>(y1 - y0 + 1));
|
|
||||||
}
|
|
||||||
|
|
||||||
void GfxRenderer::copyGrayscaleLsbBuffers() const { display.copyGrayscaleLsbBuffers(frameBuffer); }
|
void GfxRenderer::copyGrayscaleLsbBuffers() const { display.copyGrayscaleLsbBuffers(frameBuffer); }
|
||||||
|
|
||||||
void GfxRenderer::copyGrayscaleMsbBuffers() const { display.copyGrayscaleMsbBuffers(frameBuffer); }
|
void GfxRenderer::copyGrayscaleMsbBuffers() const { display.copyGrayscaleMsbBuffers(frameBuffer); }
|
||||||
|
|||||||
@@ -13,6 +13,9 @@ enum class BidiBaseDir : signed char { AUTO = -1, LTR = 0, RTL = 1 };
|
|||||||
|
|
||||||
class FontCacheManager;
|
class FontCacheManager;
|
||||||
class SdCardFont;
|
class SdCardFont;
|
||||||
|
namespace freeink {
|
||||||
|
struct Icon;
|
||||||
|
}
|
||||||
|
|
||||||
#include <cstring>
|
#include <cstring>
|
||||||
#include <map>
|
#include <map>
|
||||||
@@ -51,6 +54,13 @@ class GfxRenderer {
|
|||||||
uint32_t frameBufferSize = HalDisplay::BUFFER_SIZE;
|
uint32_t frameBufferSize = HalDisplay::BUFFER_SIZE;
|
||||||
std::vector<uint8_t*> bwBufferChunks;
|
std::vector<uint8_t*> bwBufferChunks;
|
||||||
std::map<int, EpdFontFamily> fontMap;
|
std::map<int, EpdFontFamily> fontMap;
|
||||||
|
// UI chrome font remap table (see setUiFontRemap). Empty = identity.
|
||||||
|
static constexpr int MAX_UI_FONT_REMAP = 8;
|
||||||
|
int uiFontFrom_[MAX_UI_FONT_REMAP] = {0};
|
||||||
|
int uiFontTo_[MAX_UI_FONT_REMAP] = {0};
|
||||||
|
int uiFontRemapCount_ = 0;
|
||||||
|
int remapUiFont(int fontId) const;
|
||||||
|
int glyphTop(int fontId, uint32_t cp) const;
|
||||||
// Mutable because ensureSdCardFontReady() is const (called from layout code
|
// Mutable because ensureSdCardFontReady() is const (called from layout code
|
||||||
// that holds a const GfxRenderer&) but triggers SD card reads and heap
|
// that holds a const GfxRenderer&) but triggers SD card reads and heap
|
||||||
// allocation inside the SdCardFont objects. Same pragmatic compromise as
|
// allocation inside the SdCardFont objects. Same pragmatic compromise as
|
||||||
@@ -81,12 +91,6 @@ class GfxRenderer {
|
|||||||
void drawPixelDither(int x, int y) const;
|
void drawPixelDither(int x, int y) const;
|
||||||
template <Color color>
|
template <Color color>
|
||||||
void fillArc(int maxRadius, int cx, int cy, int xDir, int yDir) const;
|
void fillArc(int maxRadius, int cx, int cy, int xDir, int yDir) const;
|
||||||
// Byte-aligned, orientation-specialized rectangle fill. Rotates the rect's
|
|
||||||
// two opposing corners into physical-framebuffer space once, then walks each
|
|
||||||
// physical row with head-mask / middle memset / tail-mask byte writes — no
|
|
||||||
// per-pixel rotation, no per-pixel RMW.
|
|
||||||
template <Color color>
|
|
||||||
void fillRectImpl(int x, int y, int width, int height) const;
|
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit GfxRenderer(HalDisplay& halDisplay)
|
explicit GfxRenderer(HalDisplay& halDisplay)
|
||||||
@@ -101,6 +105,14 @@ class GfxRenderer {
|
|||||||
// Setup
|
// Setup
|
||||||
void begin(); // must be called right after display.begin()
|
void begin(); // must be called right after display.begin()
|
||||||
void insertFont(int fontId, EpdFontFamily font);
|
void insertFont(int fontId, EpdFontFamily font);
|
||||||
|
// Orientation-correct icon blit for the freeink::Icon format (un-rotated bits +
|
||||||
|
// optical-center metadata). Prefer this over the legacy raw-bitmap drawIcon.
|
||||||
|
void drawIcon(const freeink::Icon& icon, int x, int y, bool black = true) const;
|
||||||
|
// UI chrome font scaling: firmware supplies a small remap table (from the board
|
||||||
|
// uiScale) that substitutes a larger font for each scaled UI font id at lookup
|
||||||
|
// time, so layout and drawing stay consistent with no call-site changes. Reader
|
||||||
|
// body fonts aren't in the table, so book text is unaffected. count <= 8.
|
||||||
|
void setUiFontRemap(const int* from, const int* to, int count);
|
||||||
// Clears both the flash-font map and any SD-font registration for fontId.
|
// Clears both the flash-font map and any SD-font registration for fontId.
|
||||||
// Coupled to avoid dangling SdCardFont* in sdCardFonts_ when callers free
|
// Coupled to avoid dangling SdCardFont* in sdCardFonts_ when callers free
|
||||||
// the underlying SdCardFont and forget the SD-side unregister.
|
// the underlying SdCardFont and forget the SD-side unregister.
|
||||||
@@ -141,6 +153,11 @@ class GfxRenderer {
|
|||||||
void clearScreen(uint8_t color = 0xFF) const;
|
void clearScreen(uint8_t color = 0xFF) const;
|
||||||
void getOrientedViewableTRBL(int* outTop, int* outRight, int* outBottom, int* outLeft) const;
|
void getOrientedViewableTRBL(int* outTop, int* outRight, int* outBottom, int* outLeft) const;
|
||||||
|
|
||||||
|
// Map a touch tap (normalized 0..1 in panel-native orientation, from
|
||||||
|
// InputManager::wasTouchTap) to logical screen coordinates matching the Rects the
|
||||||
|
// UI draws in. Inverse of rotateCoordinates() for the current orientation.
|
||||||
|
void tapToLogical(float nx, float ny, int& outX, int& outY) const;
|
||||||
|
|
||||||
// Tiled grayscale strip target. While active, drawPixel() and clearScreen()
|
// Tiled grayscale strip target. While active, drawPixel() and clearScreen()
|
||||||
// operate on `scratch` (panelWidthBytes * stripRows bytes, holding physical
|
// operate on `scratch` (panelWidthBytes * stripRows bytes, holding physical
|
||||||
// rows [stripY0, stripY0 + stripRows)) instead of the framebuffer; pixels
|
// rows [stripY0, stripY0 + stripRows)) instead of the framebuffer; pixels
|
||||||
@@ -208,6 +225,12 @@ class GfxRenderer {
|
|||||||
int getTextAdvanceX(int fontId, const char* text, EpdFontFamily::Style style) const;
|
int getTextAdvanceX(int fontId, const char* text, EpdFontFamily::Style style) const;
|
||||||
int getFontAscenderSize(int fontId) const;
|
int getFontAscenderSize(int fontId) const;
|
||||||
int getLineHeight(int fontId) const;
|
int getLineHeight(int fontId) const;
|
||||||
|
// Cap height (from the 'H' glyph), the real visible font extent for vertical
|
||||||
|
// alignment that follows the font instead of a guessed ascender fraction.
|
||||||
|
int getFontCapHeight(int fontId) const;
|
||||||
|
// Offset from text top (drawText's y) to the text's optical center; align an
|
||||||
|
// element to a line via centerY = textTop + getTextVisualCenterOffset(fontId).
|
||||||
|
int getTextVisualCenterOffset(int fontId) const;
|
||||||
std::string truncatedText(int fontId, const char* text, int maxWidth,
|
std::string truncatedText(int fontId, const char* text, int maxWidth,
|
||||||
EpdFontFamily::Style style = EpdFontFamily::REGULAR) const;
|
EpdFontFamily::Style style = EpdFontFamily::REGULAR) const;
|
||||||
/// Word-wrap \p text into at most \p maxLines lines, each no wider than
|
/// Word-wrap \p text into at most \p maxLines lines, each no wider than
|
||||||
@@ -224,16 +247,6 @@ class GfxRenderer {
|
|||||||
// Grayscale functions
|
// Grayscale functions
|
||||||
void setRenderMode(const RenderMode mode) { this->renderMode = mode; }
|
void setRenderMode(const RenderMode mode) { this->renderMode = mode; }
|
||||||
RenderMode getRenderMode() const { return renderMode; }
|
RenderMode getRenderMode() const { return renderMode; }
|
||||||
// Grayscale preconditioning settle pass (no-op on X4). The rect overload
|
|
||||||
// takes the gray region in LOGICAL screen coordinates and rotates it to the
|
|
||||||
// panel; the no-arg overload settles the full frame. Call after the BW base
|
|
||||||
// frame is displayed and before the grayscale planes are written.
|
|
||||||
void preconditionGrayscale() const;
|
|
||||||
void preconditionGrayscale(int x, int y, int w, int h) const;
|
|
||||||
// Display the framebuffer as the base frame for a grayscale overlay that
|
|
||||||
// follows (X3: OEM differential base waveform; others: plain display with
|
|
||||||
// `fallback`).
|
|
||||||
void displayGrayscaleBase(HalDisplay::RefreshMode fallback = HalDisplay::HALF_REFRESH) const;
|
|
||||||
void copyGrayscaleLsbBuffers() const;
|
void copyGrayscaleLsbBuffers() const;
|
||||||
void copyGrayscaleMsbBuffers() const;
|
void copyGrayscaleMsbBuffers() const;
|
||||||
void displayGrayBuffer() const;
|
void displayGrayBuffer() const;
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ STR_TEXT_AA: "Згладжванне тэксту"
|
|||||||
STR_SHORT_PWR_BTN: "Кароткае націсканне PWR"
|
STR_SHORT_PWR_BTN: "Кароткае націсканне PWR"
|
||||||
STR_ORIENTATION: "Арыентацыя чытання"
|
STR_ORIENTATION: "Арыентацыя чытання"
|
||||||
STR_SIDE_BTN_LAYOUT: "Бакавыя кнопкі"
|
STR_SIDE_BTN_LAYOUT: "Бакавыя кнопкі"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Сэнсарнае кіраванне чытаннем"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Арыентаваць пярэднія кнопкі"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Арыентаваць пярэднія кнопкі"
|
||||||
STR_LONG_PRESS_SKIP: "Доўгае націсканне - змена раздзела"
|
STR_LONG_PRESS_SKIP: "Доўгае націсканне - змена раздзела"
|
||||||
STR_FONT_PREVIEW_TEXT: "У Іўі худы жвавы чорт у зялёнай камізэльцы пабег пад'есці фаршу з юшкай"
|
STR_FONT_PREVIEW_TEXT: "У Іўі худы жвавы чорт у зялёнай камізэльцы пабег пад'есці фаршу з юшкай"
|
||||||
@@ -126,7 +127,6 @@ STR_PAGE_TURN: "Перагортванне"
|
|||||||
STR_PORTRAIT: "Партрэт"
|
STR_PORTRAIT: "Партрэт"
|
||||||
STR_LANDSCAPE_CW: "Ландшафт (CW)"
|
STR_LANDSCAPE_CW: "Ландшафт (CW)"
|
||||||
STR_INVERTED: "Інверсія"
|
STR_INVERTED: "Інверсія"
|
||||||
STR_ORIENTATION_INVERTED: "Партрэт 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Ландшафт (CCW)"
|
STR_LANDSCAPE_CCW: "Ландшафт (CCW)"
|
||||||
STR_PREV_NEXT: "Назад/Наперад"
|
STR_PREV_NEXT: "Назад/Наперад"
|
||||||
STR_NEXT_PREV: "Наперад/Назад"
|
STR_NEXT_PREV: "Наперад/Назад"
|
||||||
@@ -177,9 +177,6 @@ STR_EXIT: "« Выхад"
|
|||||||
STR_HOME: "« Галоўная"
|
STR_HOME: "« Галоўная"
|
||||||
STR_SELECT: "Абраць"
|
STR_SELECT: "Абраць"
|
||||||
STR_TOGGLE: "Выбар"
|
STR_TOGGLE: "Выбар"
|
||||||
STR_TOGGLE_BOOKMARK: "Пераключыць закладку"
|
|
||||||
STR_BOOKMARK_REMOVED: "Закладка выдалена."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Утрымлівайце Адкрыць, каб выдаліць"
|
|
||||||
STR_CONFIRM: "Пацв."
|
STR_CONFIRM: "Пацв."
|
||||||
STR_CANCEL: "Адмена"
|
STR_CANCEL: "Адмена"
|
||||||
STR_CONNECT: "Падкл."
|
STR_CONNECT: "Падкл."
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Suprimir"
|
|||||||
STR_SHORT_PWR_BTN: "Clic curt del botó d'engegada"
|
STR_SHORT_PWR_BTN: "Clic curt del botó d'engegada"
|
||||||
STR_ORIENTATION: "Orientació de lectura"
|
STR_ORIENTATION: "Orientació de lectura"
|
||||||
STR_SIDE_BTN_LAYOUT: "Disposició botons laterals"
|
STR_SIDE_BTN_LAYOUT: "Disposició botons laterals"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Controls tàctils del lector"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botons frontals"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botons frontals"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportament de prémer llargament el botó"
|
STR_LONG_PRESS_BEHAVIOR: "Comportament de prémer llargament el botó"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivat"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivat"
|
||||||
@@ -136,7 +137,6 @@ STR_PAGE_TURN: "Canvi de pàgina"
|
|||||||
STR_PORTRAIT: "Vertical"
|
STR_PORTRAIT: "Vertical"
|
||||||
STR_LANDSCAPE_CW: "Horitzontal horari"
|
STR_LANDSCAPE_CW: "Horitzontal horari"
|
||||||
STR_INVERTED: "Invertit"
|
STR_INVERTED: "Invertit"
|
||||||
STR_ORIENTATION_INVERTED: "Vertical 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Horitzontal antihorari"
|
STR_LANDSCAPE_CCW: "Horitzontal antihorari"
|
||||||
STR_PREV_NEXT: "Anterior/Següent"
|
STR_PREV_NEXT: "Anterior/Següent"
|
||||||
STR_NEXT_PREV: "Següent/Anterior"
|
STR_NEXT_PREV: "Següent/Anterior"
|
||||||
@@ -176,7 +176,8 @@ STR_DOWNLOADING: "S'està baixant..."
|
|||||||
STR_DOWNLOAD_FAILED: "Ha fallat la baixada"
|
STR_DOWNLOAD_FAILED: "Ha fallat la baixada"
|
||||||
STR_ERROR_MSG: "Error:"
|
STR_ERROR_MSG: "Error:"
|
||||||
STR_UNNAMED: "Sense nom"
|
STR_UNNAMED: "Sense nom"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Manteniu premut Obre per esborrar"
|
STR_HOLD_CONFIRM_TO_DELETE: "Manteniu premut Confirma per esborrar"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Manteniu premut Confirma al lector per crear un punt de llibre."
|
||||||
STR_NO_SERVER_URL: "No s'ha configurat cap URL de servidor"
|
STR_NO_SERVER_URL: "No s'ha configurat cap URL de servidor"
|
||||||
STR_FETCH_FEED_FAILED: "Ha fallat l'obtenció del feed"
|
STR_FETCH_FEED_FAILED: "Ha fallat l'obtenció del feed"
|
||||||
STR_PARSE_FEED_FAILED: "Ha fallat l'anàlisi del feed"
|
STR_PARSE_FEED_FAILED: "Ha fallat l'anàlisi del feed"
|
||||||
@@ -192,7 +193,6 @@ STR_HOME: "« Inici"
|
|||||||
STR_SELECT: "Selecciona"
|
STR_SELECT: "Selecciona"
|
||||||
STR_SELECTED: "Seleccionat"
|
STR_SELECTED: "Seleccionat"
|
||||||
STR_TOGGLE: "Canvia"
|
STR_TOGGLE: "Canvia"
|
||||||
STR_TOGGLE_BOOKMARK: "Commuta punt de llibre"
|
|
||||||
STR_CONFIRM: "Confirma"
|
STR_CONFIRM: "Confirma"
|
||||||
STR_CANCEL: "Cancel·la"
|
STR_CANCEL: "Cancel·la"
|
||||||
STR_CONNECT: "Connecta"
|
STR_CONNECT: "Connecta"
|
||||||
@@ -237,7 +237,6 @@ STR_QUICK_RESUME_TIMEOUT: "Represa ràpida després del temps"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Reassigna els botons frontals"
|
STR_REMAP_FRONT_BUTTONS: "Reassigna els botons frontals"
|
||||||
STR_BOOKMARKS: "Punts de llibre"
|
STR_BOOKMARKS: "Punts de llibre"
|
||||||
STR_BOOKMARK_ADDED: "S'ha afegit el punt de llibre."
|
STR_BOOKMARK_ADDED: "S'ha afegit el punt de llibre."
|
||||||
STR_BOOKMARK_REMOVED: "S'ha eliminat el punt de llibre."
|
|
||||||
STR_OPDS_BROWSER: "Navegador OPDS"
|
STR_OPDS_BROWSER: "Navegador OPDS"
|
||||||
STR_COVER_CUSTOM: "Portada + Personalitzat"
|
STR_COVER_CUSTOM: "Portada + Personalitzat"
|
||||||
STR_QUICK_RESUME: "Represa ràpida"
|
STR_QUICK_RESUME: "Represa ràpida"
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ STR_TEXT_AA: "Vyhlazování textu"
|
|||||||
STR_SHORT_PWR_BTN: "Krátké stisknutí tlačítka napájení"
|
STR_SHORT_PWR_BTN: "Krátké stisknutí tlačítka napájení"
|
||||||
STR_ORIENTATION: "Orientace čtení"
|
STR_ORIENTATION: "Orientace čtení"
|
||||||
STR_SIDE_BTN_LAYOUT: "Rozvržení bočních tlačítek (čtečka)"
|
STR_SIDE_BTN_LAYOUT: "Rozvržení bočních tlačítek (čtečka)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Dotykové ovládání čtečky"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientovat přední tlačítka"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientovat přední tlačítka"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Chování při dlouhém stisknutí tlačítka"
|
STR_LONG_PRESS_BEHAVIOR: "Chování při dlouhém stisknutí tlačítka"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "VYP"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "VYP"
|
||||||
@@ -131,7 +132,6 @@ STR_PAGE_TURN: "Otáčení stránek"
|
|||||||
STR_PORTRAIT: "Na výšku"
|
STR_PORTRAIT: "Na výšku"
|
||||||
STR_LANDSCAPE_CW: "Na šířku po směru hod. ručiček"
|
STR_LANDSCAPE_CW: "Na šířku po směru hod. ručiček"
|
||||||
STR_INVERTED: "Invertovaný"
|
STR_INVERTED: "Invertovaný"
|
||||||
STR_ORIENTATION_INVERTED: "Na výšku 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Na šířku proti směru hod. ručiček"
|
STR_LANDSCAPE_CCW: "Na šířku proti směru hod. ručiček"
|
||||||
STR_PREV_NEXT: "Předchozí/Další"
|
STR_PREV_NEXT: "Předchozí/Další"
|
||||||
STR_NEXT_PREV: "Další/Předchozí"
|
STR_NEXT_PREV: "Další/Předchozí"
|
||||||
@@ -182,9 +182,6 @@ STR_EXIT: "« Konec"
|
|||||||
STR_HOME: "« Domů"
|
STR_HOME: "« Domů"
|
||||||
STR_SELECT: "Vybrat"
|
STR_SELECT: "Vybrat"
|
||||||
STR_TOGGLE: "Přepnout"
|
STR_TOGGLE: "Přepnout"
|
||||||
STR_TOGGLE_BOOKMARK: "Přepnout záložku"
|
|
||||||
STR_BOOKMARK_REMOVED: "Záložka odstraněna."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Podržte Otevřít pro smazání"
|
|
||||||
STR_CONFIRM: "Potvrdit"
|
STR_CONFIRM: "Potvrdit"
|
||||||
STR_CANCEL: "Zrušit"
|
STR_CANCEL: "Zrušit"
|
||||||
STR_CONNECT: "Připojit"
|
STR_CONNECT: "Připojit"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Skjul"
|
|||||||
STR_SHORT_PWR_BTN: "Kort tryk på tænd/sluk-knap"
|
STR_SHORT_PWR_BTN: "Kort tryk på tænd/sluk-knap"
|
||||||
STR_ORIENTATION: "Læseretning"
|
STR_ORIENTATION: "Læseretning"
|
||||||
STR_SIDE_BTN_LAYOUT: "Knaplayout på siden (læser)"
|
STR_SIDE_BTN_LAYOUT: "Knaplayout på siden (læser)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Touch-betjening (læser)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientér forreste knapper"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientér forreste knapper"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportamiento al mantener pulsado el botón"
|
STR_LONG_PRESS_BEHAVIOR: "Comportamiento al mantener pulsado el botón"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivado"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivado"
|
||||||
@@ -136,7 +137,6 @@ STR_PAGE_TURN: "Sideskift"
|
|||||||
STR_PORTRAIT: "Portræt"
|
STR_PORTRAIT: "Portræt"
|
||||||
STR_LANDSCAPE_CW: "Liggende med uret"
|
STR_LANDSCAPE_CW: "Liggende med uret"
|
||||||
STR_INVERTED: "Inverteret"
|
STR_INVERTED: "Inverteret"
|
||||||
STR_ORIENTATION_INVERTED: "Portræt 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Liggende mod uret"
|
STR_LANDSCAPE_CCW: "Liggende mod uret"
|
||||||
STR_PREV_NEXT: "Forrige/Næste"
|
STR_PREV_NEXT: "Forrige/Næste"
|
||||||
STR_NEXT_PREV: "Næste/Forrige"
|
STR_NEXT_PREV: "Næste/Forrige"
|
||||||
@@ -188,9 +188,6 @@ STR_HOME: "« Hjem"
|
|||||||
STR_SELECT: "Vælg"
|
STR_SELECT: "Vælg"
|
||||||
STR_SELECTED: "Valgt"
|
STR_SELECTED: "Valgt"
|
||||||
STR_TOGGLE: "Skift"
|
STR_TOGGLE: "Skift"
|
||||||
STR_TOGGLE_BOOKMARK: "Skift bogmærke"
|
|
||||||
STR_BOOKMARK_REMOVED: "Bogmærke fjernet."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Hold Åbn nede for at slette"
|
|
||||||
STR_CONFIRM: "Bekræft"
|
STR_CONFIRM: "Bekræft"
|
||||||
STR_CANCEL: "Annuller"
|
STR_CANCEL: "Annuller"
|
||||||
STR_CONNECT: "Forbind"
|
STR_CONNECT: "Forbind"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Verbergen"
|
|||||||
STR_SHORT_PWR_BTN: "Korte klik aan/uit-knop"
|
STR_SHORT_PWR_BTN: "Korte klik aan/uit-knop"
|
||||||
STR_ORIENTATION: "Leesstand"
|
STR_ORIENTATION: "Leesstand"
|
||||||
STR_SIDE_BTN_LAYOUT: "Indeling zijknoppen (lezer)"
|
STR_SIDE_BTN_LAYOUT: "Indeling zijknoppen (lezer)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Aanraakbediening lezer"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Richt voorste knoppen"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Richt voorste knoppen"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
||||||
@@ -135,8 +136,7 @@ STR_SLEEP: "Slaap"
|
|||||||
STR_PAGE_TURN: "Pagina omslaan"
|
STR_PAGE_TURN: "Pagina omslaan"
|
||||||
STR_PORTRAIT: "Staand"
|
STR_PORTRAIT: "Staand"
|
||||||
STR_LANDSCAPE_CW: "Liggend (rechtsom)"
|
STR_LANDSCAPE_CW: "Liggend (rechtsom)"
|
||||||
STR_INVERTED: "Geïnverteerd"
|
STR_INVERTED: "Omgekeerd"
|
||||||
STR_ORIENTATION_INVERTED: "Staand 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Liggend (linksom)"
|
STR_LANDSCAPE_CCW: "Liggend (linksom)"
|
||||||
STR_PREV_NEXT: "Vorige/Volgende"
|
STR_PREV_NEXT: "Vorige/Volgende"
|
||||||
STR_NEXT_PREV: "Volgende/Vorige"
|
STR_NEXT_PREV: "Volgende/Vorige"
|
||||||
@@ -188,9 +188,6 @@ STR_HOME: "« Home"
|
|||||||
STR_SELECT: "Kies"
|
STR_SELECT: "Kies"
|
||||||
STR_SELECTED: "Geselecteerd"
|
STR_SELECTED: "Geselecteerd"
|
||||||
STR_TOGGLE: "Wissel"
|
STR_TOGGLE: "Wissel"
|
||||||
STR_TOGGLE_BOOKMARK: "Bladwijzer wisselen"
|
|
||||||
STR_BOOKMARK_REMOVED: "Bladwijzer verwijderd."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Houd Openen ingedrukt om te verwijderen"
|
|
||||||
STR_CONFIRM: "Bevestig"
|
STR_CONFIRM: "Bevestig"
|
||||||
STR_CANCEL: "Annuleer"
|
STR_CANCEL: "Annuleer"
|
||||||
STR_CONNECT: "Verbind"
|
STR_CONNECT: "Verbind"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Suppress"
|
|||||||
STR_SHORT_PWR_BTN: "Short Power Button Click"
|
STR_SHORT_PWR_BTN: "Short Power Button Click"
|
||||||
STR_ORIENTATION: "Reading Orientation"
|
STR_ORIENTATION: "Reading Orientation"
|
||||||
STR_SIDE_BTN_LAYOUT: "Side Button Layout (reader)"
|
STR_SIDE_BTN_LAYOUT: "Side Button Layout (reader)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Touch Reader Controls"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orient front buttons"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orient front buttons"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
||||||
@@ -139,7 +140,6 @@ STR_FORCE_REFRESH: "Refresh Screen"
|
|||||||
STR_PORTRAIT: "Portrait"
|
STR_PORTRAIT: "Portrait"
|
||||||
STR_LANDSCAPE_CW: "Landscape CW"
|
STR_LANDSCAPE_CW: "Landscape CW"
|
||||||
STR_INVERTED: "Inverted"
|
STR_INVERTED: "Inverted"
|
||||||
STR_ORIENTATION_INVERTED: "Portrait 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Landscape CCW"
|
STR_LANDSCAPE_CCW: "Landscape CCW"
|
||||||
STR_PREV_NEXT: "Prev/Next"
|
STR_PREV_NEXT: "Prev/Next"
|
||||||
STR_NEXT_PREV: "Next/Prev"
|
STR_NEXT_PREV: "Next/Prev"
|
||||||
@@ -180,7 +180,8 @@ STR_DOWNLOADING: "Downloading..."
|
|||||||
STR_DOWNLOAD_FAILED: "Download failed"
|
STR_DOWNLOAD_FAILED: "Download failed"
|
||||||
STR_ERROR_MSG: "Error:"
|
STR_ERROR_MSG: "Error:"
|
||||||
STR_UNNAMED: "Unnamed"
|
STR_UNNAMED: "Unnamed"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Hold Open to Delete"
|
STR_HOLD_CONFIRM_TO_DELETE: "Hold Confirm to Delete"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Hold Confirm from the reader to create a bookmark."
|
||||||
STR_NO_SERVER_URL: "No server URL configured"
|
STR_NO_SERVER_URL: "No server URL configured"
|
||||||
STR_FETCH_FEED_FAILED: "Failed to fetch feed"
|
STR_FETCH_FEED_FAILED: "Failed to fetch feed"
|
||||||
STR_PARSE_FEED_FAILED: "Failed to parse feed"
|
STR_PARSE_FEED_FAILED: "Failed to parse feed"
|
||||||
@@ -198,7 +199,6 @@ STR_HOME: "« Home"
|
|||||||
STR_SELECT: "Select"
|
STR_SELECT: "Select"
|
||||||
STR_SELECTED: "Selected"
|
STR_SELECTED: "Selected"
|
||||||
STR_TOGGLE: "Toggle"
|
STR_TOGGLE: "Toggle"
|
||||||
STR_TOGGLE_BOOKMARK: "Toggle Bookmark"
|
|
||||||
STR_CONFIRM: "Confirm"
|
STR_CONFIRM: "Confirm"
|
||||||
STR_CANCEL: "Cancel"
|
STR_CANCEL: "Cancel"
|
||||||
STR_CONNECT: "Connect"
|
STR_CONNECT: "Connect"
|
||||||
@@ -261,7 +261,6 @@ STR_SUNLIGHT_FADING_FIX: "Sunlight Fading Fix"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Remap Front Buttons"
|
STR_REMAP_FRONT_BUTTONS: "Remap Front Buttons"
|
||||||
STR_BOOKMARKS: "Bookmarks"
|
STR_BOOKMARKS: "Bookmarks"
|
||||||
STR_BOOKMARK_ADDED: "Bookmark added."
|
STR_BOOKMARK_ADDED: "Bookmark added."
|
||||||
STR_BOOKMARK_REMOVED: "Bookmark removed."
|
|
||||||
STR_OPDS_BROWSER: "OPDS Browser"
|
STR_OPDS_BROWSER: "OPDS Browser"
|
||||||
STR_SEARCH: "Search"
|
STR_SEARCH: "Search"
|
||||||
STR_COVER_CUSTOM: "Cover + Custom"
|
STR_COVER_CUSTOM: "Cover + Custom"
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ STR_TEXT_AA: "Tekstin reunanpehmennys"
|
|||||||
STR_SHORT_PWR_BTN: "Lyhyt virtapainikkeen painallus"
|
STR_SHORT_PWR_BTN: "Lyhyt virtapainikkeen painallus"
|
||||||
STR_ORIENTATION: "Lukusuunta"
|
STR_ORIENTATION: "Lukusuunta"
|
||||||
STR_SIDE_BTN_LAYOUT: "Sivupainikkeiden asettelu (lukija)"
|
STR_SIDE_BTN_LAYOUT: "Sivupainikkeiden asettelu (lukija)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Kosketusohjaus (lukija)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Suuntaa etupainikkeet"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Suuntaa etupainikkeet"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
||||||
@@ -130,8 +131,7 @@ STR_SLEEP: "Lepotila"
|
|||||||
STR_PAGE_TURN: "Sivunkääntö"
|
STR_PAGE_TURN: "Sivunkääntö"
|
||||||
STR_PORTRAIT: "Pysty"
|
STR_PORTRAIT: "Pysty"
|
||||||
STR_LANDSCAPE_CW: "Vaaka myötäpäivään"
|
STR_LANDSCAPE_CW: "Vaaka myötäpäivään"
|
||||||
STR_INVERTED: "Käänteinen"
|
STR_INVERTED: "Käännetty"
|
||||||
STR_ORIENTATION_INVERTED: "Pysty 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Vaaka vastapäivään"
|
STR_LANDSCAPE_CCW: "Vaaka vastapäivään"
|
||||||
STR_PREV_NEXT: "Edell/Seur"
|
STR_PREV_NEXT: "Edell/Seur"
|
||||||
STR_NEXT_PREV: "Seur/Edell"
|
STR_NEXT_PREV: "Seur/Edell"
|
||||||
@@ -182,9 +182,6 @@ STR_EXIT: "« Poistu"
|
|||||||
STR_HOME: "« Koti"
|
STR_HOME: "« Koti"
|
||||||
STR_SELECT: "Valitse"
|
STR_SELECT: "Valitse"
|
||||||
STR_TOGGLE: "Vaihda"
|
STR_TOGGLE: "Vaihda"
|
||||||
STR_TOGGLE_BOOKMARK: "Vaihda kirjanmerkki"
|
|
||||||
STR_BOOKMARK_REMOVED: "Kirjanmerkki poistettu."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Pidä Avaa painettuna poistaaksesi"
|
|
||||||
STR_CONFIRM: "Vahvista"
|
STR_CONFIRM: "Vahvista"
|
||||||
STR_CANCEL: "Peruuta"
|
STR_CANCEL: "Peruuta"
|
||||||
STR_CONNECT: "Yhdistä"
|
STR_CONNECT: "Yhdistä"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Masquer"
|
|||||||
STR_SHORT_PWR_BTN: "Appui court alim."
|
STR_SHORT_PWR_BTN: "Appui court alim."
|
||||||
STR_ORIENTATION: "Orientation de lecture"
|
STR_ORIENTATION: "Orientation de lecture"
|
||||||
STR_SIDE_BTN_LAYOUT: "Boutons latéraux"
|
STR_SIDE_BTN_LAYOUT: "Boutons latéraux"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Commandes tactiles (lecteur)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orienter boutons avant"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orienter boutons avant"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportement lors d'un appui long"
|
STR_LONG_PRESS_BEHAVIOR: "Comportement lors d'un appui long"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Désactivé"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Désactivé"
|
||||||
@@ -136,7 +137,6 @@ STR_PAGE_TURN: "Page suivante"
|
|||||||
STR_PORTRAIT: "Portrait"
|
STR_PORTRAIT: "Portrait"
|
||||||
STR_LANDSCAPE_CW: "Paysage"
|
STR_LANDSCAPE_CW: "Paysage"
|
||||||
STR_INVERTED: "Inversé"
|
STR_INVERTED: "Inversé"
|
||||||
STR_ORIENTATION_INVERTED: "Portrait 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Paysage inversé"
|
STR_LANDSCAPE_CCW: "Paysage inversé"
|
||||||
STR_PREV_NEXT: "Préc/Suiv"
|
STR_PREV_NEXT: "Préc/Suiv"
|
||||||
STR_NEXT_PREV: "Suiv/Préc"
|
STR_NEXT_PREV: "Suiv/Préc"
|
||||||
@@ -188,9 +188,6 @@ STR_HOME: "« Accueil"
|
|||||||
STR_SELECT: "OK"
|
STR_SELECT: "OK"
|
||||||
STR_SELECTED: "Sélectionné"
|
STR_SELECTED: "Sélectionné"
|
||||||
STR_TOGGLE: "Modifier"
|
STR_TOGGLE: "Modifier"
|
||||||
STR_TOGGLE_BOOKMARK: "Basculer le marque-page"
|
|
||||||
STR_BOOKMARK_REMOVED: "Marque-page supprimé."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Maintenir Ouvrir pour supprimer"
|
|
||||||
STR_CONFIRM: "Confirmer"
|
STR_CONFIRM: "Confirmer"
|
||||||
STR_CANCEL: "Annuler"
|
STR_CANCEL: "Annuler"
|
||||||
STR_CONNECT: "Connecter"
|
STR_CONNECT: "Connecter"
|
||||||
|
|||||||
@@ -68,9 +68,10 @@ STR_TEXT_AA: "Schriftglättung"
|
|||||||
STR_SHORT_PWR_BTN: "An-Taste kurz drücken"
|
STR_SHORT_PWR_BTN: "An-Taste kurz drücken"
|
||||||
STR_ORIENTATION: "Leseausrichtung"
|
STR_ORIENTATION: "Leseausrichtung"
|
||||||
STR_SIDE_BTN_LAYOUT: "Seitliche Tasten (Lesen)"
|
STR_SIDE_BTN_LAYOUT: "Seitliche Tasten (Lesen)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Touch-Steuerung (Lesen)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Vordere Tasten ausrichten"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Vordere Tasten ausrichten"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Verhalten bei langem Tastendruck"
|
STR_LONG_PRESS_BEHAVIOR: "Verhalten bei langem Tastendruck"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Aus"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "AUS"
|
||||||
STR_LONG_PRESS_BEHAVIOR_SKIP: "Kapitel überspringen"
|
STR_LONG_PRESS_BEHAVIOR_SKIP: "Kapitel überspringen"
|
||||||
STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Ausrichtung ändern"
|
STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Ausrichtung ändern"
|
||||||
STR_FONT_PREVIEW_TEXT: "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich"
|
STR_FONT_PREVIEW_TEXT: "Victor jagt zwölf Boxkämpfer quer über den großen Sylter Deich"
|
||||||
@@ -79,9 +80,8 @@ STR_FONT_SIZE: "Schriftgröße"
|
|||||||
STR_LINE_SPACING: "Lese-Zeilenabstand"
|
STR_LINE_SPACING: "Lese-Zeilenabstand"
|
||||||
STR_SCREEN_MARGIN: "Lese-Seitenränder"
|
STR_SCREEN_MARGIN: "Lese-Seitenränder"
|
||||||
STR_PARA_ALIGNMENT: "Lese-Absatzausrichtung"
|
STR_PARA_ALIGNMENT: "Lese-Absatzausrichtung"
|
||||||
STR_LONG_PRESS_MENU: "Menütaste lang drücken"
|
|
||||||
STR_HYPHENATION: "Silbentrennung"
|
STR_HYPHENATION: "Silbentrennung"
|
||||||
STR_TIME_TO_SLEEP: "Standby-Modus nach"
|
STR_TIME_TO_SLEEP: "Standby nach"
|
||||||
STR_REFRESH_FREQ: "Anti-Ghosting nach"
|
STR_REFRESH_FREQ: "Anti-Ghosting nach"
|
||||||
STR_KOREADER_SYNC: "KOReader-Synchr."
|
STR_KOREADER_SYNC: "KOReader-Synchr."
|
||||||
STR_CHECK_UPDATES: "Nach Updates suchen"
|
STR_CHECK_UPDATES: "Nach Updates suchen"
|
||||||
@@ -130,8 +130,7 @@ STR_PAGE_TURN: "Umblättern"
|
|||||||
STR_FORCE_REFRESH: "Bildschirm regenerieren"
|
STR_FORCE_REFRESH: "Bildschirm regenerieren"
|
||||||
STR_PORTRAIT: "Hochformat"
|
STR_PORTRAIT: "Hochformat"
|
||||||
STR_LANDSCAPE_CW: "Querformat rechts"
|
STR_LANDSCAPE_CW: "Querformat rechts"
|
||||||
STR_INVERTED: "Invertiert"
|
STR_INVERTED: "Hochformat 180°"
|
||||||
STR_ORIENTATION_INVERTED: "Hochformat 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Querformat links"
|
STR_LANDSCAPE_CCW: "Querformat links"
|
||||||
STR_PREV_NEXT: "Zurück/Weiter"
|
STR_PREV_NEXT: "Zurück/Weiter"
|
||||||
STR_NEXT_PREV: "Weiter/Zurück"
|
STR_NEXT_PREV: "Weiter/Zurück"
|
||||||
@@ -170,7 +169,8 @@ STR_DOWNLOADING: "Herunterladen…"
|
|||||||
STR_DOWNLOAD_FAILED: "Ladefehler"
|
STR_DOWNLOAD_FAILED: "Ladefehler"
|
||||||
STR_ERROR_MSG: "Fehler:"
|
STR_ERROR_MSG: "Fehler:"
|
||||||
STR_UNNAMED: "Unbenannt"
|
STR_UNNAMED: "Unbenannt"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Halte Öffnen zum Löschen"
|
STR_HOLD_CONFIRM_TO_DELETE: "Halte Bestätigen zum Löschen"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Halte Bestätigen im Lesemodus um ein Lesezeichen anzulegen."
|
||||||
STR_NO_SERVER_URL: "Keine Server-URL konfiguriert"
|
STR_NO_SERVER_URL: "Keine Server-URL konfiguriert"
|
||||||
STR_FETCH_FEED_FAILED: "Feedfehler"
|
STR_FETCH_FEED_FAILED: "Feedfehler"
|
||||||
STR_PARSE_FEED_FAILED: "Feed-Format ungültig"
|
STR_PARSE_FEED_FAILED: "Feed-Format ungültig"
|
||||||
@@ -188,7 +188,6 @@ STR_HOME: "« Start"
|
|||||||
STR_SELECT: "Auswahl"
|
STR_SELECT: "Auswahl"
|
||||||
STR_SELECTED: "Ausgewählt"
|
STR_SELECTED: "Ausgewählt"
|
||||||
STR_TOGGLE: "Ändern"
|
STR_TOGGLE: "Ändern"
|
||||||
STR_TOGGLE_BOOKMARK: "Lesezeichen umschalten"
|
|
||||||
STR_CONFIRM: "Bestätigen"
|
STR_CONFIRM: "Bestätigen"
|
||||||
STR_CANCEL: "Abbrechen"
|
STR_CANCEL: "Abbrechen"
|
||||||
STR_CONNECT: "Verbinden"
|
STR_CONNECT: "Verbinden"
|
||||||
@@ -252,7 +251,6 @@ STR_QUICK_RESUME_TIMEOUT: "Schnelles Fortsetzen nach Timeout"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Vordere Tasten belegen"
|
STR_REMAP_FRONT_BUTTONS: "Vordere Tasten belegen"
|
||||||
STR_BOOKMARKS: "Lesezeichen"
|
STR_BOOKMARKS: "Lesezeichen"
|
||||||
STR_BOOKMARK_ADDED: "Lesezeichen hinzugefügt."
|
STR_BOOKMARK_ADDED: "Lesezeichen hinzugefügt."
|
||||||
STR_BOOKMARK_REMOVED: "Lesezeichen entfernt."
|
|
||||||
STR_SEARCH: "Suche"
|
STR_SEARCH: "Suche"
|
||||||
STR_OPDS_BROWSER: "OPDS-Browser"
|
STR_OPDS_BROWSER: "OPDS-Browser"
|
||||||
STR_COVER_CUSTOM: "Cover + Eigenes"
|
STR_COVER_CUSTOM: "Cover + Eigenes"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "הסתר תמונות"
|
|||||||
STR_SHORT_PWR_BTN: "לחיצה קצרה על כפתור ההפעלה"
|
STR_SHORT_PWR_BTN: "לחיצה קצרה על כפתור ההפעלה"
|
||||||
STR_ORIENTATION: "כיוון קריאה (מסך)"
|
STR_ORIENTATION: "כיוון קריאה (מסך)"
|
||||||
STR_SIDE_BTN_LAYOUT: "פריסת כפתורי צד (בקריאה)"
|
STR_SIDE_BTN_LAYOUT: "פריסת כפתורי צד (בקריאה)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "פקדי מגע בקריאה"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "פעולת לחיצה ארוכה"
|
STR_LONG_PRESS_BEHAVIOR: "פעולת לחיצה ארוכה"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "כבוי"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "כבוי"
|
||||||
STR_LONG_PRESS_BEHAVIOR_SKIP: "דלג פרק"
|
STR_LONG_PRESS_BEHAVIOR_SKIP: "דלג פרק"
|
||||||
@@ -134,8 +135,7 @@ STR_PAGE_TURN: "העברת דף"
|
|||||||
STR_FORCE_REFRESH: "רענון מסך מלא"
|
STR_FORCE_REFRESH: "רענון מסך מלא"
|
||||||
STR_PORTRAIT: "לאורך"
|
STR_PORTRAIT: "לאורך"
|
||||||
STR_LANDSCAPE_CW: "לרוחב (ימינה)"
|
STR_LANDSCAPE_CW: "לרוחב (ימינה)"
|
||||||
STR_INVERTED: "היפוך צבעים"
|
STR_INVERTED: "הפוך"
|
||||||
STR_ORIENTATION_INVERTED: "לאורך 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "לרוחב (שמאלה)"
|
STR_LANDSCAPE_CCW: "לרוחב (שמאלה)"
|
||||||
STR_PREV_NEXT: "הקודם/הבא"
|
STR_PREV_NEXT: "הקודם/הבא"
|
||||||
STR_NEXT_PREV: "הבא/הקודם"
|
STR_NEXT_PREV: "הבא/הקודם"
|
||||||
@@ -190,7 +190,6 @@ STR_HOME: "מסך הבית »"
|
|||||||
STR_SELECT: "בחר"
|
STR_SELECT: "בחר"
|
||||||
STR_SELECTED: "נבחר"
|
STR_SELECTED: "נבחר"
|
||||||
STR_TOGGLE: "בחר"
|
STR_TOGGLE: "בחר"
|
||||||
STR_TOGGLE_BOOKMARK: "הוסף/הסר סימנייה"
|
|
||||||
STR_CONFIRM: "אישור"
|
STR_CONFIRM: "אישור"
|
||||||
STR_CANCEL: "ביטול"
|
STR_CANCEL: "ביטול"
|
||||||
STR_CONNECT: "התחבר"
|
STR_CONNECT: "התחבר"
|
||||||
@@ -362,7 +361,8 @@ STR_FRONT_BTN_FOLLOW_ORIENTATION: "התאמת לחצנים קדמיים לכיו
|
|||||||
STR_REMOVE_READ_FROM_RECENTS: "הסר ספרים שנקראו מרשימת האחרונים"
|
STR_REMOVE_READ_FROM_RECENTS: "הסר ספרים שנקראו מרשימת האחרונים"
|
||||||
STR_MOVE_FINISHED_TO_READ: "העבר ספרים שהסתיימו לתיקיית 'נקראו'"
|
STR_MOVE_FINISHED_TO_READ: "העבר ספרים שהסתיימו לתיקיית 'נקראו'"
|
||||||
STR_DISABLED: "מבוטל"
|
STR_DISABLED: "מבוטל"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "לחיצה ארוכה על 'פתח' כדי למחוק"
|
STR_HOLD_CONFIRM_TO_DELETE: "החזק לחוץ על אישור כדי למחוק"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "החזק לחוץ על כפתור אישור בזמן הקריאה כדי להוסיף סימנייה"
|
||||||
STR_CLOCK: "שעון"
|
STR_CLOCK: "שעון"
|
||||||
STR_CLOCK_UTC_OFFSET: "הפרש זמן UTC"
|
STR_CLOCK_UTC_OFFSET: "הפרש זמן UTC"
|
||||||
STR_CLOCK_FORMAT: "תבנית השעון"
|
STR_CLOCK_FORMAT: "תבנית השעון"
|
||||||
@@ -380,14 +380,6 @@ STR_CLOCK_SYNC_NO_WIFI_HINT: "התחבר תחילה לרשת אלחוטית, ו
|
|||||||
STR_CLOCK_SYNCED: "השעון סונכרן"
|
STR_CLOCK_SYNCED: "השעון סונכרן"
|
||||||
STR_BOOKMARKS: "סימניות"
|
STR_BOOKMARKS: "סימניות"
|
||||||
STR_BOOKMARK_ADDED: "הסימנייה התווספה"
|
STR_BOOKMARK_ADDED: "הסימנייה התווספה"
|
||||||
STR_BOOKMARK_REMOVED: "הסימנייה הוסרה"
|
|
||||||
STR_QUICK_RESUME: "חזרה מהירה"
|
STR_QUICK_RESUME: "חזרה מהירה"
|
||||||
STR_REMOVE_FROM_RECENTS: "להסיר מרשימת הספרים האחרונים?"
|
STR_REMOVE_FROM_RECENTS: "להסיר מרשימת הספרים האחרונים?"
|
||||||
STR_CONFIRM_DELETE_BOOKMARK: "למחוק סימנייה זו?"
|
STR_CONFIRM_DELETE_BOOKMARK: "למחוק סימנייה זו?"
|
||||||
STR_LONG_PRESS_MENU: "לחיצה ארוכה על אישור"
|
|
||||||
STR_KOSYNC: "KOSync"
|
|
||||||
STR_BOOKMARK_OPTION: "סימנייה"
|
|
||||||
STR_PWR_BTN_FOOTNOTE_BACK: "חזרה מהירה מהערות שוליים"
|
|
||||||
STR_SLEEP_TIMER_VALUE_FORMAT: "%u דקות"
|
|
||||||
STR_SLEEP_NEVER: "אף פעם"
|
|
||||||
STR_SLEEP_TIMER_STEP_HINT: "שמאל/ימין: 1 דק' למעלה/למטה: 5 דק'"
|
|
||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Elnyomás"
|
|||||||
STR_SHORT_PWR_BTN: "Rövid bekapcsológomb nyomás"
|
STR_SHORT_PWR_BTN: "Rövid bekapcsológomb nyomás"
|
||||||
STR_ORIENTATION: "Olvasási irány"
|
STR_ORIENTATION: "Olvasási irány"
|
||||||
STR_SIDE_BTN_LAYOUT: "Oldalsó gomb elrendezés (olvasó)"
|
STR_SIDE_BTN_LAYOUT: "Oldalsó gomb elrendezés (olvasó)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Érintőképernyős vezérlés (olvasó)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Elülső gombok tájolása"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Elülső gombok tájolása"
|
||||||
STR_LONG_PRESS_SKIP: "Hosszú nyomás - fejezet ugrás"
|
STR_LONG_PRESS_SKIP: "Hosszú nyomás - fejezet ugrás"
|
||||||
STR_FONT_PREVIEW_TEXT: "Egy hűtlen vejét fülöncsípő, dühös mexikói úr Wesselényinél mázol Quitóban"
|
STR_FONT_PREVIEW_TEXT: "Egy hűtlen vejét fülöncsípő, dühös mexikói úr Wesselényinél mázol Quitóban"
|
||||||
@@ -132,8 +133,7 @@ STR_SLEEP: "Alvás"
|
|||||||
STR_PAGE_TURN: "Lapozás"
|
STR_PAGE_TURN: "Lapozás"
|
||||||
STR_PORTRAIT: "Álló"
|
STR_PORTRAIT: "Álló"
|
||||||
STR_LANDSCAPE_CW: "Fekvő jobbra"
|
STR_LANDSCAPE_CW: "Fekvő jobbra"
|
||||||
STR_INVERTED: "Invertált"
|
STR_INVERTED: "Fordított"
|
||||||
STR_ORIENTATION_INVERTED: "Álló 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Fekvő balra"
|
STR_LANDSCAPE_CCW: "Fekvő balra"
|
||||||
STR_PREV_NEXT: "Előző/Következő"
|
STR_PREV_NEXT: "Előző/Következő"
|
||||||
STR_NEXT_PREV: "Következő/Előző"
|
STR_NEXT_PREV: "Következő/Előző"
|
||||||
@@ -185,9 +185,6 @@ STR_HOME: "« Főoldal"
|
|||||||
STR_SELECT: "Kiválasztás"
|
STR_SELECT: "Kiválasztás"
|
||||||
STR_SELECTED: "Kiválasztva"
|
STR_SELECTED: "Kiválasztva"
|
||||||
STR_TOGGLE: "Váltás"
|
STR_TOGGLE: "Váltás"
|
||||||
STR_TOGGLE_BOOKMARK: "Könyvjelző váltása"
|
|
||||||
STR_BOOKMARK_REMOVED: "Könyvjelző eltávolítva."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Tartsa lenyomva a Megnyitás gombot a törléshez"
|
|
||||||
STR_CONFIRM: "Megerősítés"
|
STR_CONFIRM: "Megerősítés"
|
||||||
STR_CANCEL: "Mégse"
|
STR_CANCEL: "Mégse"
|
||||||
STR_CONNECT: "Csatlakozás"
|
STR_CONNECT: "Csatlakozás"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Nascondi"
|
|||||||
STR_SHORT_PWR_BTN: "Press. breve pul. accensione"
|
STR_SHORT_PWR_BTN: "Press. breve pul. accensione"
|
||||||
STR_ORIENTATION: "Orientamento lettura"
|
STR_ORIENTATION: "Orientamento lettura"
|
||||||
STR_SIDE_BTN_LAYOUT: "Pul. laterali (lettore)"
|
STR_SIDE_BTN_LAYOUT: "Pul. laterali (lettore)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Controlli touch (lettore)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orienta pul. frontali"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orienta pul. frontali"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Press. lunga pul. laterali"
|
STR_LONG_PRESS_BEHAVIOR: "Press. lunga pul. laterali"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
||||||
@@ -137,8 +138,7 @@ STR_PAGE_TURN: "Cambio pagina"
|
|||||||
STR_FORCE_REFRESH: "Refresh"
|
STR_FORCE_REFRESH: "Refresh"
|
||||||
STR_PORTRAIT: "Verticale"
|
STR_PORTRAIT: "Verticale"
|
||||||
STR_LANDSCAPE_CW: "Orizzontale Dx"
|
STR_LANDSCAPE_CW: "Orizzontale Dx"
|
||||||
STR_INVERTED: "Invertito"
|
STR_INVERTED: "Capovolto"
|
||||||
STR_ORIENTATION_INVERTED: "Verticale 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Orizzontale Sx"
|
STR_LANDSCAPE_CCW: "Orizzontale Sx"
|
||||||
STR_PREV_NEXT: "Prec/Succ"
|
STR_PREV_NEXT: "Prec/Succ"
|
||||||
STR_NEXT_PREV: "Succ/Prec"
|
STR_NEXT_PREV: "Succ/Prec"
|
||||||
@@ -193,7 +193,6 @@ STR_HOME: "« Home"
|
|||||||
STR_SELECT: "Seleziona"
|
STR_SELECT: "Seleziona"
|
||||||
STR_SELECTED: "Selezionato"
|
STR_SELECTED: "Selezionato"
|
||||||
STR_TOGGLE: "Cambia"
|
STR_TOGGLE: "Cambia"
|
||||||
STR_TOGGLE_BOOKMARK: "Attiva/disattiva segnalibro"
|
|
||||||
STR_CONFIRM: "Conferma"
|
STR_CONFIRM: "Conferma"
|
||||||
STR_CANCEL: "Annulla"
|
STR_CANCEL: "Annulla"
|
||||||
STR_CONNECT: "Connetti"
|
STR_CONNECT: "Connetti"
|
||||||
@@ -359,9 +358,9 @@ STR_FIRMWARE_WRITE_FAILED: "Aggiornamento firmware non riuscito"
|
|||||||
STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Non spegnere il dispositivo!"
|
STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Non spegnere il dispositivo!"
|
||||||
STR_RECOVERY_MODE: "Modalità ripristino"
|
STR_RECOVERY_MODE: "Modalità ripristino"
|
||||||
STR_RECOVERY_MODE_HINT: "Metti firmware.bin nella scheda SD e selezionalo"
|
STR_RECOVERY_MODE_HINT: "Metti firmware.bin nella scheda SD e selezionalo"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Tieni premuto Conferma nel lettore per creare un segnalibro"
|
||||||
STR_BOOKMARKS: "Segnalibri"
|
STR_BOOKMARKS: "Segnalibri"
|
||||||
STR_BOOKMARK_ADDED: "Segnalibro aggiunto"
|
STR_BOOKMARK_ADDED: "Segnalibro aggiunto"
|
||||||
STR_BOOKMARK_REMOVED: "Segnalibro rimosso"
|
|
||||||
STR_CONFIRM_DELETE_BOOKMARK: "Eliminare questo segnalibro?"
|
STR_CONFIRM_DELETE_BOOKMARK: "Eliminare questo segnalibro?"
|
||||||
STR_CLOCK_SYNC_NO_WIFI_HINT: "Connettiti prima al Wi-Fi e poi riprova"
|
STR_CLOCK_SYNC_NO_WIFI_HINT: "Connettiti prima al Wi-Fi e poi riprova"
|
||||||
STR_CLOCK_SYNC_OK: "Orologio sincronizzato"
|
STR_CLOCK_SYNC_OK: "Orologio sincronizzato"
|
||||||
@@ -376,10 +375,10 @@ STR_CLOCK_SYNCING: "Sincronizzazione con il server NTP..."
|
|||||||
STR_CLOCK_SYNC_FAIL: "Sincronizzazione non riuscita"
|
STR_CLOCK_SYNC_FAIL: "Sincronizzazione non riuscita"
|
||||||
STR_CLOCK_SYNC_NOW: "Sincronizza l'orologio adesso"
|
STR_CLOCK_SYNC_NOW: "Sincronizza l'orologio adesso"
|
||||||
STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi non connesso"
|
STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi non connesso"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Tieni premuto Apri per eliminare"
|
STR_HOLD_CONFIRM_TO_DELETE: "Tieni premuto Conferma per cancellare"
|
||||||
STR_NEXT_FIELD: "Succ."
|
STR_NEXT_FIELD: "Succ."
|
||||||
STR_CURRENT_TIME: "Ora attuale: "
|
STR_CURRENT_TIME: "Ora attuale: "
|
||||||
STR_DISABLED: "Disattivato"
|
STR_DISABLED: "Disattivato"
|
||||||
STR_BOOKMARK_OPTION: "Segnalibro"
|
STR_BOOKMARK_OPTION: "Segnalibro"
|
||||||
STR_KOSYNC: "KOSync"
|
STR_KOSYNC: "KOSync"
|
||||||
STR_PWR_BTN_FOOTNOTE_BACK: "Rientro rapido dalle note"
|
STR_PWR_BTN_FOOTNOTE_BACK: "Rientro rapido dalle note"
|
||||||
@@ -67,6 +67,7 @@ STR_TEXT_AA: "Мәтін сырғытпасы"
|
|||||||
STR_SHORT_PWR_BTN: "Қуат түймесін қысқа басу"
|
STR_SHORT_PWR_BTN: "Қуат түймесін қысқа басу"
|
||||||
STR_ORIENTATION: "Оқу бағдары"
|
STR_ORIENTATION: "Оқу бағдары"
|
||||||
STR_SIDE_BTN_LAYOUT: "Бүйірлік түймелер орналасуы (оқырман)"
|
STR_SIDE_BTN_LAYOUT: "Бүйірлік түймелер орналасуы (оқырман)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Сенсорлық басқару (оқырман)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Алдыңғы түймелерді бағдарлау"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Алдыңғы түймелерді бағдарлау"
|
||||||
STR_LONG_PRESS_SKIP: "Ұзақ басу арқылы тарау өткізу"
|
STR_LONG_PRESS_SKIP: "Ұзақ басу арқылы тарау өткізу"
|
||||||
STR_FONT_PREVIEW_TEXT: "Канагаттандырылмагандыктарыныздан"
|
STR_FONT_PREVIEW_TEXT: "Канагаттандырылмагандыктарыныздан"
|
||||||
@@ -126,8 +127,7 @@ STR_SLEEP: "Ұйқы"
|
|||||||
STR_PAGE_TURN: "Бет аудару"
|
STR_PAGE_TURN: "Бет аудару"
|
||||||
STR_PORTRAIT: "Тік бағдар"
|
STR_PORTRAIT: "Тік бағдар"
|
||||||
STR_LANDSCAPE_CW: "Көлденең (сағат бағытымен)"
|
STR_LANDSCAPE_CW: "Көлденең (сағат бағытымен)"
|
||||||
STR_INVERTED: "Инверсия"
|
STR_INVERTED: "Төңкерілген"
|
||||||
STR_ORIENTATION_INVERTED: "Тік бағдар 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Көлденең (сағат тіліне қарсы)"
|
STR_LANDSCAPE_CCW: "Көлденең (сағат тіліне қарсы)"
|
||||||
STR_PREV_NEXT: "Алдыңғы/Келесі"
|
STR_PREV_NEXT: "Алдыңғы/Келесі"
|
||||||
STR_NEXT_PREV: "Келесі/Алдыңғы"
|
STR_NEXT_PREV: "Келесі/Алдыңғы"
|
||||||
@@ -178,9 +178,6 @@ STR_EXIT: "« Шығу"
|
|||||||
STR_HOME: "« Басты"
|
STR_HOME: "« Басты"
|
||||||
STR_SELECT: "Таңдау"
|
STR_SELECT: "Таңдау"
|
||||||
STR_TOGGLE: "Ауыстыру"
|
STR_TOGGLE: "Ауыстыру"
|
||||||
STR_TOGGLE_BOOKMARK: "Бетбелгіні ауыстыру"
|
|
||||||
STR_BOOKMARK_REMOVED: "Бетбелгі жойылды."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Жою үшін Ашу түймесін ұстап тұрыңыз"
|
|
||||||
STR_CONFIRM: "Растау"
|
STR_CONFIRM: "Растау"
|
||||||
STR_CANCEL: "Болдырмау"
|
STR_CANCEL: "Болдырмау"
|
||||||
STR_CONNECT: "Қосылу"
|
STR_CONNECT: "Қосылу"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Slėpti"
|
|||||||
STR_SHORT_PWR_BTN: "Trumpas įjungimo pasp."
|
STR_SHORT_PWR_BTN: "Trumpas įjungimo pasp."
|
||||||
STR_ORIENTATION: "Orientacija"
|
STR_ORIENTATION: "Orientacija"
|
||||||
STR_SIDE_BTN_LAYOUT: "Šoniniai mygtukai"
|
STR_SIDE_BTN_LAYOUT: "Šoniniai mygtukai"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Liečiamasis valdymas (skaityklė)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientuoti priekinius mygtukus"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientuoti priekinius mygtukus"
|
||||||
STR_LONG_PRESS_SKIP: "Praleisti skyrių (ilgai)"
|
STR_LONG_PRESS_SKIP: "Praleisti skyrių (ilgai)"
|
||||||
STR_FONT_PREVIEW_TEXT: "Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą"
|
STR_FONT_PREVIEW_TEXT: "Įlinkdama fechtuotojo špaga sublykčiojusi pragręžė apvalų arbūzą"
|
||||||
@@ -132,8 +133,7 @@ STR_SLEEP: "Miegas"
|
|||||||
STR_PAGE_TURN: "Versti psl."
|
STR_PAGE_TURN: "Versti psl."
|
||||||
STR_PORTRAIT: "Stačias"
|
STR_PORTRAIT: "Stačias"
|
||||||
STR_LANDSCAPE_CW: "Gulsčias (P)"
|
STR_LANDSCAPE_CW: "Gulsčias (P)"
|
||||||
STR_INVERTED: "Invertuotas"
|
STR_INVERTED: "Apverstas"
|
||||||
STR_ORIENTATION_INVERTED: "Stačias 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Gulsčias (A)"
|
STR_LANDSCAPE_CCW: "Gulsčias (A)"
|
||||||
STR_PREV_NEXT: "Atgal/Pirmyn"
|
STR_PREV_NEXT: "Atgal/Pirmyn"
|
||||||
STR_NEXT_PREV: "Pirmyn/Atgal"
|
STR_NEXT_PREV: "Pirmyn/Atgal"
|
||||||
@@ -185,9 +185,6 @@ STR_HOME: "« Pradžia"
|
|||||||
STR_SELECT: "Rinktis"
|
STR_SELECT: "Rinktis"
|
||||||
STR_SELECTED: "Pasirinkta"
|
STR_SELECTED: "Pasirinkta"
|
||||||
STR_TOGGLE: "Keisti"
|
STR_TOGGLE: "Keisti"
|
||||||
STR_TOGGLE_BOOKMARK: "Perjungti žymę"
|
|
||||||
STR_BOOKMARK_REMOVED: "Žymė pašalinta."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Laikykite Atidaryti, kad ištrintumėte"
|
|
||||||
STR_CONFIRM: "Gerai"
|
STR_CONFIRM: "Gerai"
|
||||||
STR_CANCEL: "Atšaukti"
|
STR_CANCEL: "Atšaukti"
|
||||||
STR_CONNECT: "Jungtis"
|
STR_CONNECT: "Jungtis"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Pomijaj"
|
|||||||
STR_SHORT_PWR_BTN: "Krótkie naciśnięcie zasilania"
|
STR_SHORT_PWR_BTN: "Krótkie naciśnięcie zasilania"
|
||||||
STR_ORIENTATION: "Układ czytania"
|
STR_ORIENTATION: "Układ czytania"
|
||||||
STR_SIDE_BTN_LAYOUT: "Układ przycisków bocznych"
|
STR_SIDE_BTN_LAYOUT: "Układ przycisków bocznych"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Sterowanie dotykowe (czytnik)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientuj przednie przyciski"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientuj przednie przyciski"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Funkcja długiego przyciśnięcia"
|
STR_LONG_PRESS_BEHAVIOR: "Funkcja długiego przyciśnięcia"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Wył."
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Wył."
|
||||||
@@ -136,8 +137,7 @@ STR_PAGE_TURN: "Nast. str."
|
|||||||
STR_FORCE_REFRESH: "Odśwież ekran"
|
STR_FORCE_REFRESH: "Odśwież ekran"
|
||||||
STR_PORTRAIT: "Pionowo"
|
STR_PORTRAIT: "Pionowo"
|
||||||
STR_LANDSCAPE_CW: "Poziomo P"
|
STR_LANDSCAPE_CW: "Poziomo P"
|
||||||
STR_INVERTED: "Inwersja"
|
STR_INVERTED: "Odwrócony"
|
||||||
STR_ORIENTATION_INVERTED: "Pionowo 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Poziomo L"
|
STR_LANDSCAPE_CCW: "Poziomo L"
|
||||||
STR_PREV_NEXT: "Poprz./Nast."
|
STR_PREV_NEXT: "Poprz./Nast."
|
||||||
STR_NEXT_PREV: "Nast./Poprz."
|
STR_NEXT_PREV: "Nast./Poprz."
|
||||||
@@ -192,9 +192,6 @@ STR_HOME: "« Home"
|
|||||||
STR_SELECT: "Wybierz"
|
STR_SELECT: "Wybierz"
|
||||||
STR_SELECTED: "Wybrano"
|
STR_SELECTED: "Wybrano"
|
||||||
STR_TOGGLE: "Zmień"
|
STR_TOGGLE: "Zmień"
|
||||||
STR_TOGGLE_BOOKMARK: "Przełącz zakładkę"
|
|
||||||
STR_BOOKMARK_REMOVED: "Zakładka usunięta."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Przytrzymaj Otwórz, aby usunąć"
|
|
||||||
STR_CONFIRM: "Potwierdź"
|
STR_CONFIRM: "Potwierdź"
|
||||||
STR_CANCEL: "Anuluj"
|
STR_CANCEL: "Anuluj"
|
||||||
STR_CONNECT: "Połącz"
|
STR_CONNECT: "Połącz"
|
||||||
|
|||||||
@@ -68,6 +68,7 @@ STR_TEXT_AA: "Suavização de texto"
|
|||||||
STR_SHORT_PWR_BTN: "Clique curto botão ligar"
|
STR_SHORT_PWR_BTN: "Clique curto botão ligar"
|
||||||
STR_ORIENTATION: "Orientação de leitura"
|
STR_ORIENTATION: "Orientação de leitura"
|
||||||
STR_SIDE_BTN_LAYOUT: "Disposição botões laterais"
|
STR_SIDE_BTN_LAYOUT: "Disposição botões laterais"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Controlos táteis do leitor"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botões frontais"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botões frontais"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportamento do botão de premir e segurar"
|
STR_LONG_PRESS_BEHAVIOR: "Comportamento do botão de premir e segurar"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Desligado"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Desligado"
|
||||||
@@ -131,7 +132,6 @@ STR_PAGE_TURN: "Virar página"
|
|||||||
STR_PORTRAIT: "Retrato"
|
STR_PORTRAIT: "Retrato"
|
||||||
STR_LANDSCAPE_CW: "Paisagem H"
|
STR_LANDSCAPE_CW: "Paisagem H"
|
||||||
STR_INVERTED: "Invertido"
|
STR_INVERTED: "Invertido"
|
||||||
STR_ORIENTATION_INVERTED: "Retrato 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Paisagem AH"
|
STR_LANDSCAPE_CCW: "Paisagem AH"
|
||||||
STR_PREV_NEXT: "Ant/Próx"
|
STR_PREV_NEXT: "Ant/Próx"
|
||||||
STR_NEXT_PREV: "Próx/Ant"
|
STR_NEXT_PREV: "Próx/Ant"
|
||||||
@@ -182,9 +182,6 @@ STR_EXIT: "« Sair"
|
|||||||
STR_HOME: "« Início"
|
STR_HOME: "« Início"
|
||||||
STR_SELECT: "Escolher"
|
STR_SELECT: "Escolher"
|
||||||
STR_TOGGLE: "Alternar"
|
STR_TOGGLE: "Alternar"
|
||||||
STR_TOGGLE_BOOKMARK: "Alternar marcador"
|
|
||||||
STR_BOOKMARK_REMOVED: "Marcador removido."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Mantenha Abrir pressionado para excluir"
|
|
||||||
STR_CONFIRM: "Confirmar"
|
STR_CONFIRM: "Confirmar"
|
||||||
STR_CANCEL: "Cancelar"
|
STR_CANCEL: "Cancelar"
|
||||||
STR_CONNECT: "Conectar"
|
STR_CONNECT: "Conectar"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Suprimare"
|
|||||||
STR_SHORT_PWR_BTN: "Apăsare scurtă întrerupător"
|
STR_SHORT_PWR_BTN: "Apăsare scurtă întrerupător"
|
||||||
STR_ORIENTATION: "Orientare lectură"
|
STR_ORIENTATION: "Orientare lectură"
|
||||||
STR_SIDE_BTN_LAYOUT: "Aspect butoane laterale (lectură)"
|
STR_SIDE_BTN_LAYOUT: "Aspect butoane laterale (lectură)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Control tactil (lectură)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientare butoane frontale"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientare butoane frontale"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportament buton apăsat lung"
|
STR_LONG_PRESS_BEHAVIOR: "Comportament buton apăsat lung"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Dezactivat"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Dezactivat"
|
||||||
@@ -136,7 +137,6 @@ STR_PAGE_TURN: "Răsfoire pagină"
|
|||||||
STR_PORTRAIT: "Vertical"
|
STR_PORTRAIT: "Vertical"
|
||||||
STR_LANDSCAPE_CW: "Orizontal dreapta"
|
STR_LANDSCAPE_CW: "Orizontal dreapta"
|
||||||
STR_INVERTED: "Invers"
|
STR_INVERTED: "Invers"
|
||||||
STR_ORIENTATION_INVERTED: "Vertical 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Orizontal stânga"
|
STR_LANDSCAPE_CCW: "Orizontal stânga"
|
||||||
STR_PREV_NEXT: "Înainte/Înapoi"
|
STR_PREV_NEXT: "Înainte/Înapoi"
|
||||||
STR_NEXT_PREV: "Înapoi/Înainte"
|
STR_NEXT_PREV: "Înapoi/Înainte"
|
||||||
@@ -188,9 +188,6 @@ STR_HOME: "« Acasă"
|
|||||||
STR_SELECT: "Selectează"
|
STR_SELECT: "Selectează"
|
||||||
STR_SELECTED: "Selectat"
|
STR_SELECTED: "Selectat"
|
||||||
STR_TOGGLE: "Schimbă"
|
STR_TOGGLE: "Schimbă"
|
||||||
STR_TOGGLE_BOOKMARK: "Comută marcajul"
|
|
||||||
STR_BOOKMARK_REMOVED: "Marcaj eliminat."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Țineți apăsat Deschideți pentru a șterge"
|
|
||||||
STR_CONFIRM: "Confirmă"
|
STR_CONFIRM: "Confirmă"
|
||||||
STR_CANCEL: "Anulare"
|
STR_CANCEL: "Anulare"
|
||||||
STR_CONNECT: "Conectare"
|
STR_CONNECT: "Conectare"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Скрыть"
|
|||||||
STR_SHORT_PWR_BTN: "Короткое нажатие PWR"
|
STR_SHORT_PWR_BTN: "Короткое нажатие PWR"
|
||||||
STR_ORIENTATION: "Ориентация чтения"
|
STR_ORIENTATION: "Ориентация чтения"
|
||||||
STR_SIDE_BTN_LAYOUT: "Боковые кнопки"
|
STR_SIDE_BTN_LAYOUT: "Боковые кнопки"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Сенсорное управление чтением"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Ориентировать передние кнопки"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Ориентировать передние кнопки"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Долгое нажатие"
|
STR_LONG_PRESS_BEHAVIOR: "Долгое нажатие"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Ничего"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Ничего"
|
||||||
@@ -140,7 +141,6 @@ STR_FORCE_REFRESH: "Обновление экрана"
|
|||||||
STR_PORTRAIT: "Портрет"
|
STR_PORTRAIT: "Портрет"
|
||||||
STR_LANDSCAPE_CW: "Ландшафт (CW)"
|
STR_LANDSCAPE_CW: "Ландшафт (CW)"
|
||||||
STR_INVERTED: "Инверсия"
|
STR_INVERTED: "Инверсия"
|
||||||
STR_ORIENTATION_INVERTED: "Портрет 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Ландшафт (CCW)"
|
STR_LANDSCAPE_CCW: "Ландшафт (CCW)"
|
||||||
STR_PREV_NEXT: "Назад/Вперёд"
|
STR_PREV_NEXT: "Назад/Вперёд"
|
||||||
STR_NEXT_PREV: "Вперёд/Назад"
|
STR_NEXT_PREV: "Вперёд/Назад"
|
||||||
@@ -181,7 +181,8 @@ STR_DOWNLOADING: "Загрузка..."
|
|||||||
STR_DOWNLOAD_FAILED: "Ошибка загрузки"
|
STR_DOWNLOAD_FAILED: "Ошибка загрузки"
|
||||||
STR_ERROR_MSG: "Ошибка:"
|
STR_ERROR_MSG: "Ошибка:"
|
||||||
STR_UNNAMED: "Без имени"
|
STR_UNNAMED: "Без имени"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Удерживайте Открыть для удаления"
|
STR_HOLD_CONFIRM_TO_DELETE: "Удерживайте ОТКРЫТЬ для удаления закладки"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Удерживайте ВЫБРАТЬ для добавления закладки"
|
||||||
STR_NO_SERVER_URL: "URL сервера не настроен"
|
STR_NO_SERVER_URL: "URL сервера не настроен"
|
||||||
STR_FETCH_FEED_FAILED: "Не удалось получить ленту"
|
STR_FETCH_FEED_FAILED: "Не удалось получить ленту"
|
||||||
STR_PARSE_FEED_FAILED: "Не удалось обработать ленту"
|
STR_PARSE_FEED_FAILED: "Не удалось обработать ленту"
|
||||||
@@ -199,7 +200,6 @@ STR_HOME: "« Главная"
|
|||||||
STR_SELECT: "Выбрать"
|
STR_SELECT: "Выбрать"
|
||||||
STR_SELECTED: "Выбран"
|
STR_SELECTED: "Выбран"
|
||||||
STR_TOGGLE: "Выбор"
|
STR_TOGGLE: "Выбор"
|
||||||
STR_TOGGLE_BOOKMARK: "Переключить закладку"
|
|
||||||
STR_CONFIRM: "Подтв."
|
STR_CONFIRM: "Подтв."
|
||||||
STR_CANCEL: "Отмена"
|
STR_CANCEL: "Отмена"
|
||||||
STR_CONNECT: "Подкл."
|
STR_CONNECT: "Подкл."
|
||||||
@@ -262,7 +262,6 @@ STR_SUNLIGHT_FADING_FIX: "Компенсация выцветания"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Переназначить передние кнопки"
|
STR_REMAP_FRONT_BUTTONS: "Переназначить передние кнопки"
|
||||||
STR_BOOKMARKS: "Закладки"
|
STR_BOOKMARKS: "Закладки"
|
||||||
STR_BOOKMARK_ADDED: "Закладка добавлена"
|
STR_BOOKMARK_ADDED: "Закладка добавлена"
|
||||||
STR_BOOKMARK_REMOVED: "Закладка удалена"
|
|
||||||
STR_OPDS_BROWSER: "OPDS браузер"
|
STR_OPDS_BROWSER: "OPDS браузер"
|
||||||
STR_SEARCH: "Поиск"
|
STR_SEARCH: "Поиск"
|
||||||
STR_COVER_CUSTOM: "Обложка + Свой"
|
STR_COVER_CUSTOM: "Обложка + Свой"
|
||||||
|
|||||||
+377
-378
@@ -1,381 +1,380 @@
|
|||||||
_language_name: "Slovenčina"
|
_language_name: "Slovenčina"
|
||||||
_language_code: "SK"
|
_language_code: "SK"
|
||||||
_order: "24"
|
_order: "24"
|
||||||
|
|
||||||
STR_CROSSPOINT: "CrossPoint"
|
STR_CROSSPOINT: "CrossPoint"
|
||||||
STR_BOOTING: "SPÚŠŤANIE"
|
STR_BOOTING: "SPÚŠŤANIE"
|
||||||
STR_SLEEPING: "SPÁNOK"
|
STR_SLEEPING: "SPÁNOK"
|
||||||
STR_ENTERING_SLEEP: "Prechod do režimu spánku"
|
STR_ENTERING_SLEEP: "Prechod do režimu spánku"
|
||||||
STR_BROWSE_FILES: "Prehliadať súbory"
|
STR_BROWSE_FILES: "Prehliadať súbory"
|
||||||
STR_FILE_TRANSFER: "Prenos súborov"
|
STR_FILE_TRANSFER: "Prenos súborov"
|
||||||
STR_SETTINGS_TITLE: "Nastavenia"
|
STR_SETTINGS_TITLE: "Nastavenia"
|
||||||
STR_CONTINUE_READING: "Pokračovať v čítaní"
|
STR_CONTINUE_READING: "Pokračovať v čítaní"
|
||||||
STR_NO_OPEN_BOOK: "Žiadna otvorená kniha"
|
STR_NO_OPEN_BOOK: "Žiadna otvorená kniha"
|
||||||
STR_START_READING: "Začnite čítať nižšie"
|
STR_START_READING: "Začnite čítať nižšie"
|
||||||
STR_NO_FILES_FOUND: "Neboli nájdené žiadne súbory"
|
STR_NO_FILES_FOUND: "Neboli nájdené žiadne súbory"
|
||||||
STR_SELECT_CHAPTER: "Vybrať kapitolu"
|
STR_SELECT_CHAPTER: "Vybrať kapitolu"
|
||||||
STR_NO_CHAPTERS: "Žiadne kapitoly"
|
STR_NO_CHAPTERS: "Žiadne kapitoly"
|
||||||
STR_END_OF_BOOK: "Koniec knihy"
|
STR_END_OF_BOOK: "Koniec knihy"
|
||||||
STR_EMPTY_CHAPTER: "Prázdna kapitola"
|
STR_EMPTY_CHAPTER: "Prázdna kapitola"
|
||||||
STR_INDEXING: "Indexovanie"
|
STR_INDEXING: "Indexovanie"
|
||||||
STR_MEMORY_ERROR: "Chyba pamäte"
|
STR_MEMORY_ERROR: "Chyba pamäte"
|
||||||
STR_PAGE_LOAD_ERROR: "Chyba načítania stránky"
|
STR_PAGE_LOAD_ERROR: "Chyba načítania stránky"
|
||||||
STR_EMPTY_FILE: "Prázdny súbor"
|
STR_EMPTY_FILE: "Prázdny súbor"
|
||||||
STR_OUT_OF_BOUNDS: "Mimo rozsahu"
|
STR_OUT_OF_BOUNDS: "Mimo rozsahu"
|
||||||
STR_LOADING: "Načítava sa..."
|
STR_LOADING: "Načítava sa..."
|
||||||
STR_LOADING_POPUP: "Načítavanie"
|
STR_LOADING_POPUP: "Načítavanie"
|
||||||
STR_WIFI_NETWORKS: "Wi-Fi siete"
|
STR_WIFI_NETWORKS: "Wi-Fi siete"
|
||||||
STR_NO_NETWORKS: "Nenašli sa žiadne siete"
|
STR_NO_NETWORKS: "Nenašli sa žiadne siete"
|
||||||
STR_NETWORKS_FOUND: "Nájdených %zu sietí"
|
STR_NETWORKS_FOUND: "Nájdených %zu sietí"
|
||||||
STR_SCANNING: "Skenovanie..."
|
STR_SCANNING: "Skenovanie..."
|
||||||
STR_CONNECTING: "Pripájanie..."
|
STR_CONNECTING: "Pripájanie..."
|
||||||
STR_CONNECTED: "Pripojené!"
|
STR_CONNECTED: "Pripojené!"
|
||||||
STR_CONNECTION_FAILED: "Pripojenie zlyhalo"
|
STR_CONNECTION_FAILED: "Pripojenie zlyhalo"
|
||||||
STR_FORGET_NETWORK: "Zabudnúť sieť?"
|
STR_FORGET_NETWORK: "Zabudnúť sieť?"
|
||||||
STR_SAVE_PASSWORD: "Uložiť heslo na nabudúce?"
|
STR_SAVE_PASSWORD: "Uložiť heslo na nabudúce?"
|
||||||
STR_PRESS_OK_SCAN: "Stlačte OK pre opätovné skenovanie"
|
STR_PRESS_OK_SCAN: "Stlačte OK pre opätovné skenovanie"
|
||||||
STR_JOIN_NETWORK: "Pripojiť sa k sieti"
|
STR_JOIN_NETWORK: "Pripojiť sa k sieti"
|
||||||
STR_CREATE_HOTSPOT: "Vytvoriť hotspot"
|
STR_CREATE_HOTSPOT: "Vytvoriť hotspot"
|
||||||
STR_JOIN_DESC: "Pripojiť sa k existujúcej Wi-Fi sieti"
|
STR_JOIN_DESC: "Pripojiť sa k existujúcej Wi-Fi sieti"
|
||||||
STR_HOTSPOT_DESC: "Vytvoriť Wi-Fi sieť, ku ktorej sa môžu pripojiť ostatní"
|
STR_HOTSPOT_DESC: "Vytvoriť Wi-Fi sieť, ku ktorej sa môžu pripojiť ostatní"
|
||||||
STR_STARTING_HOTSPOT: "Spúšťanie hotspotu..."
|
STR_STARTING_HOTSPOT: "Spúšťanie hotspotu..."
|
||||||
STR_HOTSPOT_MODE: "Režim hotspotu"
|
STR_HOTSPOT_MODE: "Režim hotspotu"
|
||||||
STR_CONNECT_WIFI_HINT: "Pripojte svoje zariadenie k tejto Wi-Fi sieti"
|
STR_CONNECT_WIFI_HINT: "Pripojte svoje zariadenie k tejto Wi-Fi sieti"
|
||||||
STR_OPEN_URL_HINT: "Otvorte túto URL adresu vo svojom prehliadači"
|
STR_OPEN_URL_HINT: "Otvorte túto URL adresu vo svojom prehliadači"
|
||||||
STR_OR_HTTP_PREFIX: "alebo http://"
|
STR_OR_HTTP_PREFIX: "alebo http://"
|
||||||
STR_SCAN_QR_HINT: "alebo naskenujte QR kód telefónom:"
|
STR_SCAN_QR_HINT: "alebo naskenujte QR kód telefónom:"
|
||||||
STR_CALIBRE_WIRELESS: "Calibre Wireless"
|
STR_CALIBRE_WIRELESS: "Calibre Wireless"
|
||||||
STR_NETWORK_LEGEND: "* = Šifrované | + = Uložené"
|
STR_NETWORK_LEGEND: "* = Šifrované | + = Uložené"
|
||||||
STR_MAC_ADDRESS: "MAC adresa:"
|
STR_MAC_ADDRESS: "MAC adresa:"
|
||||||
STR_CHECKING_WIFI: "Kontrola Wi-Fi..."
|
STR_CHECKING_WIFI: "Kontrola Wi-Fi..."
|
||||||
STR_ENTER_WIFI_PASSWORD: "Zadajte heslo Wi-Fi"
|
STR_ENTER_WIFI_PASSWORD: "Zadajte heslo Wi-Fi"
|
||||||
STR_TO_PREFIX: "pre"
|
STR_TO_PREFIX: "pre"
|
||||||
STR_CALIBRE_RECEIVING: "Prijímanie:"
|
STR_CALIBRE_RECEIVING: "Prijímanie:"
|
||||||
STR_CALIBRE_RECEIVED: "Prijaté:"
|
STR_CALIBRE_RECEIVED: "Prijaté:"
|
||||||
STR_CALIBRE_INSTRUCTION_1: "1) Nainštalujte plugin CrossPoint Reader"
|
STR_CALIBRE_INSTRUCTION_1: "1) Nainštalujte plugin CrossPoint Reader"
|
||||||
STR_CALIBRE_INSTRUCTION_2: "2) Buďte v rovnakej Wi-Fi sieti"
|
STR_CALIBRE_INSTRUCTION_2: "2) Buďte v rovnakej Wi-Fi sieti"
|
||||||
STR_CALIBRE_INSTRUCTION_3: "3) V Calibre: „Odoslať do zariadenia“"
|
STR_CALIBRE_INSTRUCTION_3: "3) V Calibre: „Odoslať do zariadenia“"
|
||||||
STR_CALIBRE_INSTRUCTION_4: "„Pri odosielaní nechajte túto obrazovku otvorenú“"
|
STR_CALIBRE_INSTRUCTION_4: "„Pri odosielaní nechajte túto obrazovku otvorenú“"
|
||||||
STR_CAT_DISPLAY: "Displej"
|
STR_CAT_DISPLAY: "Displej"
|
||||||
STR_CAT_READER: "Čítačka"
|
STR_CAT_READER: "Čítačka"
|
||||||
STR_CAT_CONTROLS: "Ovládanie"
|
STR_CAT_CONTROLS: "Ovládanie"
|
||||||
STR_CAT_SYSTEM: "Systém"
|
STR_CAT_SYSTEM: "Systém"
|
||||||
STR_SLEEP_SCREEN: "Obrazovka spánku"
|
STR_SLEEP_SCREEN: "Obrazovka spánku"
|
||||||
STR_QUICK_RESUME_TIMEOUT: "Rýchle obnovenie pri nečinnosti"
|
STR_QUICK_RESUME_TIMEOUT: "Rýchle obnovenie pri nečinnosti"
|
||||||
STR_SLEEP_COVER_MODE: "Obrazovka spánku – režim krytu"
|
STR_SLEEP_COVER_MODE: "Obrazovka spánku – režim krytu"
|
||||||
STR_HIDE_BATTERY: "Skryť % batérie"
|
STR_HIDE_BATTERY: "Skryť % batérie"
|
||||||
STR_EXTRA_SPACING: "Dodatočné medzery medzi odsekmi"
|
STR_EXTRA_SPACING: "Dodatočné medzery medzi odsekmi"
|
||||||
STR_TEXT_AA: "Vyhladzovanie textu"
|
STR_TEXT_AA: "Vyhladzovanie textu"
|
||||||
STR_IMAGES: "Obrázky"
|
STR_IMAGES: "Obrázky"
|
||||||
STR_IMAGES_DISPLAY: "Zobraz"
|
STR_IMAGES_DISPLAY: "Zobraz"
|
||||||
STR_IMAGES_PLACEHOLDER: "Rezervované miesto"
|
STR_IMAGES_PLACEHOLDER: "Rezervované miesto"
|
||||||
STR_IMAGES_SUPPRESS: "Potlačiť"
|
STR_IMAGES_SUPPRESS: "Potlačiť"
|
||||||
STR_SHORT_PWR_BTN: "Krátke stlačenie tlačidla napájania"
|
STR_SHORT_PWR_BTN: "Krátke stlačenie tlačidla napájania"
|
||||||
STR_ORIENTATION: "Orientácia čítania"
|
STR_ORIENTATION: "Orientácia čítania"
|
||||||
STR_SIDE_BTN_LAYOUT: "Rozloženie bočných tlačidiel (čítačka)"
|
STR_SIDE_BTN_LAYOUT: "Rozloženie bočných tlačidiel (čítačka)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Prispôsobiť predné tlačidlá orientácii"
|
STR_TOUCH_READER_CONTROLS: "Dotykové ovládanie čítačky"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Správanie pri dlhom stlačení tlačidla"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Prispôsobiť predné tlačidlá orientácii"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "VYP"
|
STR_LONG_PRESS_BEHAVIOR: "Správanie pri dlhom stlačení tlačidla"
|
||||||
STR_LONG_PRESS_BEHAVIOR_SKIP: "Preskočiť kapitolu"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "VYP"
|
||||||
STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Zmeniť orientáciu"
|
STR_LONG_PRESS_BEHAVIOR_SKIP: "Preskočiť kapitolu"
|
||||||
STR_FONT_PREVIEW_TEXT: "Vypätá dcéra grófa Maxwella s IQ nižším ako kôň núti čeľaď hrýzť hŕbu jabĺk"
|
STR_LONG_PRESS_BEHAVIOR_ORIENTATION: "Zmeniť orientáciu"
|
||||||
STR_FONT_FAMILY: "Rodina písiem čítačky"
|
STR_FONT_PREVIEW_TEXT: "Vypätá dcéra grófa Maxwella s IQ nižším ako kôň núti čeľaď hrýzť hŕbu jabĺk"
|
||||||
STR_FONT_SIZE: "Veľkosť písma rozhrania"
|
STR_FONT_FAMILY: "Rodina písiem čítačky"
|
||||||
STR_LINE_SPACING: "Riadkovanie čítačky"
|
STR_FONT_SIZE: "Veľkosť písma rozhrania"
|
||||||
STR_SCREEN_MARGIN: "Okraj obrazovky čítačky"
|
STR_LINE_SPACING: "Riadkovanie čítačky"
|
||||||
STR_PARA_ALIGNMENT: "Zarovnanie odsekov čítačky"
|
STR_SCREEN_MARGIN: "Okraj obrazovky čítačky"
|
||||||
STR_HYPHENATION: "Delenie slov"
|
STR_PARA_ALIGNMENT: "Zarovnanie odsekov čítačky"
|
||||||
STR_TIME_TO_SLEEP: "Čas do uspania"
|
STR_HYPHENATION: "Delenie slov"
|
||||||
STR_SHOW_HIDDEN_FILES: "Zobraz Skryté Súbory"
|
STR_TIME_TO_SLEEP: "Čas do uspania"
|
||||||
STR_REMOVE_READ_FROM_RECENTS: "Odstrániť prečítané knihy zo zoznamu nedávnych"
|
STR_SHOW_HIDDEN_FILES: "Zobraz Skryté Súbory"
|
||||||
STR_MOVE_FINISHED_TO_READ: "Presunúť prečítané knihy do priečinka Read"
|
STR_REMOVE_READ_FROM_RECENTS: "Odstrániť prečítané knihy zo zoznamu nedávnych"
|
||||||
STR_REFRESH_FREQ: "Frekvencia obnovovania"
|
STR_MOVE_FINISHED_TO_READ: "Presunúť prečítané knihy do priečinka Read"
|
||||||
STR_KOREADER_SYNC: "KOReader Sync"
|
STR_REFRESH_FREQ: "Frekvencia obnovovania"
|
||||||
STR_CHECK_UPDATES: "Skontrolovať aktualizácie"
|
STR_KOREADER_SYNC: "KOReader Sync"
|
||||||
STR_LANGUAGE: "Jazyk"
|
STR_CHECK_UPDATES: "Skontrolovať aktualizácie"
|
||||||
STR_CLEAR_READING_CACHE: "Vymazať vyrovnávaciu pamäť čítania"
|
STR_LANGUAGE: "Jazyk"
|
||||||
STR_USERNAME: "Používateľské meno"
|
STR_CLEAR_READING_CACHE: "Vymazať vyrovnávaciu pamäť čítania"
|
||||||
STR_PASSWORD: "Heslo"
|
STR_USERNAME: "Používateľské meno"
|
||||||
STR_SYNC_SERVER_URL: "URL synchronizačného servera"
|
STR_PASSWORD: "Heslo"
|
||||||
STR_DOCUMENT_MATCHING: "Párovanie dokumentov"
|
STR_SYNC_SERVER_URL: "URL synchronizačného servera"
|
||||||
STR_AUTHENTICATE: "Overiť"
|
STR_DOCUMENT_MATCHING: "Párovanie dokumentov"
|
||||||
STR_KOREADER_USERNAME: "Používateľské meno KOReader"
|
STR_AUTHENTICATE: "Overiť"
|
||||||
STR_KOREADER_PASSWORD: "Heslo KOReader"
|
STR_KOREADER_USERNAME: "Používateľské meno KOReader"
|
||||||
STR_FILENAME: "Názov súboru"
|
STR_KOREADER_PASSWORD: "Heslo KOReader"
|
||||||
STR_BINARY: "Binárny"
|
STR_FILENAME: "Názov súboru"
|
||||||
STR_SET_CREDENTIALS_FIRST: "Najprv nastavte prihlasovacie údaje"
|
STR_BINARY: "Binárny"
|
||||||
STR_WIFI_CONN_FAILED: "Pripojenie k Wi-Fi zlyhalo"
|
STR_SET_CREDENTIALS_FIRST: "Najprv nastavte prihlasovacie údaje"
|
||||||
STR_AUTHENTICATING: "Overovanie..."
|
STR_WIFI_CONN_FAILED: "Pripojenie k Wi-Fi zlyhalo"
|
||||||
STR_AUTH_SUCCESS: "Overenie úspešné!"
|
STR_AUTHENTICATING: "Overovanie..."
|
||||||
STR_KOREADER_AUTH: "Overenie KOReader"
|
STR_AUTH_SUCCESS: "Overenie úspešné!"
|
||||||
STR_SYNC_READY: "Synchronizácia KOReader je pripravená na použitie"
|
STR_KOREADER_AUTH: "Overenie KOReader"
|
||||||
STR_AUTH_FAILED: "Overenie zlyhalo"
|
STR_SYNC_READY: "Synchronizácia KOReader je pripravená na použitie"
|
||||||
STR_DONE: "Hotovo"
|
STR_AUTH_FAILED: "Overenie zlyhalo"
|
||||||
STR_CLEAR_CACHE_WARNING_1: "Týmto vymažete všetky údaje kníh vo vyrovnávacej pamäti."
|
STR_DONE: "Hotovo"
|
||||||
STR_CLEAR_CACHE_WARNING_2: "Všetok priebeh čítania bude stratený!"
|
STR_CLEAR_CACHE_WARNING_1: "Týmto vymažete všetky údaje kníh vo vyrovnávacej pamäti."
|
||||||
STR_CLEAR_CACHE_WARNING_3: "Knihy bude potrebné znova indexovať"
|
STR_CLEAR_CACHE_WARNING_2: "Všetok priebeh čítania bude stratený!"
|
||||||
STR_CLEAR_CACHE_WARNING_4: "pri ich opätovnom otvorení."
|
STR_CLEAR_CACHE_WARNING_3: "Knihy bude potrebné znova indexovať"
|
||||||
STR_CLEARING_CACHE: "Mazanie vyrovnávacej pamäte..."
|
STR_CLEAR_CACHE_WARNING_4: "pri ich opätovnom otvorení."
|
||||||
STR_CACHE_CLEARED: "Vyrovnávacia pamäť vymazaná"
|
STR_CLEARING_CACHE: "Mazanie vyrovnávacej pamäte..."
|
||||||
STR_ITEMS_REMOVED: "položiek odstránených"
|
STR_CACHE_CLEARED: "Vyrovnávacia pamäť vymazaná"
|
||||||
STR_FAILED_LOWER: "zlyhalo"
|
STR_ITEMS_REMOVED: "položiek odstránených"
|
||||||
STR_CLEAR_CACHE_FAILED: "Vymazanie vyrovnávacej pamäte zlyhalo"
|
STR_FAILED_LOWER: "zlyhalo"
|
||||||
STR_CHECK_SERIAL_OUTPUT: "Podrobnosti nájdete v sériovom výstupe"
|
STR_CLEAR_CACHE_FAILED: "Vymazanie vyrovnávacej pamäte zlyhalo"
|
||||||
STR_DARK: "Tmavý"
|
STR_CHECK_SERIAL_OUTPUT: "Podrobnosti nájdete v sériovom výstupe"
|
||||||
STR_LIGHT: "Svetlý"
|
STR_DARK: "Tmavý"
|
||||||
STR_CUSTOM: "Vlastný"
|
STR_LIGHT: "Svetlý"
|
||||||
STR_COVER: "Obálka"
|
STR_CUSTOM: "Vlastný"
|
||||||
STR_NONE_OPT: "Žiadny"
|
STR_COVER: "Obálka"
|
||||||
STR_FIT: "Prispôsobiť"
|
STR_NONE_OPT: "Žiadny"
|
||||||
STR_CROP: "Orezať"
|
STR_FIT: "Prispôsobiť"
|
||||||
STR_NEVER: "Nikdy"
|
STR_CROP: "Orezať"
|
||||||
STR_IN_READER: "V čítačke"
|
STR_NEVER: "Nikdy"
|
||||||
STR_ALWAYS: "Vždy"
|
STR_IN_READER: "V čítačke"
|
||||||
STR_IGNORE: "Ignorovať"
|
STR_ALWAYS: "Vždy"
|
||||||
STR_SLEEP: "Spánok"
|
STR_IGNORE: "Ignorovať"
|
||||||
STR_PAGE_TURN: "Otáčanie stránok"
|
STR_SLEEP: "Spánok"
|
||||||
STR_FORCE_REFRESH: "Obnoviť obrazovku"
|
STR_PAGE_TURN: "Otáčanie stránok"
|
||||||
STR_PORTRAIT: "Na výšku"
|
STR_FORCE_REFRESH: "Obnoviť obrazovku"
|
||||||
STR_LANDSCAPE_CW: "Na šírku v smere hodinových ručičiek"
|
STR_PORTRAIT: "Na výšku"
|
||||||
STR_INVERTED: "Invertovaný"
|
STR_LANDSCAPE_CW: "Na šírku v smere hodinových ručičiek"
|
||||||
STR_ORIENTATION_INVERTED: "Na výšku 180°"
|
STR_INVERTED: "Obrátený"
|
||||||
STR_LANDSCAPE_CCW: "Na šírku proti smeru hodinových ručičiek"
|
STR_LANDSCAPE_CCW: "Na šírku proti smeru hodinových ručičiek"
|
||||||
STR_PREV_NEXT: "Predchádzajúca/Nasledujúca"
|
STR_PREV_NEXT: "Predchádzajúca/Nasledujúca"
|
||||||
STR_NEXT_PREV: "Nasledujúca/Predchádzajúca"
|
STR_NEXT_PREV: "Nasledujúca/Predchádzajúca"
|
||||||
STR_DISABLED: "Vypnuté"
|
STR_DISABLED: "Vypnuté"
|
||||||
STR_NOTO_SERIF: "Noto Serif"
|
STR_NOTO_SERIF: "Noto Serif"
|
||||||
STR_NOTO_SANS: "Noto Sans"
|
STR_NOTO_SANS: "Noto Sans"
|
||||||
STR_SMALL: "Malý"
|
STR_SMALL: "Malý"
|
||||||
STR_MEDIUM: "Stredný"
|
STR_MEDIUM: "Stredný"
|
||||||
STR_LARGE: "Veľký"
|
STR_LARGE: "Veľký"
|
||||||
STR_X_LARGE: "Obrovský"
|
STR_X_LARGE: "Obrovský"
|
||||||
STR_TIGHT: "Tesný"
|
STR_TIGHT: "Tesný"
|
||||||
STR_NORMAL: "Normálny"
|
STR_NORMAL: "Normálny"
|
||||||
STR_WIDE: "Široký"
|
STR_WIDE: "Široký"
|
||||||
STR_JUSTIFY: "Zarovnať do bloku"
|
STR_JUSTIFY: "Zarovnať do bloku"
|
||||||
STR_ALIGN_LEFT: "Vľavo"
|
STR_ALIGN_LEFT: "Vľavo"
|
||||||
STR_CENTER: "Na stred"
|
STR_CENTER: "Na stred"
|
||||||
STR_ALIGN_RIGHT: "Vpravo"
|
STR_ALIGN_RIGHT: "Vpravo"
|
||||||
STR_PAGES_1: "1 strana"
|
STR_PAGES_1: "1 strana"
|
||||||
STR_PAGES_5: "5 strán"
|
STR_PAGES_5: "5 strán"
|
||||||
STR_PAGES_10: "10 strán"
|
STR_PAGES_10: "10 strán"
|
||||||
STR_PAGES_15: "15 strán"
|
STR_PAGES_15: "15 strán"
|
||||||
STR_PAGES_30: "30 strán"
|
STR_PAGES_30: "30 strán"
|
||||||
STR_UPDATE: "Aktualizácia"
|
STR_UPDATE: "Aktualizácia"
|
||||||
STR_CHECKING_UPDATE: "Kontrola aktualizácií…"
|
STR_CHECKING_UPDATE: "Kontrola aktualizácií…"
|
||||||
STR_NEW_UPDATE: "K dispozícii je nová aktualizácia!"
|
STR_NEW_UPDATE: "K dispozícii je nová aktualizácia!"
|
||||||
STR_CURRENT_VERSION: "Aktuálna verzia:"
|
STR_CURRENT_VERSION: "Aktuálna verzia:"
|
||||||
STR_NEW_VERSION: "Nová verzia:"
|
STR_NEW_VERSION: "Nová verzia:"
|
||||||
STR_UPDATING: "Aktualizácia..."
|
STR_UPDATING: "Aktualizácia..."
|
||||||
STR_NO_UPDATE: "Nie je k dispozícii žiadna aktualizácia"
|
STR_NO_UPDATE: "Nie je k dispozícii žiadna aktualizácia"
|
||||||
STR_UPDATE_FAILED: "Aktualizácia zlyhala"
|
STR_UPDATE_FAILED: "Aktualizácia zlyhala"
|
||||||
STR_UPDATE_COMPLETE: "Aktualizácia dokončená"
|
STR_UPDATE_COMPLETE: "Aktualizácia dokončená"
|
||||||
STR_POWER_ON_HINT: "Stlačte a podržte tlačidlo napájania pre zapnutie"
|
STR_POWER_ON_HINT: "Stlačte a podržte tlačidlo napájania pre zapnutie"
|
||||||
STR_RESTARTING_HINT: "Reštartujem... Ak sa zariadenie nereštartuje, podrž tlačidlo na zapnutie niekoľko s."
|
STR_RESTARTING_HINT: "Reštartujem... Ak sa zariadenie nereštartuje, podrž tlačidlo na zapnutie niekoľko s."
|
||||||
STR_NO_ENTRIES: "Neboli nájdené žiadne položky"
|
STR_NO_ENTRIES: "Neboli nájdené žiadne položky"
|
||||||
STR_DOWNLOADING: "Sťahovanie..."
|
STR_DOWNLOADING: "Sťahovanie..."
|
||||||
STR_DOWNLOAD_FAILED: "Sťahovanie zlyhalo"
|
STR_DOWNLOAD_FAILED: "Sťahovanie zlyhalo"
|
||||||
STR_ERROR_MSG: "Chyba:"
|
STR_ERROR_MSG: "Chyba:"
|
||||||
STR_UNNAMED: "Nepomenované"
|
STR_UNNAMED: "Nepomenované"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Podržte Otvoriť pre vymazanie"
|
STR_HOLD_CONFIRM_TO_DELETE: "Podrž potvrdiť pre vymazanie"
|
||||||
STR_NO_SERVER_URL: "Nie je nakonfigurovaná URL adresa servera"
|
STR_BOOKMARK_INSTRUCTIONS: "Podrž tlačidlo Potvrdiť pre vytvorenie záložky."
|
||||||
STR_FETCH_FEED_FAILED: "Načítanie kanála zlyhalo"
|
STR_NO_SERVER_URL: "Nie je nakonfigurovaná URL adresa servera"
|
||||||
STR_PARSE_FEED_FAILED: "Spracovanie kanála zlyhalo"
|
STR_FETCH_FEED_FAILED: "Načítanie kanála zlyhalo"
|
||||||
STR_NEXT_PAGE: "Ďaľsia strana »"
|
STR_PARSE_FEED_FAILED: "Spracovanie kanála zlyhalo"
|
||||||
STR_PREV_PAGE: "« Predchádzajúca str."
|
STR_NEXT_PAGE: "Ďaľsia strana »"
|
||||||
STR_NETWORK_PREFIX: "Sieť:"
|
STR_PREV_PAGE: "« Predchádzajúca str."
|
||||||
STR_IP_ADDRESS_PREFIX: "IP adresa:"
|
STR_NETWORK_PREFIX: "Sieť:"
|
||||||
STR_ERROR_GENERAL_FAILURE: "Chyba: Všeobecná chyba"
|
STR_IP_ADDRESS_PREFIX: "IP adresa:"
|
||||||
STR_ERROR_NETWORK_NOT_FOUND: "Chyba: Sieť nebola nájdená"
|
STR_ERROR_GENERAL_FAILURE: "Chyba: Všeobecná chyba"
|
||||||
STR_ERROR_CONNECTION_TIMEOUT: "Chyba: Časový limit pripojenia"
|
STR_ERROR_NETWORK_NOT_FOUND: "Chyba: Sieť nebola nájdená"
|
||||||
STR_SD_CARD: "SD karta"
|
STR_ERROR_CONNECTION_TIMEOUT: "Chyba: Časový limit pripojenia"
|
||||||
STR_BACK: "« Späť"
|
STR_SD_CARD: "SD karta"
|
||||||
STR_EXIT: "« Koniec"
|
STR_BACK: "« Späť"
|
||||||
STR_HOME: "« Domov"
|
STR_EXIT: "« Koniec"
|
||||||
STR_SELECT: "Vybrať"
|
STR_HOME: "« Domov"
|
||||||
STR_SELECTED: "Vybrané"
|
STR_SELECT: "Vybrať"
|
||||||
|
STR_SELECTED: "Vybrané"
|
||||||
STR_TOGGLE: "Prepnúť"
|
STR_TOGGLE: "Prepnúť"
|
||||||
STR_TOGGLE_BOOKMARK: "Prepnúť záložku"
|
STR_CONFIRM: "Potvrdiť"
|
||||||
STR_CONFIRM: "Potvrdiť"
|
STR_CANCEL: "Zrušiť"
|
||||||
STR_CANCEL: "Zrušiť"
|
STR_CONNECT: "Pripojiť"
|
||||||
STR_CONNECT: "Pripojiť"
|
STR_OPEN: "Otvoriť"
|
||||||
STR_OPEN: "Otvoriť"
|
STR_DOWNLOAD: "Stiahnuť"
|
||||||
STR_DOWNLOAD: "Stiahnuť"
|
STR_RETRY: "Skúsiť znova"
|
||||||
STR_RETRY: "Skúsiť znova"
|
STR_YES: "Áno"
|
||||||
STR_YES: "Áno"
|
STR_NO: "Nie"
|
||||||
STR_NO: "Nie"
|
STR_SHOW: "Zobraz"
|
||||||
STR_SHOW: "Zobraz"
|
STR_HIDE: "Skryť"
|
||||||
STR_HIDE: "Skryť"
|
STR_STATE_ON: "ZAP"
|
||||||
STR_STATE_ON: "ZAP"
|
STR_STATE_OFF: "VYP"
|
||||||
STR_STATE_OFF: "VYP"
|
STR_NOT_SET: "Nenastavené"
|
||||||
STR_NOT_SET: "Nenastavené"
|
STR_DIR_LEFT: "Vľavo"
|
||||||
STR_DIR_LEFT: "Vľavo"
|
STR_DIR_RIGHT: "Vpravo"
|
||||||
STR_DIR_RIGHT: "Vpravo"
|
STR_DIR_UP: "Hore"
|
||||||
STR_DIR_UP: "Hore"
|
STR_DIR_DOWN: "Dole"
|
||||||
STR_DIR_DOWN: "Dole"
|
STR_OK_BUTTON: "OK"
|
||||||
STR_OK_BUTTON: "OK"
|
STR_SLEEP_COVER_FILTER: "Filter obrazovky spánku"
|
||||||
STR_SLEEP_COVER_FILTER: "Filter obrazovky spánku"
|
STR_FILTER_CONTRAST: "Kontrast"
|
||||||
STR_FILTER_CONTRAST: "Kontrast"
|
STR_CUSTOMISE_STATUS_BAR: "Uprav status bar"
|
||||||
STR_CUSTOMISE_STATUS_BAR: "Uprav status bar"
|
STR_CHAPTER_PAGE_COUNT: "Počítadlo strán kapitoly"
|
||||||
STR_CHAPTER_PAGE_COUNT: "Počítadlo strán kapitoly"
|
STR_BOOK_PROGRESS_PERCENTAGE: "Prečítané percent"
|
||||||
STR_BOOK_PROGRESS_PERCENTAGE: "Prečítané percent"
|
STR_PROGRESS_BAR: "Ukazovateľ čítania"
|
||||||
STR_PROGRESS_BAR: "Ukazovateľ čítania"
|
STR_PROGRESS_BAR_THICKNESS: "Hrúbka indikátora priebehu"
|
||||||
STR_PROGRESS_BAR_THICKNESS: "Hrúbka indikátora priebehu"
|
STR_PROGRESS_BAR_THIN: "Tenký"
|
||||||
STR_PROGRESS_BAR_THIN: "Tenký"
|
STR_PROGRESS_BAR_MEDIUM: "Stredný"
|
||||||
STR_PROGRESS_BAR_MEDIUM: "Stredný"
|
STR_PROGRESS_BAR_THICK: "Hrubý"
|
||||||
STR_PROGRESS_BAR_THICK: "Hrubý"
|
STR_BOOK: "Kniha"
|
||||||
STR_BOOK: "Kniha"
|
STR_CHAPTER: "Kapitola"
|
||||||
STR_CHAPTER: "Kapitola"
|
STR_EXAMPLE_CHAPTER: "Kapitola 21"
|
||||||
STR_EXAMPLE_CHAPTER: "Kapitola 21"
|
STR_EXAMPLE_BOOK: "Názov knihy"
|
||||||
STR_EXAMPLE_BOOK: "Názov knihy"
|
STR_PREVIEW: "Ukážka"
|
||||||
STR_PREVIEW: "Ukážka"
|
STR_TITLE: "Názov"
|
||||||
STR_TITLE: "Názov"
|
STR_BATTERY: "Batéria"
|
||||||
STR_BATTERY: "Batéria"
|
STR_XTC_STATUS_BAR: "Stavový panel XTC"
|
||||||
STR_XTC_STATUS_BAR: "Stavový panel XTC"
|
STR_BOTTOM: "Dole"
|
||||||
STR_BOTTOM: "Dole"
|
STR_TOP: "Hore"
|
||||||
STR_TOP: "Hore"
|
STR_CLOCK: "Hodiny"
|
||||||
STR_CLOCK: "Hodiny"
|
STR_CLOCK_UTC_OFFSET: "UTC posun hodín"
|
||||||
STR_CLOCK_UTC_OFFSET: "UTC posun hodín"
|
STR_CLOCK_FORMAT: "Formát času"
|
||||||
STR_CLOCK_FORMAT: "Formát času"
|
STR_CLOCK_FORMAT_24H: "24-hodinový"
|
||||||
STR_CLOCK_FORMAT_24H: "24-hodinový"
|
STR_CLOCK_FORMAT_12H: "12-hodinový"
|
||||||
STR_CLOCK_FORMAT_12H: "12-hodinový"
|
STR_CURRENT_TIME: "Aktuálny čas:"
|
||||||
STR_CURRENT_TIME: "Aktuálny čas:"
|
STR_NEXT_FIELD: "Ďalej"
|
||||||
STR_NEXT_FIELD: "Ďalej"
|
STR_CLOCK_SYNC: "Synchronizácia hodín"
|
||||||
STR_CLOCK_SYNC: "Synchronizácia hodín"
|
STR_CLOCK_SYNC_NOW: "Synchronizovať teraz"
|
||||||
STR_CLOCK_SYNC_NOW: "Synchronizovať teraz"
|
STR_CLOCK_SYNCING: "Synchronizácia cez NTP..."
|
||||||
STR_CLOCK_SYNCING: "Synchronizácia cez NTP..."
|
STR_CLOCK_SYNC_OK: "Hodiny synchronizované"
|
||||||
STR_CLOCK_SYNC_OK: "Hodiny synchronizované"
|
STR_CLOCK_SYNC_FAIL: "Synchronizácia zlyhala"
|
||||||
STR_CLOCK_SYNC_FAIL: "Synchronizácia zlyhala"
|
STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi nie je pripojená"
|
||||||
STR_CLOCK_SYNC_NO_WIFI: "Wi-Fi nie je pripojená"
|
STR_CLOCK_SYNC_NO_WIFI_HINT: "Najprv sa pripojte k Wi-Fi a potom skúste znova."
|
||||||
STR_CLOCK_SYNC_NO_WIFI_HINT: "Najprv sa pripojte k Wi-Fi a potom skúste znova."
|
STR_CLOCK_SYNCED: "Hodiny synchronizované"
|
||||||
STR_CLOCK_SYNCED: "Hodiny synchronizované"
|
STR_UI_THEME: "Téma rozhrania"
|
||||||
STR_UI_THEME: "Téma rozhrania"
|
STR_THEME_CLASSIC: "Klasická"
|
||||||
STR_THEME_CLASSIC: "Klasická"
|
STR_THEME_LYRA: "Lyra"
|
||||||
STR_THEME_LYRA: "Lyra"
|
STR_THEME_ROUNDEDRAFF: "RoundedRaff"
|
||||||
STR_THEME_ROUNDEDRAFF: "RoundedRaff"
|
STR_THEME_LYRA_EXTENDED: "Lyra Extended"
|
||||||
STR_THEME_LYRA_EXTENDED: "Lyra Extended"
|
STR_SUNLIGHT_FADING_FIX: "Oprava blednutia na slnku"
|
||||||
STR_SUNLIGHT_FADING_FIX: "Oprava blednutia na slnku"
|
STR_REMAP_FRONT_BUTTONS: "Premapovať predné tlačidlá"
|
||||||
STR_REMAP_FRONT_BUTTONS: "Premapovať predné tlačidlá"
|
|
||||||
STR_BOOKMARKS: "Záložky"
|
STR_BOOKMARKS: "Záložky"
|
||||||
STR_BOOKMARK_ADDED: "Záložka pridaná."
|
STR_BOOKMARK_ADDED: "Záložka pridaná."
|
||||||
STR_BOOKMARK_REMOVED: "Záložka odstránená."
|
STR_OPDS_BROWSER: "Prehliadač OPDS"
|
||||||
STR_OPDS_BROWSER: "Prehliadač OPDS"
|
STR_SEARCH: "Hľadať"
|
||||||
STR_SEARCH: "Hľadať"
|
STR_COVER_CUSTOM: "Obálka + Vlastné"
|
||||||
STR_COVER_CUSTOM: "Obálka + Vlastné"
|
STR_QUICK_RESUME: "Rýchle obnovenie"
|
||||||
STR_QUICK_RESUME: "Rýchle obnovenie"
|
STR_MENU_RECENT_BOOKS: "Nedávne knihy"
|
||||||
STR_MENU_RECENT_BOOKS: "Nedávne knihy"
|
STR_REMOVE_FROM_RECENTS: "Odstrániť z nedávnych kníh?"
|
||||||
STR_REMOVE_FROM_RECENTS: "Odstrániť z nedávnych kníh?"
|
STR_NO_RECENT_BOOKS: "Žiadne nedávne knihy"
|
||||||
STR_NO_RECENT_BOOKS: "Žiadne nedávne knihy"
|
STR_CALIBRE_DESC: "Používať bezdrôtové prenosy zariadení Calibre"
|
||||||
STR_CALIBRE_DESC: "Používať bezdrôtové prenosy zariadení Calibre"
|
STR_FORGET_AND_REMOVE: "Zabudnúť sieť a odstrániť uložené heslo?"
|
||||||
STR_FORGET_AND_REMOVE: "Zabudnúť sieť a odstrániť uložené heslo?"
|
STR_FORGET_BUTTON: "Zabudnúť"
|
||||||
STR_FORGET_BUTTON: "Zabudnúť"
|
STR_CALIBRE_STARTING: "Spúšťanie Calibre..."
|
||||||
STR_CALIBRE_STARTING: "Spúšťanie Calibre..."
|
STR_CALIBRE_SETUP: "Nastavenie"
|
||||||
STR_CALIBRE_SETUP: "Nastavenie"
|
STR_CALIBRE_STATUS: "Stav"
|
||||||
STR_CALIBRE_STATUS: "Stav"
|
STR_CLEAR_BUTTON: "Vymazať"
|
||||||
STR_CLEAR_BUTTON: "Vymazať"
|
STR_DEFAULT_VALUE: "Predvolené"
|
||||||
STR_DEFAULT_VALUE: "Predvolené"
|
STR_REMAP_PROMPT: "Stlačte predné tlačidlo pre každú funkciu"
|
||||||
STR_REMAP_PROMPT: "Stlačte predné tlačidlo pre každú funkciu"
|
STR_UNASSIGNED: "Nepriradené"
|
||||||
STR_UNASSIGNED: "Nepriradené"
|
STR_ALREADY_ASSIGNED: "Už priradené"
|
||||||
STR_ALREADY_ASSIGNED: "Už priradené"
|
STR_REMAP_RESET_HINT: "Bočné tlačidlo Hore: Obnoviť predvolené rozloženie"
|
||||||
STR_REMAP_RESET_HINT: "Bočné tlačidlo Hore: Obnoviť predvolené rozloženie"
|
STR_REMAP_CANCEL_HINT: "Bočné tlačidlo Dole: Zrušiť premapovanie"
|
||||||
STR_REMAP_CANCEL_HINT: "Bočné tlačidlo Dole: Zrušiť premapovanie"
|
STR_HW_BACK_LABEL: "Späť (1. tlačidlo)"
|
||||||
STR_HW_BACK_LABEL: "Späť (1. tlačidlo)"
|
STR_HW_CONFIRM_LABEL: "Potvrdiť (2. tlačidlo)"
|
||||||
STR_HW_CONFIRM_LABEL: "Potvrdiť (2. tlačidlo)"
|
STR_HW_LEFT_LABEL: "Vľavo (3. tlačidlo)"
|
||||||
STR_HW_LEFT_LABEL: "Vľavo (3. tlačidlo)"
|
STR_HW_RIGHT_LABEL: "Vpravo (4. tlačidlo)"
|
||||||
STR_HW_RIGHT_LABEL: "Vpravo (4. tlačidlo)"
|
STR_GO_TO_PERCENT: "Prejsť na %"
|
||||||
STR_GO_TO_PERCENT: "Prejsť na %"
|
STR_GO_HOME_BUTTON: "Prejsť na Domov"
|
||||||
STR_GO_HOME_BUTTON: "Prejsť na Domov"
|
STR_SYNC_PROGRESS: "Priebeh synchronizácie"
|
||||||
STR_SYNC_PROGRESS: "Priebeh synchronizácie"
|
STR_DELETE_CACHE: "Vymazať vyrovnávaciu pamäť knihy"
|
||||||
STR_DELETE_CACHE: "Vymazať vyrovnávaciu pamäť knihy"
|
STR_DELETE: "Vymazať"
|
||||||
STR_DELETE: "Vymazať"
|
STR_CONFIRM_DELETE_BOOKMARK: "Vymazať záložku?"
|
||||||
STR_CONFIRM_DELETE_BOOKMARK: "Vymazať záložku?"
|
STR_DISPLAY_QR: "Zobraz stránku ako QR"
|
||||||
STR_DISPLAY_QR: "Zobraz stránku ako QR"
|
STR_CHAPTER_PREFIX: "Kapitola:"
|
||||||
STR_CHAPTER_PREFIX: "Kapitola:"
|
STR_PAGES_SEPARATOR: "strán |"
|
||||||
STR_PAGES_SEPARATOR: "strán |"
|
STR_BOOK_PREFIX: "Kniha:"
|
||||||
STR_BOOK_PREFIX: "Kniha:"
|
STR_CALIBRE_URL_HINT: "Pre Calibre pridajte /opds na koniec URL adresy"
|
||||||
STR_CALIBRE_URL_HINT: "Pre Calibre pridajte /opds na koniec URL adresy"
|
STR_PERCENT_STEP_HINT: "Vľavo/Vpravo: 1 % Hore/Dole: 10 %"
|
||||||
STR_PERCENT_STEP_HINT: "Vľavo/Vpravo: 1 % Hore/Dole: 10 %"
|
STR_SYNCING_TIME: "Čas synchronizácie..."
|
||||||
STR_SYNCING_TIME: "Čas synchronizácie..."
|
STR_CALC_HASH: "Výpočet hashu dokumentu..."
|
||||||
STR_CALC_HASH: "Výpočet hashu dokumentu..."
|
STR_HASH_FAILED: "Nepodarilo sa vypočítať hash dokumentu"
|
||||||
STR_HASH_FAILED: "Nepodarilo sa vypočítať hash dokumentu"
|
STR_FETCH_PROGRESS: "Načítavanie vzdialeného priebehu..."
|
||||||
STR_FETCH_PROGRESS: "Načítavanie vzdialeného priebehu..."
|
STR_UPLOAD_PROGRESS: "Nahrávanie priebehu..."
|
||||||
STR_UPLOAD_PROGRESS: "Nahrávanie priebehu..."
|
STR_NO_CREDENTIALS_MSG: "Prihlasovacie údaje nie sú nastavené"
|
||||||
STR_NO_CREDENTIALS_MSG: "Prihlasovacie údaje nie sú nastavené"
|
STR_KOREADER_SETUP_HINT: "Nastavte účet KOReader v Nastaveniach"
|
||||||
STR_KOREADER_SETUP_HINT: "Nastavte účet KOReader v Nastaveniach"
|
STR_PROGRESS_FOUND: "Priebeh nájdený!"
|
||||||
STR_PROGRESS_FOUND: "Priebeh nájdený!"
|
STR_REMOTE_LABEL: "Vzdialený:"
|
||||||
STR_REMOTE_LABEL: "Vzdialený:"
|
STR_LOCAL_LABEL: "Lokálny:"
|
||||||
STR_LOCAL_LABEL: "Lokálny:"
|
STR_PAGE_OVERALL_FORMAT: "Strana %d, celkovo %.2f%%"
|
||||||
STR_PAGE_OVERALL_FORMAT: "Strana %d, celkovo %.2f%%"
|
STR_PAGE_TOTAL_OVERALL_FORMAT: "Strana %d/%d, celkovo %.2f%%"
|
||||||
STR_PAGE_TOTAL_OVERALL_FORMAT: "Strana %d/%d, celkovo %.2f%%"
|
STR_DEVICE_FROM_FORMAT: " Zo zariadenia: %s"
|
||||||
STR_DEVICE_FROM_FORMAT: " Zo zariadenia: %s"
|
STR_APPLY_REMOTE: "Použiť vzdialený priebeh"
|
||||||
STR_APPLY_REMOTE: "Použiť vzdialený priebeh"
|
STR_UPLOAD_LOCAL: "Nahrať lokálny priebeh"
|
||||||
STR_UPLOAD_LOCAL: "Nahrať lokálny priebeh"
|
STR_NO_REMOTE_MSG: "Nenašiel sa žiadny vzdialený priebeh"
|
||||||
STR_NO_REMOTE_MSG: "Nenašiel sa žiadny vzdialený priebeh"
|
STR_UPLOAD_PROMPT: "Nahrať aktuálnu pozíciu?"
|
||||||
STR_UPLOAD_PROMPT: "Nahrať aktuálnu pozíciu?"
|
STR_UPLOAD_SUCCESS: "Priebeh nahraný!"
|
||||||
STR_UPLOAD_SUCCESS: "Priebeh nahraný!"
|
STR_SYNC_FAILED_MSG: "Synchronizácia zlyhala"
|
||||||
STR_SYNC_FAILED_MSG: "Synchronizácia zlyhala"
|
STR_SAVE_PROGRESS_FAILED: "Nepodarilo sa uložiť priebeh"
|
||||||
STR_SAVE_PROGRESS_FAILED: "Nepodarilo sa uložiť priebeh"
|
STR_SECTION_PREFIX: "Sekcia"
|
||||||
STR_SECTION_PREFIX: "Sekcia"
|
STR_UPLOAD: "Nahrať"
|
||||||
STR_UPLOAD: "Nahrať"
|
STR_BOOK_S_STYLE: "Štýl knihy"
|
||||||
STR_BOOK_S_STYLE: "Štýl knihy"
|
STR_EMBEDDED_STYLE: "Vložený štýl"
|
||||||
STR_EMBEDDED_STYLE: "Vložený štýl"
|
STR_FOCUS_READING: "Sústredené čítanie"
|
||||||
STR_FOCUS_READING: "Sústredené čítanie"
|
STR_OPDS_SERVER_URL: "URL adresa OPDS servera"
|
||||||
STR_OPDS_SERVER_URL: "URL adresa OPDS servera"
|
STR_SET_SLEEP_COVER: "Nastav obal"
|
||||||
STR_SET_SLEEP_COVER: "Nastav obal"
|
STR_FOOTNOTES: "Poznámky pod čiarou"
|
||||||
STR_FOOTNOTES: "Poznámky pod čiarou"
|
STR_NO_FOOTNOTES: "Žiadne poznámky pod čiarou"
|
||||||
STR_NO_FOOTNOTES: "Žiadne poznámky pod čiarou"
|
STR_LINK: "[link]"
|
||||||
STR_LINK: "[link]"
|
STR_SCREENSHOT_BUTTON: "Urobiť snímku obrazovky"
|
||||||
STR_SCREENSHOT_BUTTON: "Urobiť snímku obrazovky"
|
STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
|
||||||
STR_SLEEP_TIMER_VALUE_FORMAT: "%u min"
|
STR_SLEEP_NEVER: "Nikdy"
|
||||||
STR_SLEEP_NEVER: "Nikdy"
|
STR_SLEEP_TIMER_STEP_HINT: "Vľavo/Vpravo: 1 min Hore/Dole: 5 min"
|
||||||
STR_SLEEP_TIMER_STEP_HINT: "Vľavo/Vpravo: 1 min Hore/Dole: 5 min"
|
STR_ADD_SERVER: "Pridať server"
|
||||||
STR_ADD_SERVER: "Pridať server"
|
STR_SERVER_NAME: "Názov servera"
|
||||||
STR_SERVER_NAME: "Názov servera"
|
STR_NO_SERVERS: "Nie sú nakonfigurované žiadne OPDS servery"
|
||||||
STR_NO_SERVERS: "Nie sú nakonfigurované žiadne OPDS servery"
|
STR_DELETE_SERVER: "Odstrániť server"
|
||||||
STR_DELETE_SERVER: "Odstrániť server"
|
STR_OPDS_SERVERS: "OPDS servery"
|
||||||
STR_OPDS_SERVERS: "OPDS servery"
|
STR_AUTO_TURN_ENABLED: "Automatické otáčanie strán zapnuté: "
|
||||||
STR_AUTO_TURN_ENABLED: "Automatické otáčanie strán zapnuté: "
|
STR_AUTO_TURN_PAGES_PER_MIN: "Automatické otáčanie (strán za minútu)"
|
||||||
STR_AUTO_TURN_PAGES_PER_MIN: "Automatické otáčanie (strán za minútu)"
|
STR_MANAGE_FONTS: "Správa písiem"
|
||||||
STR_MANAGE_FONTS: "Správa písiem"
|
STR_FONT_BROWSER: "Prehliadač písiem"
|
||||||
STR_FONT_BROWSER: "Prehliadač písiem"
|
STR_LOADING_FONT_LIST: "Načítava sa zoznam písiem..."
|
||||||
STR_LOADING_FONT_LIST: "Načítava sa zoznam písiem..."
|
STR_NO_FONTS_AVAILABLE: "Nie sú dostupné žiadne písma"
|
||||||
STR_NO_FONTS_AVAILABLE: "Nie sú dostupné žiadne písma"
|
STR_FONT_INSTALLED: "Písmo nainštalované!"
|
||||||
STR_FONT_INSTALLED: "Písmo nainštalované!"
|
STR_FONT_INSTALL_FAILED: "Inštalácia písma zlyhala"
|
||||||
STR_FONT_INSTALL_FAILED: "Inštalácia písma zlyhala"
|
STR_INSTALLED: "Nainštalované"
|
||||||
STR_INSTALLED: "Nainštalované"
|
STR_DOWNLOAD_ALL: "Stiahnuť všetko"
|
||||||
STR_DOWNLOAD_ALL: "Stiahnuť všetko"
|
STR_UPDATE_ALL: "Aktualizovať všetko"
|
||||||
STR_UPDATE_ALL: "Aktualizovať všetko"
|
STR_UPDATE_AVAILABLE: "Aktualizovať"
|
||||||
STR_UPDATE_AVAILABLE: "Aktualizovať"
|
STR_CRASH_TITLE: "Zlyhanie systému"
|
||||||
STR_CRASH_TITLE: "Zlyhanie systému"
|
STR_CRASH_DESCRIPTION: "Podrobná správa bola uložená do súboru crash_report.txt. Priložte tento súbor k hláseniu chyby."
|
||||||
STR_CRASH_DESCRIPTION: "Podrobná správa bola uložená do súboru crash_report.txt. Priložte tento súbor k hláseniu chyby."
|
STR_CRASH_REASON: "Dôvod zlyhania:"
|
||||||
STR_CRASH_REASON: "Dôvod zlyhania:"
|
STR_CRASH_NO_REASON: "(Nebola zaznamenaná žiadna príčina)"
|
||||||
STR_CRASH_NO_REASON: "(Nebola zaznamenaná žiadna príčina)"
|
STR_TILT_PAGE_TURN: "Otáčanie strán naklonením"
|
||||||
STR_TILT_PAGE_TURN: "Otáčanie strán naklonením"
|
STR_KB_HINT_MOVE_CURSOR: "Stlačte VĽAVO alebo VPRAVO pre presun kurzora"
|
||||||
STR_KB_HINT_MOVE_CURSOR: "Stlačte VĽAVO alebo VPRAVO pre presun kurzora"
|
STR_KB_HINT_RETURN_CURSOR: "Stlačte VĽAVO pre návrat na pozíciu kurzora"
|
||||||
STR_KB_HINT_RETURN_CURSOR: "Stlačte VĽAVO pre návrat na pozíciu kurzora"
|
STR_KB_HINT_HIDE_PASSWORD: "Podržte VPRAVO a potom stlačte [***] na skrytie hesla"
|
||||||
STR_KB_HINT_HIDE_PASSWORD: "Podržte VPRAVO a potom stlačte [***] na skrytie hesla"
|
STR_KB_HINT_SHOW_PASSWORD: "Podržte VPRAVO a potom stlačte [abc] na zobrazenie hesla"
|
||||||
STR_KB_HINT_SHOW_PASSWORD: "Podržte VPRAVO a potom stlačte [abc] na zobrazenie hesla"
|
STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Stlačte [***] na skrytie hesla"
|
||||||
STR_KB_HINT_TOGGLE_HIDE_PASSWORD: "Stlačte [***] na skrytie hesla"
|
STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Stlačte [abc] na zobrazenie hesla"
|
||||||
STR_KB_HINT_TOGGLE_SHOW_PASSWORD: "Stlačte [abc] na zobrazenie hesla"
|
STR_KB_HINT_EDIT_ENTRY: "Podržte HORE pre úpravu položky"
|
||||||
STR_KB_HINT_EDIT_ENTRY: "Podržte HORE pre úpravu položky"
|
STR_KB_TIPS: "Tipy:"
|
||||||
STR_KB_TIPS: "Tipy:"
|
STR_KB_HINT_RETURN_KEYBOARD: "Stlačte DOLE pre návrat ku klávesnici"
|
||||||
STR_KB_HINT_RETURN_KEYBOARD: "Stlačte DOLE pre návrat ku klávesnici"
|
STR_KB_HINT_EXIT_URL_MODE: "Stlačte ABC pre ukončenie režimu URL"
|
||||||
STR_KB_HINT_EXIT_URL_MODE: "Stlačte ABC pre ukončenie režimu URL"
|
STR_KB_HINT_CLEAR_TEXT: "Podržte DEL pre vymazanie celého textu"
|
||||||
STR_KB_HINT_CLEAR_TEXT: "Podržte DEL pre vymazanie celého textu"
|
STR_KB_HINT_SECONDARY_CHAR: "Podržte SELECT pre alternatívny znak"
|
||||||
STR_KB_HINT_SECONDARY_CHAR: "Podržte SELECT pre alternatívny znak"
|
STR_KB_HINT_UPPER_SECONDARY: "Podržte SELECT pre VEĽKÉ písmeno alebo alternatívny znak"
|
||||||
STR_KB_HINT_UPPER_SECONDARY: "Podržte SELECT pre VEĽKÉ písmeno alebo alternatívny znak"
|
STR_KB_HINT_LOWER_SECONDARY: "Podržte SELECT pre malé písmeno alebo alternatívny znak"
|
||||||
STR_KB_HINT_LOWER_SECONDARY: "Podržte SELECT pre malé písmeno alebo alternatívny znak"
|
STR_KB_HINT_URL_SNIPPETS: "Stlačte URL pre úryvky"
|
||||||
STR_KB_HINT_URL_SNIPPETS: "Stlačte URL pre úryvky"
|
STR_SD_FIRMWARE_UPDATE: "Aktualizácia firmvéru z SD karty"
|
||||||
STR_SD_FIRMWARE_UPDATE: "Aktualizácia firmvéru z SD karty"
|
STR_SELECT_FIRMWARE_FILE: "Vyberte súbor firmvéru (.bin)"
|
||||||
STR_SELECT_FIRMWARE_FILE: "Vyberte súbor firmvéru (.bin)"
|
STR_NO_BIN_FILES: "Nenašli sa žiadne súbory .bin"
|
||||||
STR_NO_BIN_FILES: "Nenašli sa žiadne súbory .bin"
|
STR_VALIDATING_FIRMWARE: "Overuje sa firmvér..."
|
||||||
STR_VALIDATING_FIRMWARE: "Overuje sa firmvér..."
|
STR_INVALID_FIRMWARE: "Neplatný súbor firmvéru"
|
||||||
STR_INVALID_FIRMWARE: "Neplatný súbor firmvéru"
|
STR_FIRMWARE_TOO_LARGE: "Firmvér je príliš veľký pre partíciu"
|
||||||
STR_FIRMWARE_TOO_LARGE: "Firmvér je príliš veľký pre partíciu"
|
STR_FIRMWARE_TOO_SMALL: "Súbor firmvéru je príliš malý"
|
||||||
STR_FIRMWARE_TOO_SMALL: "Súbor firmvéru je príliš malý"
|
STR_FIRMWARE_UPDATE_PROMPT: "Aktualizovať firmvér?"
|
||||||
STR_FIRMWARE_UPDATE_PROMPT: "Aktualizovať firmvér?"
|
STR_FIRMWARE_FILE_OPEN_FAILED: "Nie je možné otvoriť súbor"
|
||||||
STR_FIRMWARE_FILE_OPEN_FAILED: "Nie je možné otvoriť súbor"
|
STR_FIRMWARE_WRITE_FAILED: "Zápis firmvéru zlyhal"
|
||||||
STR_FIRMWARE_WRITE_FAILED: "Zápis firmvéru zlyhal"
|
STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Nevypínajte zariadenie!"
|
||||||
STR_FIRMWARE_UPDATE_DO_NOT_POWER_OFF: "Nevypínajte zariadenie!"
|
STR_RECOVERY_MODE: "Režim obnovenia"
|
||||||
STR_RECOVERY_MODE: "Režim obnovenia"
|
STR_RECOVERY_MODE_HINT: "Umiestnite firmware.bin do koreňového adresára SD karty a vyberte ho"
|
||||||
STR_RECOVERY_MODE_HINT: "Umiestnite firmware.bin do koreňového adresára SD karty a vyberte ho"
|
|
||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Zatdi"
|
|||||||
STR_SHORT_PWR_BTN: "Kratek pritisk na gumb za vklop"
|
STR_SHORT_PWR_BTN: "Kratek pritisk na gumb za vklop"
|
||||||
STR_ORIENTATION: "Orientacija branja"
|
STR_ORIENTATION: "Orientacija branja"
|
||||||
STR_SIDE_BTN_LAYOUT: "Razpored stranskih gumbov"
|
STR_SIDE_BTN_LAYOUT: "Razpored stranskih gumbov"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Dotikalni nadzor (bralnik)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Usmeri sprednje gumbe"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Usmeri sprednje gumbe"
|
||||||
STR_LONG_PRESS_SKIP: "Dolgi pritisk za preskok poglavja"
|
STR_LONG_PRESS_SKIP: "Dolgi pritisk za preskok poglavja"
|
||||||
STR_FONT_PREVIEW_TEXT: "V kožuščku hudobnega fanta stopiclja mizar"
|
STR_FONT_PREVIEW_TEXT: "V kožuščku hudobnega fanta stopiclja mizar"
|
||||||
@@ -132,8 +133,7 @@ STR_SLEEP: "Spanje"
|
|||||||
STR_PAGE_TURN: "Obračanje strani"
|
STR_PAGE_TURN: "Obračanje strani"
|
||||||
STR_PORTRAIT: "Pokončno"
|
STR_PORTRAIT: "Pokončno"
|
||||||
STR_LANDSCAPE_CW: "Ležeče (v smeri urinega kazalca)"
|
STR_LANDSCAPE_CW: "Ležeče (v smeri urinega kazalca)"
|
||||||
STR_INVERTED: "Invertirano"
|
STR_INVERTED: "Obrnjeno"
|
||||||
STR_ORIENTATION_INVERTED: "Pokončno 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Ležeče (proti smeri urinega kazalca)"
|
STR_LANDSCAPE_CCW: "Ležeče (proti smeri urinega kazalca)"
|
||||||
STR_PREV_NEXT: "Nazaj/Naprej"
|
STR_PREV_NEXT: "Nazaj/Naprej"
|
||||||
STR_NEXT_PREV: "Naprej/Nazaj"
|
STR_NEXT_PREV: "Naprej/Nazaj"
|
||||||
@@ -185,9 +185,6 @@ STR_HOME: "« Domov"
|
|||||||
STR_SELECT: "Izberi"
|
STR_SELECT: "Izberi"
|
||||||
STR_SELECTED: "Izbrano"
|
STR_SELECTED: "Izbrano"
|
||||||
STR_TOGGLE: "Preklopi"
|
STR_TOGGLE: "Preklopi"
|
||||||
STR_TOGGLE_BOOKMARK: "Preklopi zaznamek"
|
|
||||||
STR_BOOKMARK_REMOVED: "Zaznamek odstranjen."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Držite Odpri za brisanje"
|
|
||||||
STR_CONFIRM: "Potrdi"
|
STR_CONFIRM: "Potrdi"
|
||||||
STR_CANCEL: "Prekliči"
|
STR_CANCEL: "Prekliči"
|
||||||
STR_CONNECT: "Poveži"
|
STR_CONNECT: "Poveži"
|
||||||
|
|||||||
@@ -72,6 +72,7 @@ STR_IMAGES_SUPPRESS: "Ocultar"
|
|||||||
STR_SHORT_PWR_BTN: "Toque corto del encendido"
|
STR_SHORT_PWR_BTN: "Toque corto del encendido"
|
||||||
STR_ORIENTATION: "Orientación"
|
STR_ORIENTATION: "Orientación"
|
||||||
STR_SIDE_BTN_LAYOUT: "Función botones laterales (lector)"
|
STR_SIDE_BTN_LAYOUT: "Función botones laterales (lector)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Controles táctiles (lector)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botones frontales"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botones frontales"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Al mantener pulsado un botón"
|
STR_LONG_PRESS_BEHAVIOR: "Al mantener pulsado un botón"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "No hacer nada"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "No hacer nada"
|
||||||
@@ -138,7 +139,6 @@ STR_FORCE_REFRESH: "Refrescar pant."
|
|||||||
STR_PORTRAIT: "Vertical"
|
STR_PORTRAIT: "Vertical"
|
||||||
STR_LANDSCAPE_CW: "Horizontal (horario)"
|
STR_LANDSCAPE_CW: "Horizontal (horario)"
|
||||||
STR_INVERTED: "Invertido"
|
STR_INVERTED: "Invertido"
|
||||||
STR_ORIENTATION_INVERTED: "Al revés"
|
|
||||||
STR_LANDSCAPE_CCW: "Horizontal (antihorario)"
|
STR_LANDSCAPE_CCW: "Horizontal (antihorario)"
|
||||||
STR_PREV_NEXT: "Ant./Sig."
|
STR_PREV_NEXT: "Ant./Sig."
|
||||||
STR_NEXT_PREV: "Sig./Ant."
|
STR_NEXT_PREV: "Sig./Ant."
|
||||||
@@ -179,7 +179,8 @@ STR_DOWNLOADING: "Descargando..."
|
|||||||
STR_DOWNLOAD_FAILED: "Fallo de descarga"
|
STR_DOWNLOAD_FAILED: "Fallo de descarga"
|
||||||
STR_ERROR_MSG: "Error:"
|
STR_ERROR_MSG: "Error:"
|
||||||
STR_UNNAMED: "Sin nombre"
|
STR_UNNAMED: "Sin nombre"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Mantenga pulsado Abrir para borrar"
|
STR_HOLD_CONFIRM_TO_DELETE: "Mantenga pulsado Confirmar para borrar"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Mantenga pulsado Confirmar en el lector para crear un marcador."
|
||||||
STR_NO_SERVER_URL: "No se configuró URL de servidor"
|
STR_NO_SERVER_URL: "No se configuró URL de servidor"
|
||||||
STR_FETCH_FEED_FAILED: "Fallo al obtener el feed"
|
STR_FETCH_FEED_FAILED: "Fallo al obtener el feed"
|
||||||
STR_PARSE_FEED_FAILED: "Fallo al procesar el feed"
|
STR_PARSE_FEED_FAILED: "Fallo al procesar el feed"
|
||||||
@@ -197,7 +198,6 @@ STR_HOME: "« Inicio"
|
|||||||
STR_SELECT: "Selecc."
|
STR_SELECT: "Selecc."
|
||||||
STR_SELECTED: "Seleccionado"
|
STR_SELECTED: "Seleccionado"
|
||||||
STR_TOGGLE: "Cambiar"
|
STR_TOGGLE: "Cambiar"
|
||||||
STR_TOGGLE_BOOKMARK: "Alternar marcador"
|
|
||||||
STR_CONFIRM: "Confirmar"
|
STR_CONFIRM: "Confirmar"
|
||||||
STR_CANCEL: "Cancelar"
|
STR_CANCEL: "Cancelar"
|
||||||
STR_CONNECT: "Conectar"
|
STR_CONNECT: "Conectar"
|
||||||
@@ -261,7 +261,6 @@ STR_QUICK_RESUME_TIMEOUT: "Reanudación rápida tras tiempo"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Reconfigurar botones frontales"
|
STR_REMAP_FRONT_BUTTONS: "Reconfigurar botones frontales"
|
||||||
STR_BOOKMARKS: "Marcadores"
|
STR_BOOKMARKS: "Marcadores"
|
||||||
STR_BOOKMARK_ADDED: "Marcador añadido."
|
STR_BOOKMARK_ADDED: "Marcador añadido."
|
||||||
STR_BOOKMARK_REMOVED: "Marcador eliminado."
|
|
||||||
STR_OPDS_BROWSER: "Navegador OPDS"
|
STR_OPDS_BROWSER: "Navegador OPDS"
|
||||||
STR_SEARCH: "Buscar"
|
STR_SEARCH: "Buscar"
|
||||||
STR_COVER_CUSTOM: "Portada + Pers."
|
STR_COVER_CUSTOM: "Portada + Pers."
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Dölj"
|
|||||||
STR_SHORT_PWR_BTN: "Kort strömknappsklick"
|
STR_SHORT_PWR_BTN: "Kort strömknappsklick"
|
||||||
STR_ORIENTATION: "Läsrikting"
|
STR_ORIENTATION: "Läsrikting"
|
||||||
STR_SIDE_BTN_LAYOUT: "Sidoknappslayout (Läsare)"
|
STR_SIDE_BTN_LAYOUT: "Sidoknappslayout (Läsare)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Pekkontroller (läsare)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Rikta främre knappar"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Rikta främre knappar"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Beteende vid lång knapptryckning"
|
STR_LONG_PRESS_BEHAVIOR: "Beteende vid lång knapptryckning"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "AV"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "AV"
|
||||||
@@ -138,7 +139,6 @@ STR_FORCE_REFRESH: "Uppdatera skärmen"
|
|||||||
STR_PORTRAIT: "Porträtt"
|
STR_PORTRAIT: "Porträtt"
|
||||||
STR_LANDSCAPE_CW: "Landskap medurs"
|
STR_LANDSCAPE_CW: "Landskap medurs"
|
||||||
STR_INVERTED: "Inverterad"
|
STR_INVERTED: "Inverterad"
|
||||||
STR_ORIENTATION_INVERTED: "Porträtt 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Landskap moturs"
|
STR_LANDSCAPE_CCW: "Landskap moturs"
|
||||||
STR_PREV_NEXT: "Förra/Nästa"
|
STR_PREV_NEXT: "Förra/Nästa"
|
||||||
STR_NEXT_PREV: "Nästa/Förra"
|
STR_NEXT_PREV: "Nästa/Förra"
|
||||||
@@ -177,7 +177,8 @@ STR_DOWNLOADING: "Laddar ner…"
|
|||||||
STR_DOWNLOAD_FAILED: "Nedladdning misslyckades"
|
STR_DOWNLOAD_FAILED: "Nedladdning misslyckades"
|
||||||
STR_ERROR_MSG: "Fel:"
|
STR_ERROR_MSG: "Fel:"
|
||||||
STR_UNNAMED: "Ej namngiven"
|
STR_UNNAMED: "Ej namngiven"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Håll ned Öppna för att radera"
|
STR_HOLD_CONFIRM_TO_DELETE: "Håll ned Bekräfta för att radera"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Håll Bekräfta i läsaren för att skapa ett bokmärke."
|
||||||
STR_NO_SERVER_URL: "Ingen serveradress konfigurerad"
|
STR_NO_SERVER_URL: "Ingen serveradress konfigurerad"
|
||||||
STR_FETCH_FEED_FAILED: "Misslyckades att hämta flöde"
|
STR_FETCH_FEED_FAILED: "Misslyckades att hämta flöde"
|
||||||
STR_PARSE_FEED_FAILED: "Misslyckades att analysera flöde"
|
STR_PARSE_FEED_FAILED: "Misslyckades att analysera flöde"
|
||||||
@@ -195,7 +196,6 @@ STR_HOME: "« Hem"
|
|||||||
STR_SELECT: "Välj "
|
STR_SELECT: "Välj "
|
||||||
STR_SELECTED: "Vald"
|
STR_SELECTED: "Vald"
|
||||||
STR_TOGGLE: "Växla"
|
STR_TOGGLE: "Växla"
|
||||||
STR_TOGGLE_BOOKMARK: "Växla bokmärke"
|
|
||||||
STR_CONFIRM: "Bekräfta"
|
STR_CONFIRM: "Bekräfta"
|
||||||
STR_CANCEL: "Avbryt"
|
STR_CANCEL: "Avbryt"
|
||||||
STR_CONNECT: "Anslut"
|
STR_CONNECT: "Anslut"
|
||||||
@@ -259,7 +259,6 @@ STR_QUICK_RESUME_TIMEOUT: "Snabb återupptagning efter timeout"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Ändra frontknappar"
|
STR_REMAP_FRONT_BUTTONS: "Ändra frontknappar"
|
||||||
STR_BOOKMARKS: "Bokmärken"
|
STR_BOOKMARKS: "Bokmärken"
|
||||||
STR_BOOKMARK_ADDED: "Bokmärke tillagt."
|
STR_BOOKMARK_ADDED: "Bokmärke tillagt."
|
||||||
STR_BOOKMARK_REMOVED: "Bokmärke borttaget."
|
|
||||||
STR_OPDS_BROWSER: "OPDS-webbläsare"
|
STR_OPDS_BROWSER: "OPDS-webbläsare"
|
||||||
STR_SEARCH: "Sök"
|
STR_SEARCH: "Sök"
|
||||||
STR_COVER_CUSTOM: "Omslag + Valfri"
|
STR_COVER_CUSTOM: "Omslag + Valfri"
|
||||||
|
|||||||
@@ -67,6 +67,7 @@ STR_TEXT_AA: "Metin Yumuşatma (AA)"
|
|||||||
STR_SHORT_PWR_BTN: "Kısa Güç Tuşu Tıklaması"
|
STR_SHORT_PWR_BTN: "Kısa Güç Tuşu Tıklaması"
|
||||||
STR_ORIENTATION: "Okuma Yönü"
|
STR_ORIENTATION: "Okuma Yönü"
|
||||||
STR_SIDE_BTN_LAYOUT: "Yan Tuş Dizilimi (okuyucu)"
|
STR_SIDE_BTN_LAYOUT: "Yan Tuş Dizilimi (okuyucu)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Dokunmatik okuyucu kontrolleri"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Ön düğmeleri yönlendir"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Ön düğmeleri yönlendir"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
STR_LONG_PRESS_BEHAVIOR: "Long-press button behavior"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "OFF"
|
||||||
@@ -130,8 +131,7 @@ STR_SLEEP: "Uyku"
|
|||||||
STR_PAGE_TURN: "Sayfa Çevirme"
|
STR_PAGE_TURN: "Sayfa Çevirme"
|
||||||
STR_PORTRAIT: "Dikey"
|
STR_PORTRAIT: "Dikey"
|
||||||
STR_LANDSCAPE_CW: "Yatay (Saat Yönü)"
|
STR_LANDSCAPE_CW: "Yatay (Saat Yönü)"
|
||||||
STR_INVERTED: "Negatif"
|
STR_INVERTED: "Ters"
|
||||||
STR_ORIENTATION_INVERTED: "Dikey 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Yatay (Saat Yönü Tersi)"
|
STR_LANDSCAPE_CCW: "Yatay (Saat Yönü Tersi)"
|
||||||
STR_PREV_NEXT: "Önceki/Sonraki"
|
STR_PREV_NEXT: "Önceki/Sonraki"
|
||||||
STR_NEXT_PREV: "Sonraki/Önceki"
|
STR_NEXT_PREV: "Sonraki/Önceki"
|
||||||
@@ -182,9 +182,6 @@ STR_EXIT: "« Çıkış"
|
|||||||
STR_HOME: "« Ana Sayfa"
|
STR_HOME: "« Ana Sayfa"
|
||||||
STR_SELECT: "Seç"
|
STR_SELECT: "Seç"
|
||||||
STR_TOGGLE: "Değiştir"
|
STR_TOGGLE: "Değiştir"
|
||||||
STR_TOGGLE_BOOKMARK: "Yer imini değiştir"
|
|
||||||
STR_BOOKMARK_REMOVED: "Yer imi kaldırıldı."
|
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Silmek için Aç düğmesini basılı tutun"
|
|
||||||
STR_CONFIRM: "Onayla"
|
STR_CONFIRM: "Onayla"
|
||||||
STR_CANCEL: "İptal"
|
STR_CANCEL: "İptal"
|
||||||
STR_CONNECT: "Bağlan"
|
STR_CONNECT: "Bağlan"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Приховати"
|
|||||||
STR_SHORT_PWR_BTN: "Короткий натиск кн. живл."
|
STR_SHORT_PWR_BTN: "Короткий натиск кн. живл."
|
||||||
STR_ORIENTATION: "Орієнтація читання"
|
STR_ORIENTATION: "Орієнтація читання"
|
||||||
STR_SIDE_BTN_LAYOUT: "Схема бічних кнопок"
|
STR_SIDE_BTN_LAYOUT: "Схема бічних кнопок"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Сенсорне керування читанням"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Орієнтувати передні кнопки"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Орієнтувати передні кнопки"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Поведінка при довгому настику"
|
STR_LONG_PRESS_BEHAVIOR: "Поведінка при довгому настику"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Немає"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Немає"
|
||||||
@@ -137,8 +138,7 @@ STR_PAGE_TURN: "Наст. сторінка"
|
|||||||
STR_FORCE_REFRESH: "Оновити екран"
|
STR_FORCE_REFRESH: "Оновити екран"
|
||||||
STR_PORTRAIT: "Книжкова"
|
STR_PORTRAIT: "Книжкова"
|
||||||
STR_LANDSCAPE_CW: "Альбом. за год."
|
STR_LANDSCAPE_CW: "Альбом. за год."
|
||||||
STR_INVERTED: "Інверсія"
|
STR_INVERTED: "Перевернутий"
|
||||||
STR_ORIENTATION_INVERTED: "Книжкова 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Альбом. проти год."
|
STR_LANDSCAPE_CCW: "Альбом. проти год."
|
||||||
STR_PREV_NEXT: "Попер/Наст"
|
STR_PREV_NEXT: "Попер/Наст"
|
||||||
STR_NEXT_PREV: "Наст/Попер"
|
STR_NEXT_PREV: "Наст/Попер"
|
||||||
@@ -177,7 +177,8 @@ STR_DOWNLOADING: "Завантаження..."
|
|||||||
STR_DOWNLOAD_FAILED: "Завантаження не вдалося"
|
STR_DOWNLOAD_FAILED: "Завантаження не вдалося"
|
||||||
STR_ERROR_MSG: "Помилка:"
|
STR_ERROR_MSG: "Помилка:"
|
||||||
STR_UNNAMED: "Без назви"
|
STR_UNNAMED: "Без назви"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Утримуйте Відкрити, щоб видалити"
|
STR_HOLD_CONFIRM_TO_DELETE: "Утрим. Підтвердити, щоб Видалити"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Утрим. Підтвердити в книзі, щоб створ. закладку"
|
||||||
STR_NO_SERVER_URL: "URL сервера не налаштовано"
|
STR_NO_SERVER_URL: "URL сервера не налаштовано"
|
||||||
STR_FETCH_FEED_FAILED: "Не вдалося отримати стрічку"
|
STR_FETCH_FEED_FAILED: "Не вдалося отримати стрічку"
|
||||||
STR_PARSE_FEED_FAILED: "Не вдалося розпарсити стрічку"
|
STR_PARSE_FEED_FAILED: "Не вдалося розпарсити стрічку"
|
||||||
@@ -195,7 +196,6 @@ STR_HOME: "« Додому"
|
|||||||
STR_SELECT: "Вибрати"
|
STR_SELECT: "Вибрати"
|
||||||
STR_SELECTED: "Вибрано"
|
STR_SELECTED: "Вибрано"
|
||||||
STR_TOGGLE: "Обрати"
|
STR_TOGGLE: "Обрати"
|
||||||
STR_TOGGLE_BOOKMARK: "Перемкнути закладку"
|
|
||||||
STR_CONFIRM: "Підтвердити"
|
STR_CONFIRM: "Підтвердити"
|
||||||
STR_CANCEL: "Скасувати"
|
STR_CANCEL: "Скасувати"
|
||||||
STR_CONNECT: "Приєдн."
|
STR_CONNECT: "Приєдн."
|
||||||
@@ -258,7 +258,6 @@ STR_SUNLIGHT_FADING_FIX: "Виправлення вицвітання на со
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Налаштувати передні кнопки"
|
STR_REMAP_FRONT_BUTTONS: "Налаштувати передні кнопки"
|
||||||
STR_BOOKMARKS: "Закладки"
|
STR_BOOKMARKS: "Закладки"
|
||||||
STR_BOOKMARK_ADDED: "Закладку додано"
|
STR_BOOKMARK_ADDED: "Закладку додано"
|
||||||
STR_BOOKMARK_REMOVED: "Закладку видалено"
|
|
||||||
STR_OPDS_BROWSER: "Браузер OPDS"
|
STR_OPDS_BROWSER: "Браузер OPDS"
|
||||||
STR_SEARCH: "Пошук"
|
STR_SEARCH: "Пошук"
|
||||||
STR_COVER_CUSTOM: "Обкл. + власне"
|
STR_COVER_CUSTOM: "Обкл. + власне"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Eliminar"
|
|||||||
STR_SHORT_PWR_BTN: "Clic curt del botó d'engegada"
|
STR_SHORT_PWR_BTN: "Clic curt del botó d'engegada"
|
||||||
STR_ORIENTATION: "Orientació de lectura"
|
STR_ORIENTATION: "Orientació de lectura"
|
||||||
STR_SIDE_BTN_LAYOUT: "Disposició botons laterals"
|
STR_SIDE_BTN_LAYOUT: "Disposició botons laterals"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Controls tàctils del lector"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botons frontals"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Orientar botons frontals"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Comportament de prémer llargament el botó"
|
STR_LONG_PRESS_BEHAVIOR: "Comportament de prémer llargament el botó"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivat"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "Desactivat"
|
||||||
@@ -141,7 +142,6 @@ STR_PAGE_TURN: "Canvi de pàgina"
|
|||||||
STR_PORTRAIT: "Vertical"
|
STR_PORTRAIT: "Vertical"
|
||||||
STR_LANDSCAPE_CW: "Horitzontal horari"
|
STR_LANDSCAPE_CW: "Horitzontal horari"
|
||||||
STR_INVERTED: "Invertit"
|
STR_INVERTED: "Invertit"
|
||||||
STR_ORIENTATION_INVERTED: "Vertical 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Horitzontal antihorari"
|
STR_LANDSCAPE_CCW: "Horitzontal antihorari"
|
||||||
STR_PREV_NEXT: "Anterior/Següent"
|
STR_PREV_NEXT: "Anterior/Següent"
|
||||||
STR_NEXT_PREV: "Següent/Anterior"
|
STR_NEXT_PREV: "Següent/Anterior"
|
||||||
@@ -181,7 +181,8 @@ STR_DOWNLOADING: "S'està baixant..."
|
|||||||
STR_DOWNLOAD_FAILED: "Ha fallat la baixada"
|
STR_DOWNLOAD_FAILED: "Ha fallat la baixada"
|
||||||
STR_ERROR_MSG: "Error:"
|
STR_ERROR_MSG: "Error:"
|
||||||
STR_UNNAMED: "Sense nom"
|
STR_UNNAMED: "Sense nom"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Manteniu premut Obre per esborrar"
|
STR_HOLD_CONFIRM_TO_DELETE: "Manteniu premut Confirma per esborrar"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Manteniu premut Confirma al lector per crear un punt de llibre."
|
||||||
STR_NO_SERVER_URL: "No s'ha configurat cap URL de servidor"
|
STR_NO_SERVER_URL: "No s'ha configurat cap URL de servidor"
|
||||||
STR_FETCH_FEED_FAILED: "Ha fallat l'obtenció del feed"
|
STR_FETCH_FEED_FAILED: "Ha fallat l'obtenció del feed"
|
||||||
STR_PARSE_FEED_FAILED: "Ha fallat l'anàlisi del feed"
|
STR_PARSE_FEED_FAILED: "Ha fallat l'anàlisi del feed"
|
||||||
@@ -197,7 +198,6 @@ STR_HOME: "« Inici"
|
|||||||
STR_SELECT: "Selecciona"
|
STR_SELECT: "Selecciona"
|
||||||
STR_SELECTED: "Seleccionat"
|
STR_SELECTED: "Seleccionat"
|
||||||
STR_TOGGLE: "Canvia"
|
STR_TOGGLE: "Canvia"
|
||||||
STR_TOGGLE_BOOKMARK: "Canvia punt de llibre"
|
|
||||||
STR_CONFIRM: "Confirma"
|
STR_CONFIRM: "Confirma"
|
||||||
STR_CANCEL: "Cancel·la"
|
STR_CANCEL: "Cancel·la"
|
||||||
STR_CONNECT: "Connecta"
|
STR_CONNECT: "Connecta"
|
||||||
@@ -241,7 +241,6 @@ STR_SUNLIGHT_FADING_FIX: "Correcció de l'esvaïment pel sol"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Reassigna els botons frontals"
|
STR_REMAP_FRONT_BUTTONS: "Reassigna els botons frontals"
|
||||||
STR_BOOKMARKS: "Punts de llibre"
|
STR_BOOKMARKS: "Punts de llibre"
|
||||||
STR_BOOKMARK_ADDED: "S'ha afegit el punt de llibre."
|
STR_BOOKMARK_ADDED: "S'ha afegit el punt de llibre."
|
||||||
STR_BOOKMARK_REMOVED: "S'ha eliminat el punt de llibre."
|
|
||||||
STR_OPDS_BROWSER: "Navegador OPDS"
|
STR_OPDS_BROWSER: "Navegador OPDS"
|
||||||
STR_COVER_CUSTOM: "Portada + Personalitzat"
|
STR_COVER_CUSTOM: "Portada + Personalitzat"
|
||||||
STR_QUICK_RESUME: "Represa ràpida"
|
STR_QUICK_RESUME: "Represa ràpida"
|
||||||
|
|||||||
@@ -73,6 +73,7 @@ STR_IMAGES_SUPPRESS: "Ẩn đi"
|
|||||||
STR_SHORT_PWR_BTN: "Nhấn nhanh nút nguồn"
|
STR_SHORT_PWR_BTN: "Nhấn nhanh nút nguồn"
|
||||||
STR_ORIENTATION: "Hướng đọc"
|
STR_ORIENTATION: "Hướng đọc"
|
||||||
STR_SIDE_BTN_LAYOUT: "Bố trí nút bên (trình đọc)"
|
STR_SIDE_BTN_LAYOUT: "Bố trí nút bên (trình đọc)"
|
||||||
|
STR_TOUCH_READER_CONTROLS: "Điều khiển cảm ứng (trình đọc)"
|
||||||
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Xoay nút trước theo hướng"
|
STR_FRONT_BTN_FOLLOW_ORIENTATION: "Xoay nút trước theo hướng"
|
||||||
STR_LONG_PRESS_BEHAVIOR: "Hành vi nhấn giữ nút"
|
STR_LONG_PRESS_BEHAVIOR: "Hành vi nhấn giữ nút"
|
||||||
STR_LONG_PRESS_BEHAVIOR_OFF: "TẮT"
|
STR_LONG_PRESS_BEHAVIOR_OFF: "TẮT"
|
||||||
@@ -137,8 +138,7 @@ STR_PAGE_TURN: "Lật trang"
|
|||||||
STR_FORCE_REFRESH: "Làm tươi màn hình"
|
STR_FORCE_REFRESH: "Làm tươi màn hình"
|
||||||
STR_PORTRAIT: "Dọc"
|
STR_PORTRAIT: "Dọc"
|
||||||
STR_LANDSCAPE_CW: "Ngang (thuận)"
|
STR_LANDSCAPE_CW: "Ngang (thuận)"
|
||||||
STR_INVERTED: "Đảo màu"
|
STR_INVERTED: "Lật ngược"
|
||||||
STR_ORIENTATION_INVERTED: "Dọc 180°"
|
|
||||||
STR_LANDSCAPE_CCW: "Ngang (ngược)"
|
STR_LANDSCAPE_CCW: "Ngang (ngược)"
|
||||||
STR_PREV_NEXT: "Trước/Sau"
|
STR_PREV_NEXT: "Trước/Sau"
|
||||||
STR_NEXT_PREV: "Sau/Trước"
|
STR_NEXT_PREV: "Sau/Trước"
|
||||||
@@ -177,7 +177,8 @@ STR_DOWNLOADING: "Đang tải về..."
|
|||||||
STR_DOWNLOAD_FAILED: "Tải về thất bại"
|
STR_DOWNLOAD_FAILED: "Tải về thất bại"
|
||||||
STR_ERROR_MSG: "Lỗi:"
|
STR_ERROR_MSG: "Lỗi:"
|
||||||
STR_UNNAMED: "Không tên"
|
STR_UNNAMED: "Không tên"
|
||||||
STR_HOLD_OPEN_TO_DELETE: "Giữ Mở để xóa"
|
STR_HOLD_CONFIRM_TO_DELETE: "Giữ Xác nhận để xóa"
|
||||||
|
STR_BOOKMARK_INSTRUCTIONS: "Giữ Xác nhận trong trình đọc để tạo dấu trang."
|
||||||
STR_NO_SERVER_URL: "Chưa cấu hình URL máy chủ"
|
STR_NO_SERVER_URL: "Chưa cấu hình URL máy chủ"
|
||||||
STR_FETCH_FEED_FAILED: "Không tải được nguồn cấp"
|
STR_FETCH_FEED_FAILED: "Không tải được nguồn cấp"
|
||||||
STR_PARSE_FEED_FAILED: "Không phân tích được nguồn cấp"
|
STR_PARSE_FEED_FAILED: "Không phân tích được nguồn cấp"
|
||||||
@@ -195,7 +196,6 @@ STR_HOME: "« Thư viện"
|
|||||||
STR_SELECT: "Chọn"
|
STR_SELECT: "Chọn"
|
||||||
STR_SELECTED: "Đã chọn"
|
STR_SELECTED: "Đã chọn"
|
||||||
STR_TOGGLE: "Bật/Tắt"
|
STR_TOGGLE: "Bật/Tắt"
|
||||||
STR_TOGGLE_BOOKMARK: "Bật/tắt dấu trang"
|
|
||||||
STR_CONFIRM: "Xác nhận"
|
STR_CONFIRM: "Xác nhận"
|
||||||
STR_CANCEL: "Hủy"
|
STR_CANCEL: "Hủy"
|
||||||
STR_CONNECT: "Kết nối"
|
STR_CONNECT: "Kết nối"
|
||||||
@@ -258,7 +258,6 @@ STR_SUNLIGHT_FADING_FIX: "Khắc phục mờ dưới nắng"
|
|||||||
STR_REMAP_FRONT_BUTTONS: "Gán lại nút mặt trước"
|
STR_REMAP_FRONT_BUTTONS: "Gán lại nút mặt trước"
|
||||||
STR_BOOKMARKS: "Dấu trang"
|
STR_BOOKMARKS: "Dấu trang"
|
||||||
STR_BOOKMARK_ADDED: "Đã thêm dấu trang."
|
STR_BOOKMARK_ADDED: "Đã thêm dấu trang."
|
||||||
STR_BOOKMARK_REMOVED: "Đã xóa dấu trang."
|
|
||||||
STR_OPDS_BROWSER: "Trình duyệt OPDS"
|
STR_OPDS_BROWSER: "Trình duyệt OPDS"
|
||||||
STR_SEARCH: "Tìm kiếm"
|
STR_SEARCH: "Tìm kiếm"
|
||||||
STR_COVER_CUSTOM: "Ảnh bìa + Tùy chỉnh"
|
STR_COVER_CUSTOM: "Ảnh bìa + Tùy chỉnh"
|
||||||
|
|||||||
@@ -164,7 +164,6 @@ namespace {
|
|||||||
constexpr int MAX_MCU_HEIGHT = 16;
|
constexpr int MAX_MCU_HEIGHT = 16;
|
||||||
constexpr size_t JPEG_DECODER_SIZE = 20 * 1024;
|
constexpr size_t JPEG_DECODER_SIZE = 20 * 1024;
|
||||||
constexpr size_t MIN_FREE_HEAP = JPEG_DECODER_SIZE + 32 * 1024;
|
constexpr size_t MIN_FREE_HEAP = JPEG_DECODER_SIZE + 32 * 1024;
|
||||||
constexpr uint32_t FP_ONE = 1UL << 16;
|
|
||||||
|
|
||||||
// Static file pointer for JPEGDEC open callback.
|
// Static file pointer for JPEGDEC open callback.
|
||||||
// Safe in single-threaded embedded context; never accessed concurrently.
|
// Safe in single-threaded embedded context; never accessed concurrently.
|
||||||
@@ -209,9 +208,6 @@ struct BmpConvertCtx {
|
|||||||
bool needsScaling;
|
bool needsScaling;
|
||||||
uint32_t scaleX_fp; // source pixels per output pixel, 16.16 fixed-point
|
uint32_t scaleX_fp; // source pixels per output pixel, 16.16 fixed-point
|
||||||
uint32_t scaleY_fp;
|
uint32_t scaleY_fp;
|
||||||
bool smoothUpscale;
|
|
||||||
uint32_t smoothScaleX_fp;
|
|
||||||
uint32_t smoothScaleY_fp;
|
|
||||||
|
|
||||||
// Accumulates one MCU row (up to MAX_MCU_HEIGHT source rows × srcWidth pixels)
|
// Accumulates one MCU row (up to MAX_MCU_HEIGHT source rows × srcWidth pixels)
|
||||||
// Filled column-by-column as JPEGDEC callbacks arrive for the same MCU row
|
// Filled column-by-column as JPEGDEC callbacks arrive for the same MCU row
|
||||||
@@ -223,13 +219,6 @@ struct BmpConvertCtx {
|
|||||||
std::unique_ptr<uint32_t[]> rowAccum;
|
std::unique_ptr<uint32_t[]> rowAccum;
|
||||||
std::unique_ptr<uint32_t[]> rowCount;
|
std::unique_ptr<uint32_t[]> rowCount;
|
||||||
|
|
||||||
int smoothNextOutY;
|
|
||||||
int smoothPrevY;
|
|
||||||
std::unique_ptr<uint8_t[]> smoothRows;
|
|
||||||
uint8_t* smoothPrevRow;
|
|
||||||
uint8_t* smoothCurrRow;
|
|
||||||
uint8_t* smoothOutRow;
|
|
||||||
|
|
||||||
std::unique_ptr<uint8_t[]> bmpRow;
|
std::unique_ptr<uint8_t[]> bmpRow;
|
||||||
|
|
||||||
std::unique_ptr<AtkinsonDitherer> atkinsonDitherer;
|
std::unique_ptr<AtkinsonDitherer> atkinsonDitherer;
|
||||||
@@ -276,88 +265,6 @@ static void writeOutputRow(BmpConvertCtx* ctx, const uint8_t* srcRow, int outY)
|
|||||||
ctx->bmpOut->write(ctx->bmpRow.get(), ctx->bytesPerRow);
|
ctx->bmpOut->write(ctx->bmpRow.get(), ctx->bytesPerRow);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Matches the progressive-JPEG smoothing used by JpegToFramebufferConverter, but stays
|
|
||||||
// local because cover generation streams dithered BMP rows instead of framebuffer pixels.
|
|
||||||
static uint32_t interpolationStep(const int srcSize, const int outSize) {
|
|
||||||
if (srcSize <= 1 || outSize <= 1) return 0;
|
|
||||||
return (static_cast<uint32_t>(srcSize - 1) << 16) / static_cast<uint32_t>(outSize - 1);
|
|
||||||
}
|
|
||||||
|
|
||||||
static uint32_t interpolatedSourceFp(const int outIndex, const int outSize, const int srcSize, const uint32_t step) {
|
|
||||||
if (srcSize <= 1 || outSize <= 1) return 0;
|
|
||||||
if (outIndex >= outSize - 1) return static_cast<uint32_t>(srcSize - 1) << 16;
|
|
||||||
return static_cast<uint32_t>(outIndex) * step;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void scaleRowLinear(BmpConvertCtx* ctx, const uint8_t* srcRow, uint8_t* dstRow) {
|
|
||||||
for (int outX = 0; outX < ctx->outWidth; outX++) {
|
|
||||||
const uint32_t srcX_fp = interpolatedSourceFp(outX, ctx->outWidth, ctx->srcWidth, ctx->smoothScaleX_fp);
|
|
||||||
const int x0 = srcX_fp >> 16;
|
|
||||||
const int x1 = (x0 + 1 < ctx->srcWidth) ? (x0 + 1) : x0;
|
|
||||||
const uint32_t fx = srcX_fp & (FP_ONE - 1);
|
|
||||||
dstRow[outX] = static_cast<uint8_t>((srcRow[x0] * (FP_ONE - fx) + srcRow[x1] * fx) >> 16);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
static void writeBlendedRow(BmpConvertCtx* ctx, const uint8_t* row0, const uint8_t* row1, const uint32_t fy,
|
|
||||||
const int outY) {
|
|
||||||
const uint32_t invFy = FP_ONE - fy;
|
|
||||||
for (int outX = 0; outX < ctx->outWidth; outX++) {
|
|
||||||
ctx->smoothOutRow[outX] = static_cast<uint8_t>((row0[outX] * invFy + row1[outX] * fy) >> 16);
|
|
||||||
}
|
|
||||||
writeOutputRow(ctx, ctx->smoothOutRow, outY);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void processSmoothSourceRow(BmpConvertCtx* ctx, const uint8_t* srcRow, const int srcY) {
|
|
||||||
scaleRowLinear(ctx, srcRow, ctx->smoothCurrRow);
|
|
||||||
|
|
||||||
if (ctx->smoothPrevY < 0) {
|
|
||||||
uint8_t* tmp = ctx->smoothPrevRow;
|
|
||||||
ctx->smoothPrevRow = ctx->smoothCurrRow;
|
|
||||||
ctx->smoothCurrRow = tmp;
|
|
||||||
ctx->smoothPrevY = srcY;
|
|
||||||
if (ctx->srcHeight <= 1) {
|
|
||||||
while (ctx->smoothNextOutY < ctx->outHeight) {
|
|
||||||
writeOutputRow(ctx, ctx->smoothPrevRow, ctx->smoothNextOutY);
|
|
||||||
ctx->smoothNextOutY++;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (ctx->smoothNextOutY < ctx->outHeight) {
|
|
||||||
const uint32_t srcY_fp =
|
|
||||||
interpolatedSourceFp(ctx->smoothNextOutY, ctx->outHeight, ctx->srcHeight, ctx->smoothScaleY_fp);
|
|
||||||
const int y0 = srcY_fp >> 16;
|
|
||||||
const int y1 = (y0 + 1 < ctx->srcHeight) ? (y0 + 1) : y0;
|
|
||||||
if (y1 > srcY) break;
|
|
||||||
|
|
||||||
const uint8_t* row0 = (y0 == srcY) ? ctx->smoothCurrRow : ctx->smoothPrevRow;
|
|
||||||
const uint8_t* row1 = (y1 == srcY) ? ctx->smoothCurrRow : ctx->smoothPrevRow;
|
|
||||||
writeBlendedRow(ctx, row0, row1, srcY_fp & (FP_ONE - 1), ctx->smoothNextOutY);
|
|
||||||
ctx->smoothNextOutY++;
|
|
||||||
}
|
|
||||||
|
|
||||||
uint8_t* tmp = ctx->smoothPrevRow;
|
|
||||||
ctx->smoothPrevRow = ctx->smoothCurrRow;
|
|
||||||
ctx->smoothCurrRow = tmp;
|
|
||||||
ctx->smoothPrevY = srcY;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void finishSmoothUpscale(BmpConvertCtx* ctx) {
|
|
||||||
if (ctx->smoothPrevY < 0) {
|
|
||||||
LOG_ERR("JPG", "No progressive rows decoded for smoothing");
|
|
||||||
ctx->error = true;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
while (ctx->smoothNextOutY < ctx->outHeight) {
|
|
||||||
writeOutputRow(ctx, ctx->smoothPrevRow, ctx->smoothNextOutY);
|
|
||||||
ctx->smoothNextOutY++;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Flush one scaled output row from Y-axis accumulators and advance currentOutY
|
// Flush one scaled output row from Y-axis accumulators and advance currentOutY
|
||||||
static void flushScaledRow(BmpConvertCtx* ctx) {
|
static void flushScaledRow(BmpConvertCtx* ctx) {
|
||||||
memset(ctx->bmpRow.get(), 0, ctx->bytesPerRow);
|
memset(ctx->bmpRow.get(), 0, ctx->bytesPerRow);
|
||||||
@@ -437,9 +344,7 @@ int bmpDrawCallback(JPEGDRAW* pDraw) {
|
|||||||
for (int y = blockY; y < endRow && y < ctx->srcHeight; y++) {
|
for (int y = blockY; y < endRow && y < ctx->srcHeight; y++) {
|
||||||
const uint8_t* srcRow = ctx->mcuBuf.get() + (y - blockY) * ctx->srcWidth;
|
const uint8_t* srcRow = ctx->mcuBuf.get() + (y - blockY) * ctx->srcWidth;
|
||||||
|
|
||||||
if (ctx->smoothUpscale) {
|
if (!ctx->needsScaling) {
|
||||||
processSmoothSourceRow(ctx, srcRow, y);
|
|
||||||
} else if (!ctx->needsScaling) {
|
|
||||||
// 1:1 — outWidth == srcWidth, write directly
|
// 1:1 — outWidth == srcWidth, write directly
|
||||||
writeOutputRow(ctx, srcRow, y);
|
writeOutputRow(ctx, srcRow, y);
|
||||||
} else {
|
} else {
|
||||||
@@ -567,9 +472,6 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(HalFile& jpegFile, Print& b
|
|||||||
needsScaling = true;
|
needsScaling = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool smoothUpscale =
|
|
||||||
progressiveDecode && needsScaling && scaleSrcWidth <= outWidth && scaleSrcHeight <= outHeight;
|
|
||||||
|
|
||||||
// Write BMP header with output dimensions
|
// Write BMP header with output dimensions
|
||||||
int bytesPerRow;
|
int bytesPerRow;
|
||||||
if (USE_8BIT_OUTPUT && !oneBit) {
|
if (USE_8BIT_OUTPUT && !oneBit) {
|
||||||
@@ -594,11 +496,6 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(HalFile& jpegFile, Print& b
|
|||||||
ctx.needsScaling = needsScaling;
|
ctx.needsScaling = needsScaling;
|
||||||
ctx.scaleX_fp = scaleX_fp;
|
ctx.scaleX_fp = scaleX_fp;
|
||||||
ctx.scaleY_fp = scaleY_fp;
|
ctx.scaleY_fp = scaleY_fp;
|
||||||
ctx.smoothUpscale = smoothUpscale;
|
|
||||||
ctx.smoothScaleX_fp = interpolationStep(ctx.srcWidth, outWidth);
|
|
||||||
ctx.smoothScaleY_fp = interpolationStep(ctx.srcHeight, outHeight);
|
|
||||||
ctx.smoothNextOutY = 0;
|
|
||||||
ctx.smoothPrevY = -1;
|
|
||||||
ctx.error = false;
|
ctx.error = false;
|
||||||
|
|
||||||
// MCU row buffer: MAX_MCU_HEIGHT rows × decoded srcWidth columns of grayscale
|
// MCU row buffer: MAX_MCU_HEIGHT rows × decoded srcWidth columns of grayscale
|
||||||
@@ -615,20 +512,7 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(HalFile& jpegFile, Print& b
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (smoothUpscale) {
|
if (needsScaling) {
|
||||||
// One contiguous allocation avoids three heap blocks while keeping smoothing line-buffered.
|
|
||||||
const size_t smoothRowsBytes = static_cast<size_t>(outWidth) * 3;
|
|
||||||
ctx.smoothRows = makeUniqueNoThrow<uint8_t[]>(smoothRowsBytes);
|
|
||||||
if (!ctx.smoothRows) {
|
|
||||||
LOG_ERR("JPG", "OOM: progressive smoothing buffers");
|
|
||||||
return false;
|
|
||||||
}
|
|
||||||
ctx.smoothPrevRow = ctx.smoothRows.get();
|
|
||||||
ctx.smoothCurrRow = ctx.smoothPrevRow + outWidth;
|
|
||||||
ctx.smoothOutRow = ctx.smoothCurrRow + outWidth;
|
|
||||||
LOG_DBG("JPG", "Progressive smoothing: %dx%d -> %dx%d, buffers=%u bytes", ctx.srcWidth, ctx.srcHeight, outWidth,
|
|
||||||
outHeight, static_cast<unsigned>(smoothRowsBytes));
|
|
||||||
} else if (needsScaling) {
|
|
||||||
ctx.rowAccum = makeUniqueNoThrow<uint32_t[]>(outWidth);
|
ctx.rowAccum = makeUniqueNoThrow<uint32_t[]>(outWidth);
|
||||||
ctx.rowCount = makeUniqueNoThrow<uint32_t[]>(outWidth);
|
ctx.rowCount = makeUniqueNoThrow<uint32_t[]>(outWidth);
|
||||||
if (!ctx.rowAccum || !ctx.rowCount) {
|
if (!ctx.rowAccum || !ctx.rowCount) {
|
||||||
@@ -665,10 +549,6 @@ bool JpegToBmpConverter::jpegFileToBmpStreamInternal(HalFile& jpegFile, Print& b
|
|||||||
|
|
||||||
rc = jpeg->decode(0, 0, 0);
|
rc = jpeg->decode(0, 0, 0);
|
||||||
|
|
||||||
if (rc == 1 && ctx.smoothUpscale && !ctx.error) {
|
|
||||||
finishSmoothUpscale(&ctx);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (rc != 1 || ctx.error) {
|
if (rc != 1 || ctx.error) {
|
||||||
LOG_ERR("JPG", "JPEG decode failed (rc=%d, err=%d)", rc, jpeg->getLastError());
|
LOG_ERR("JPG", "JPEG decode failed (rc=%d, err=%d)", rc, jpeg->getLastError());
|
||||||
return false;
|
return false;
|
||||||
|
|||||||
@@ -1,5 +1,8 @@
|
|||||||
#include "Logging.h"
|
#include "Logging.h"
|
||||||
|
|
||||||
|
#include <BoardConfig.h>
|
||||||
|
#include <esp_rom_sys.h>
|
||||||
|
|
||||||
#include <string>
|
#include <string>
|
||||||
|
|
||||||
#define MAX_ENTRY_LEN 256
|
#define MAX_ENTRY_LEN 256
|
||||||
@@ -59,9 +62,19 @@ void logPrintf(const char* level, const char* origin, const char* format, ...) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
va_end(args);
|
va_end(args);
|
||||||
|
#if FREEINK_LOG_TRANSPORT == FREEINK_LOG_TRANSPORT_USB_CDC_WRITE
|
||||||
|
// Native USB CDC can report false while PlatformIO monitor is attached on
|
||||||
|
// boards like LilyGo T5 S3, so write directly to the CDC object.
|
||||||
|
logSerial.write(reinterpret_cast<const uint8_t*>(buf), strnlen(buf, sizeof(buf)));
|
||||||
|
#elif FREEINK_LOG_TRANSPORT == FREEINK_LOG_TRANSPORT_ROM_PRINTF
|
||||||
|
// IDF/ROM console path for boards whose monitor is attached there during
|
||||||
|
// bring-up, e.g. Sticky.
|
||||||
|
esp_rom_printf("%s", buf);
|
||||||
|
#else
|
||||||
if (logSerial) {
|
if (logSerial) {
|
||||||
logSerial.print(buf);
|
logSerial.print(buf);
|
||||||
}
|
}
|
||||||
|
#endif
|
||||||
addToLogRingBuffer(buf);
|
addToLogRingBuffer(buf);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -27,7 +27,10 @@ won't trigger deprecation warnings.
|
|||||||
#define LOG_LEVEL 0
|
#define LOG_LEVEL 0
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
static HWCDC& logSerial = Serial;
|
// The concrete Serial type differs by MCU: HWCDC (native USB CDC on C3/S3) vs
|
||||||
|
// HardwareSerial (UART0 on the classic ESP32 / M5Paper). Bind to whatever the
|
||||||
|
// real Serial is here — this is before the `#define Serial` shim below.
|
||||||
|
static decltype(Serial)& logSerial = Serial;
|
||||||
|
|
||||||
void logPrintf(const char* level, const char* origin, const char* format, ...);
|
void logPrintf(const char* level, const char* origin, const char* format, ...);
|
||||||
|
|
||||||
|
|||||||
+62
-1
@@ -18,8 +18,11 @@ static uint8_t bcdToDec(uint8_t bcd) { return ((bcd >> 4) * 10) + (bcd & 0x0F);
|
|||||||
static uint8_t decToBcd(uint8_t dec) { return ((dec / 10) << 4) | (dec % 10); }
|
static uint8_t decToBcd(uint8_t dec) { return ((dec / 10) << 4) | (dec % 10); }
|
||||||
|
|
||||||
void HalClock::begin() {
|
void HalClock::begin() {
|
||||||
|
_usesSdkRtc = false;
|
||||||
if (!gpio.deviceIsX3()) {
|
if (!gpio.deviceIsX3()) {
|
||||||
_available = false;
|
_available = _sdkRtc.begin();
|
||||||
|
_usesSdkRtc = _available;
|
||||||
|
LOG_INF("CLK", _available ? "SDK RTC found" : "RTC not found");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -57,6 +60,24 @@ bool HalClock::getTime(uint8_t& hour, uint8_t& minute) const {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_usesSdkRtc) {
|
||||||
|
Rtc::DateTime dt;
|
||||||
|
if (!_sdkRtc.now(dt)) {
|
||||||
|
if (!_hasCachedTime) return false;
|
||||||
|
_lastPollMs = now;
|
||||||
|
hour = _cachedHour;
|
||||||
|
minute = _cachedMinute;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
_cachedHour = dt.hour;
|
||||||
|
_cachedMinute = dt.minute;
|
||||||
|
_lastPollMs = now;
|
||||||
|
_hasCachedTime = true;
|
||||||
|
hour = _cachedHour;
|
||||||
|
minute = _cachedMinute;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// Read 3 bytes starting at register 0x00: seconds, minutes, hours
|
// Read 3 bytes starting at register 0x00: seconds, minutes, hours
|
||||||
Wire.beginTransmission(I2C_ADDR_DS3231);
|
Wire.beginTransmission(I2C_ADDR_DS3231);
|
||||||
Wire.write(DS3231_SEC_REG);
|
Wire.write(DS3231_SEC_REG);
|
||||||
@@ -131,6 +152,25 @@ bool HalClock::writeTimeToRTC(uint8_t hour, uint8_t minute, uint8_t second) {
|
|||||||
assert(hour < 24);
|
assert(hour < 24);
|
||||||
assert(minute < 60);
|
assert(minute < 60);
|
||||||
assert(second < 60);
|
assert(second < 60);
|
||||||
|
if (_usesSdkRtc) {
|
||||||
|
Rtc::DateTime dt;
|
||||||
|
dt.hour = hour;
|
||||||
|
dt.minute = minute;
|
||||||
|
dt.second = second;
|
||||||
|
dt.year = 2000;
|
||||||
|
dt.month = 1;
|
||||||
|
dt.day = 1;
|
||||||
|
if (!_sdkRtc.set(dt)) {
|
||||||
|
LOG_ERR("CLK", "Failed to write time to SDK RTC");
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
_lastPollMs = 0;
|
||||||
|
_cachedHour = hour;
|
||||||
|
_cachedMinute = minute;
|
||||||
|
_hasCachedTime = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
Wire.beginTransmission(I2C_ADDR_DS3231);
|
Wire.beginTransmission(I2C_ADDR_DS3231);
|
||||||
Wire.write(DS3231_SEC_REG); // Start at register 0x00
|
Wire.write(DS3231_SEC_REG); // Start at register 0x00
|
||||||
Wire.write(decToBcd(second)); // 0x00: Seconds
|
Wire.write(decToBcd(second)); // 0x00: Seconds
|
||||||
@@ -168,6 +208,27 @@ bool HalClock::syncFromNTP() {
|
|||||||
struct tm timeinfo;
|
struct tm timeinfo;
|
||||||
gmtime_r(&now, &timeinfo);
|
gmtime_r(&now, &timeinfo);
|
||||||
|
|
||||||
|
if (_usesSdkRtc) {
|
||||||
|
Rtc::DateTime dt;
|
||||||
|
dt.year = static_cast<uint16_t>(timeinfo.tm_year + 1900);
|
||||||
|
dt.month = static_cast<uint8_t>(timeinfo.tm_mon + 1);
|
||||||
|
dt.day = static_cast<uint8_t>(timeinfo.tm_mday);
|
||||||
|
dt.hour = static_cast<uint8_t>(timeinfo.tm_hour);
|
||||||
|
dt.minute = static_cast<uint8_t>(timeinfo.tm_min);
|
||||||
|
dt.second = static_cast<uint8_t>(timeinfo.tm_sec);
|
||||||
|
dt.weekday = static_cast<uint8_t>(timeinfo.tm_wday);
|
||||||
|
if (_sdkRtc.set(dt)) {
|
||||||
|
_lastPollMs = 0;
|
||||||
|
_cachedHour = dt.hour;
|
||||||
|
_cachedMinute = dt.minute;
|
||||||
|
_hasCachedTime = true;
|
||||||
|
LOG_INF("CLK", "RTC set to %04u-%02u-%02u %02u:%02u:%02u UTC", dt.year, dt.month, dt.day, dt.hour, dt.minute,
|
||||||
|
dt.second);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
if (writeTimeToRTC(timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec)) {
|
if (writeTimeToRTC(timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec)) {
|
||||||
LOG_INF("CLK", "RTC set to %02d:%02d:%02d UTC", timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
|
LOG_INF("CLK", "RTC set to %02d:%02d:%02d UTC", timeinfo.tm_hour, timeinfo.tm_min, timeinfo.tm_sec);
|
||||||
return true;
|
return true;
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
#include <Rtc.h>
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
|
|
||||||
#include "HalGPIO.h"
|
#include "HalGPIO.h"
|
||||||
@@ -10,6 +11,8 @@ extern HalClock halClock; // Singleton
|
|||||||
|
|
||||||
class HalClock {
|
class HalClock {
|
||||||
bool _available = false;
|
bool _available = false;
|
||||||
|
bool _usesSdkRtc = false;
|
||||||
|
mutable Rtc _sdkRtc;
|
||||||
mutable uint8_t _cachedHour = 0;
|
mutable uint8_t _cachedHour = 0;
|
||||||
mutable uint8_t _cachedMinute = 0;
|
mutable uint8_t _cachedMinute = 0;
|
||||||
mutable bool _hasCachedTime = false;
|
mutable bool _hasCachedTime = false;
|
||||||
|
|||||||
@@ -81,27 +81,6 @@ void HalDisplay::copyGrayscaleBuffers(const uint8_t* lsbBuffer, const uint8_t* m
|
|||||||
einkDisplay.copyGrayscaleBuffers(lsbBuffer, msbBuffer);
|
einkDisplay.copyGrayscaleBuffers(lsbBuffer, msbBuffer);
|
||||||
}
|
}
|
||||||
|
|
||||||
void HalDisplay::displayGrayscaleBase(RefreshMode fallback, bool turnOffScreen) {
|
|
||||||
// X3: a HALF fallback means the caller wants a clean base (e.g. the sleep
|
|
||||||
// cover, a full-screen swap from arbitrary prior content). Without this, the
|
|
||||||
// X3 grayscale base takes its gentle differential happy path and the prior
|
|
||||||
// home/reader frame ghosts through the soft aa_pre_bw_mid waveform. Forcing a
|
|
||||||
// resync makes displayGrayscaleBase clear first, matching displayBuffer(HALF).
|
|
||||||
// The reader's FAST path is deliberately left on the differential path so
|
|
||||||
// per-page grayscale stays cheap.
|
|
||||||
if (gpio.deviceIsX3() && fallback == RefreshMode::HALF_REFRESH) {
|
|
||||||
einkDisplay.requestResync(1);
|
|
||||||
}
|
|
||||||
|
|
||||||
einkDisplay.displayGrayscaleBase(convertRefreshMode(fallback), turnOffScreen);
|
|
||||||
}
|
|
||||||
|
|
||||||
void HalDisplay::preconditionGrayscale() { einkDisplay.preconditionGrayscale(); }
|
|
||||||
|
|
||||||
void HalDisplay::preconditionGrayscale(uint16_t x, uint16_t y, uint16_t w, uint16_t h) {
|
|
||||||
einkDisplay.preconditionGrayscale(x, y, w, h);
|
|
||||||
}
|
|
||||||
|
|
||||||
void HalDisplay::copyGrayscaleLsbBuffers(const uint8_t* lsbBuffer) { einkDisplay.copyGrayscaleLsbBuffers(lsbBuffer); }
|
void HalDisplay::copyGrayscaleLsbBuffers(const uint8_t* lsbBuffer) { einkDisplay.copyGrayscaleLsbBuffers(lsbBuffer); }
|
||||||
|
|
||||||
void HalDisplay::copyGrayscaleMsbBuffers(const uint8_t* msbBuffer) { einkDisplay.copyGrayscaleMsbBuffers(msbBuffer); }
|
void HalDisplay::copyGrayscaleMsbBuffers(const uint8_t* msbBuffer) { einkDisplay.copyGrayscaleMsbBuffers(msbBuffer); }
|
||||||
|
|||||||
@@ -47,19 +47,6 @@ class HalDisplay {
|
|||||||
// Access to frame buffer
|
// Access to frame buffer
|
||||||
uint8_t* getFrameBuffer() const;
|
uint8_t* getFrameBuffer() const;
|
||||||
|
|
||||||
// X3 grayscale preconditioning (OEM "AA-pre-BW(mid)" settle pass), windowed
|
|
||||||
// to the gray region in physical panel coordinates (no-arg = full frame).
|
|
||||||
// Call after the BW base frame is displayed and before the grayscale planes
|
|
||||||
// are written; no-op on X4. See EInkDisplay::preconditionGrayscale.
|
|
||||||
void preconditionGrayscale();
|
|
||||||
void preconditionGrayscale(uint16_t x, uint16_t y, uint16_t w, uint16_t h);
|
|
||||||
|
|
||||||
// Display the framebuffer as the base frame for a grayscale overlay that
|
|
||||||
// follows. On X3, HALF fallback first requests a resync to match
|
|
||||||
// displayBuffer(HALF); FAST fallback keeps the OEM differential base waveform
|
|
||||||
// ("AA-pre-BW(mid)"). Other panels display normally with `fallback` mode.
|
|
||||||
void displayGrayscaleBase(RefreshMode fallback = HALF_REFRESH, bool turnOffScreen = false);
|
|
||||||
|
|
||||||
void copyGrayscaleBuffers(const uint8_t* lsbBuffer, const uint8_t* msbBuffer);
|
void copyGrayscaleBuffers(const uint8_t* lsbBuffer, const uint8_t* msbBuffer);
|
||||||
void copyGrayscaleLsbBuffers(const uint8_t* lsbBuffer);
|
void copyGrayscaleLsbBuffers(const uint8_t* lsbBuffer);
|
||||||
void copyGrayscaleMsbBuffers(const uint8_t* msbBuffer);
|
void copyGrayscaleMsbBuffers(const uint8_t* msbBuffer);
|
||||||
|
|||||||
+79
-17
@@ -1,5 +1,6 @@
|
|||||||
#include <HalGPIO.h>
|
#include <HalGPIO.h>
|
||||||
#include <Logging.h>
|
#include <Logging.h>
|
||||||
|
#include <PowerManager.h>
|
||||||
#include <Preferences.h>
|
#include <Preferences.h>
|
||||||
#include <SPI.h>
|
#include <SPI.h>
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
@@ -192,14 +193,44 @@ HalGPIO::DeviceType detectDeviceTypeWithFingerprint() {
|
|||||||
|
|
||||||
void HalGPIO::begin() {
|
void HalGPIO::begin() {
|
||||||
inputMgr.begin();
|
inputMgr.begin();
|
||||||
|
#if FREEINK_MCU_C3
|
||||||
|
// Claim the shared SPI bus with the X4/X3 display+SD pins. These EPD_* pin
|
||||||
|
// macros are hardcoded C3/Xteink values, so this pre-claim is only valid on the
|
||||||
|
// C3 family. On other boards (M5Paper's IT8951, Sticky's SSD1677, ...) the SDK
|
||||||
|
// driver and SDCardManager bring up SPI from BoardConfig::ACTIVE pins; pre-
|
||||||
|
// claiming here would stick (SPIClass::begin early-returns once the bus is
|
||||||
|
// started) and leave the display/SD on the wrong pins.
|
||||||
SPI.begin(EPD_SCLK, SPI_MISO, EPD_MOSI, EPD_CS);
|
SPI.begin(EPD_SCLK, SPI_MISO, EPD_MOSI, EPD_CS);
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#if FREEINK_MCU_C3
|
||||||
_deviceType = detectDeviceTypeWithFingerprint();
|
_deviceType = detectDeviceTypeWithFingerprint();
|
||||||
|
|
||||||
|
// Sync the runtime board profile to the detected device NOW, before any I2C
|
||||||
|
// consumer begins. powerManager/clock/tilt begin() run immediately after this
|
||||||
|
// in setup() and rely on BoardConfig::ACTIVE: HalPowerManager only calls
|
||||||
|
// Wire.begin() when the active profile has an I2C gauge (gaugeAddr != 0), and
|
||||||
|
// the X3 clock/tilt raw-Wire paths assume that begin happened. The dual X3+X4
|
||||||
|
// binary boots as X4 (gaugeAddr 0), so without this the X4 profile stays active
|
||||||
|
// through those begins, Wire is never (re)initialised after the detection probe
|
||||||
|
// end()s it, and every X3 read fails with lock==NULL ("could not acquire lock"
|
||||||
|
// / "NULL TX buffer pointer"). FreeInkDisplay also calls selectDevice() later,
|
||||||
|
// but that is after the I2C consumers — too late. selectDevice() is idempotent.
|
||||||
|
BoardConfig::selectDevice(deviceIsX3() ? BoardConfig::Board::XteinkX3 : BoardConfig::Board::XteinkX4);
|
||||||
|
|
||||||
if (deviceIsX4()) {
|
if (deviceIsX4()) {
|
||||||
pinMode(BAT_GPIO0, INPUT);
|
pinMode(BAT_GPIO0, INPUT);
|
||||||
pinMode(UART0_RXD, INPUT);
|
pinMode(UART0_RXD, INPUT);
|
||||||
}
|
}
|
||||||
|
#else
|
||||||
|
// Non-C3 boards (S3/ESP32) are single-device builds; their pins, panel, and
|
||||||
|
// battery backend all come from BoardConfig::ACTIVE. The X3/X4 fingerprint probe
|
||||||
|
// targets Xteink C3 hardware and drives Wire on X3_I2C_SDA/SCL (GPIO20/0) — which
|
||||||
|
// collides with this board's own I2C (e.g. Sticky's BQ27220 gauge shares GPIO0)
|
||||||
|
// and reconfigures strapping pins. Skip it; _deviceType stays X4 ("not X3"),
|
||||||
|
// the correct non-X3 branch for every deviceIsX3() consumer.
|
||||||
|
_deviceType = DeviceType::X4;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
void HalGPIO::update() {
|
void HalGPIO::update() {
|
||||||
@@ -225,30 +256,55 @@ unsigned long HalGPIO::getHeldTime() const { return inputMgr.getHeldTime(); }
|
|||||||
|
|
||||||
unsigned long HalGPIO::getPowerButtonHeldTime() const { return inputMgr.getPowerButtonHeldTime(); }
|
unsigned long HalGPIO::getPowerButtonHeldTime() const { return inputMgr.getPowerButtonHeldTime(); }
|
||||||
|
|
||||||
|
bool HalGPIO::wasTouchTap(float& nx, float& ny) const { return inputMgr.wasTouchTap(nx, ny); }
|
||||||
|
|
||||||
|
bool HalGPIO::wasTouchDown(float& nx, float& ny) const { return inputMgr.wasTouchPressedAt(nx, ny); }
|
||||||
|
|
||||||
|
bool HalGPIO::isTouchTapCandidate(float& nx, float& ny, unsigned long& heldMs) const {
|
||||||
|
return inputMgr.isTouchTapCandidate(nx, ny, heldMs);
|
||||||
|
}
|
||||||
|
|
||||||
|
unsigned long HalGPIO::lastTouchHeldMs() const { return inputMgr.lastTouchHeldMs(); }
|
||||||
|
|
||||||
|
bool HalGPIO::wasSwipe(float& nxStart, float& nyStart, float& nxEnd, float& nyEnd) const {
|
||||||
|
return inputMgr.wasSwipe(nxStart, nyStart, nxEnd, nyEnd);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool HalGPIO::hasTouch() const { return inputMgr.hasTouch(); }
|
||||||
|
|
||||||
|
bool HalGPIO::wasTouchActivity() const { return inputMgr.wasTouchActivity(); }
|
||||||
|
|
||||||
|
bool HalGPIO::isXteinkDevice() const {
|
||||||
|
const auto board = BoardConfig::ACTIVE.board;
|
||||||
|
return board == BoardConfig::Board::XteinkX3 || board == BoardConfig::Board::XteinkX4;
|
||||||
|
}
|
||||||
|
|
||||||
void HalGPIO::startDeepSleep() {
|
void HalGPIO::startDeepSleep() {
|
||||||
// Ensure that the power button has been released to avoid immediately turning back on if you're holding it
|
// Ensure that the power button has been released to avoid immediately turning back on if you're holding it
|
||||||
while (inputMgr.isPressed(BTN_POWER)) {
|
while (inputMgr.isPressed(BTN_POWER)) {
|
||||||
delay(50);
|
delay(50);
|
||||||
inputMgr.update();
|
inputMgr.update();
|
||||||
}
|
}
|
||||||
// Arm the wakeup trigger *after* the button is released
|
freeink::PowerManager::armPowerButtonWakeup();
|
||||||
esp_deep_sleep_enable_gpio_wakeup(1ULL << InputManager::POWER_BUTTON_PIN, ESP_GPIO_WAKEUP_GPIO_LOW);
|
freeink::PowerManager::deepSleep();
|
||||||
// Enter Deep Sleep
|
|
||||||
esp_deep_sleep_start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed) {
|
void HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPressAllowed) {
|
||||||
|
if (BoardConfig::ACTIVE.input.power < 0) {
|
||||||
|
// No readable power-button input pin: can't verify a hold, so don't sleep.
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
#if defined(FREEINK_DEVICE_M5PAPER) && FREEINK_DEVICE_M5PAPER
|
||||||
|
// M5Paper: power-on is a hardware latch and the "power button" is the rotary
|
||||||
|
// push (G38), shared with Confirm. A USB/flash cold boot is indistinguishable
|
||||||
|
// from an intentional power-on hold here, so skip the X4-style anti-accidental-
|
||||||
|
// wake check and always boot. G38 still serves as the deep-sleep wake source.
|
||||||
|
return;
|
||||||
|
#endif
|
||||||
if (shortPressAllowed) {
|
if (shortPressAllowed) {
|
||||||
// Fast path - no duration check needed
|
// Fast path - no duration check needed
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
// TODO: Intermittent edge case remains: a single tap followed by another single tap
|
|
||||||
// can still power on the device. Tighten wake debounce/state handling here.
|
|
||||||
|
|
||||||
// Calibrate: subtract boot time already elapsed, assuming button held since boot
|
|
||||||
const uint16_t calibration = millis();
|
|
||||||
const uint16_t calibratedDuration = (calibration < requiredDurationMs) ? (requiredDurationMs - calibration) : 1;
|
|
||||||
|
|
||||||
const auto start = millis();
|
const auto start = millis();
|
||||||
inputMgr.update();
|
inputMgr.update();
|
||||||
// inputMgr.isPressed() may take up to ~500ms to return correct state
|
// inputMgr.isPressed() may take up to ~500ms to return correct state
|
||||||
@@ -257,11 +313,12 @@ void HalGPIO::verifyPowerButtonWakeup(uint16_t requiredDurationMs, bool shortPre
|
|||||||
inputMgr.update();
|
inputMgr.update();
|
||||||
}
|
}
|
||||||
if (inputMgr.isPressed(BTN_POWER)) {
|
if (inputMgr.isPressed(BTN_POWER)) {
|
||||||
|
const auto holdStart = millis();
|
||||||
do {
|
do {
|
||||||
delay(10);
|
delay(10);
|
||||||
inputMgr.update();
|
inputMgr.update();
|
||||||
} while (inputMgr.isPressed(BTN_POWER) && inputMgr.getPowerButtonHeldTime() < calibratedDuration);
|
} while (inputMgr.isPressed(BTN_POWER) && millis() - holdStart < requiredDurationMs);
|
||||||
if (inputMgr.getPowerButtonHeldTime() < calibratedDuration) {
|
if (millis() - holdStart < requiredDurationMs) {
|
||||||
startDeepSleep();
|
startDeepSleep();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -282,8 +339,10 @@ bool HalGPIO::isUsbConnected() const {
|
|||||||
}
|
}
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
// U0RXD/GPIO20 reads HIGH when USB is connected
|
if (BoardConfig::ACTIVE.usbDetect < 0) {
|
||||||
return digitalRead(UART0_RXD) == HIGH;
|
return false;
|
||||||
|
}
|
||||||
|
return digitalRead(BoardConfig::ACTIVE.usbDetect) == HIGH;
|
||||||
}
|
}
|
||||||
|
|
||||||
HalGPIO::WakeupReason HalGPIO::getWakeupReason() const {
|
HalGPIO::WakeupReason HalGPIO::getWakeupReason() const {
|
||||||
@@ -292,8 +351,11 @@ HalGPIO::WakeupReason HalGPIO::getWakeupReason() const {
|
|||||||
|
|
||||||
const bool usbConnected = isUsbConnected();
|
const bool usbConnected = isUsbConnected();
|
||||||
|
|
||||||
if ((wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) ||
|
if (resetReason == ESP_RST_DEEPSLEEP &&
|
||||||
(wakeupCause == ESP_SLEEP_WAKEUP_GPIO && resetReason == ESP_RST_DEEPSLEEP && usbConnected)) {
|
(wakeupCause == ESP_SLEEP_WAKEUP_GPIO || wakeupCause == ESP_SLEEP_WAKEUP_EXT1)) {
|
||||||
|
return WakeupReason::PowerButton;
|
||||||
|
}
|
||||||
|
if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_POWERON && !usbConnected) {
|
||||||
return WakeupReason::PowerButton;
|
return WakeupReason::PowerButton;
|
||||||
}
|
}
|
||||||
if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_UNKNOWN && usbConnected) {
|
if (wakeupCause == ESP_SLEEP_WAKEUP_UNDEFINED && resetReason == ESP_RST_UNKNOWN && usbConnected) {
|
||||||
|
|||||||
@@ -59,6 +59,11 @@ class HalGPIO {
|
|||||||
inline bool deviceIsX3() const { return _deviceType == DeviceType::X3; }
|
inline bool deviceIsX3() const { return _deviceType == DeviceType::X3; }
|
||||||
inline bool deviceIsX4() const { return _deviceType == DeviceType::X4; }
|
inline bool deviceIsX4() const { return _deviceType == DeviceType::X4; }
|
||||||
|
|
||||||
|
// True on the Xteink X3/X4 boards. Unlike deviceIsX3/X4 (which both stay "X4"
|
||||||
|
// on non-C3 boards), this keys off BoardConfig::ACTIVE.board, so it reliably
|
||||||
|
// gates Xteink-only features (sunlight fix) and non-Xteink-only ones (touch).
|
||||||
|
bool isXteinkDevice() const;
|
||||||
|
|
||||||
// Start button GPIO and setup SPI for screen and SD card
|
// Start button GPIO and setup SPI for screen and SD card
|
||||||
void begin();
|
void begin();
|
||||||
|
|
||||||
@@ -72,6 +77,34 @@ class HalGPIO {
|
|||||||
unsigned long getHeldTime() const;
|
unsigned long getHeldTime() const;
|
||||||
unsigned long getPowerButtonHeldTime() const;
|
unsigned long getPowerButtonHeldTime() const;
|
||||||
|
|
||||||
|
// Touch: one-shot tap with the release position normalized 0..1 in the panel's
|
||||||
|
// native orientation. Returns false on non-touch devices. (Reusable gesture
|
||||||
|
// primitive; see MappedInputManager for the top-left = Back mapping.)
|
||||||
|
bool wasTouchTap(float& nx, float& ny) const;
|
||||||
|
|
||||||
|
// Press-edge of a touch: true on touch-down with the down position normalized
|
||||||
|
// 0..1 (panel native). For showing the pressed/selected element before release.
|
||||||
|
bool wasTouchDown(float& nx, float& ny) const;
|
||||||
|
|
||||||
|
// True while a touch remains within tap slop; writes touch-down position and held time.
|
||||||
|
bool isTouchTapCandidate(float& nx, float& ny, unsigned long& heldMs) const;
|
||||||
|
|
||||||
|
// Duration (ms) of the last touch contact, latched on release. Valid on the
|
||||||
|
// release frame (alongside wasTouchTap). For tap-vs-long-press decisions.
|
||||||
|
unsigned long lastTouchHeldMs() const;
|
||||||
|
|
||||||
|
// Swipe (flick) gesture on the release frame: writes the start/end positions
|
||||||
|
// normalized 0..1 in the panel's native frame (map via GfxRenderer::tapToLogical).
|
||||||
|
// A swipe also raises wasTouchTap(), so check this first. False on non-touch.
|
||||||
|
bool wasSwipe(float& nxStart, float& nyStart, float& nxEnd, float& nyEnd) const;
|
||||||
|
|
||||||
|
// True if a touch controller is present/active (runtime gate; false on the C3).
|
||||||
|
bool hasTouch() const;
|
||||||
|
|
||||||
|
// True if a touch press or release happened this frame (the touch analogue of
|
||||||
|
// wasAnyPressed/Released), for resetting idle/sleep timers and CPU frequency.
|
||||||
|
bool wasTouchActivity() const;
|
||||||
|
|
||||||
// Setup wake up GPIO and enter deep sleep
|
// Setup wake up GPIO and enter deep sleep
|
||||||
void startDeepSleep();
|
void startDeepSleep();
|
||||||
|
|
||||||
|
|||||||
+45
-25
@@ -1,6 +1,7 @@
|
|||||||
#include "HalPowerManager.h"
|
#include "HalPowerManager.h"
|
||||||
|
|
||||||
#include <Logging.h>
|
#include <Logging.h>
|
||||||
|
#include <PowerManager.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <esp_sleep.h>
|
#include <esp_sleep.h>
|
||||||
|
|
||||||
@@ -10,15 +11,32 @@
|
|||||||
|
|
||||||
HalPowerManager powerManager; // Singleton instance
|
HalPowerManager powerManager; // Singleton instance
|
||||||
|
|
||||||
|
namespace {
|
||||||
|
// The fuel gauge's I2C controller (Wire or Wire1) per the active board profile.
|
||||||
|
// On single-bus SoCs (ESP32-C3, SOC_I2C_NUM == 1) Wire1 doesn't exist, so always
|
||||||
|
// use Wire. On Sticky the gauge is on Wire1 so it doesn't fight the GT911 touch,
|
||||||
|
// which owns Wire.
|
||||||
|
TwoWire& gaugeWire() {
|
||||||
|
#if SOC_I2C_NUM > 1
|
||||||
|
if (BoardConfig::ACTIVE.batteryGauge.i2cBus == 1) return Wire1;
|
||||||
|
#endif
|
||||||
|
return Wire;
|
||||||
|
}
|
||||||
|
} // namespace
|
||||||
|
|
||||||
void HalPowerManager::begin() {
|
void HalPowerManager::begin() {
|
||||||
if (gpio.deviceIsX3()) {
|
const auto& gauge = BoardConfig::ACTIVE.batteryGauge;
|
||||||
// X3 uses an I2C fuel gauge for battery monitoring.
|
if (gauge.gaugeAddr != 0) {
|
||||||
// I2C init must come AFTER gpio.begin() so early hardware detection/probes are finished.
|
// Board has an I2C fuel gauge (X3, LilyGo, Sticky, ...). Pins/freq come from
|
||||||
Wire.begin(X3_I2C_SDA, X3_I2C_SCL, X3_I2C_FREQ);
|
// the active board profile, not hardcoded X3 values. I2C init must come AFTER
|
||||||
Wire.setTimeOut(4);
|
// gpio.begin() so early hardware detection/probes are finished.
|
||||||
|
gaugeWire().begin(gauge.i2cSda, gauge.i2cScl, gauge.i2cHz);
|
||||||
|
gaugeWire().setTimeOut(4);
|
||||||
_batteryUseI2C = true;
|
_batteryUseI2C = true;
|
||||||
} else {
|
} else if (BoardConfig::ACTIVE.batteryAdc >= 0) {
|
||||||
pinMode(BAT_GPIO0, INPUT);
|
// ADC-sensed board (X4: GPIO0, M5Paper: GPIO35). Skip when the profile leaves
|
||||||
|
// batteryAdc unassigned (PIN_UNASSIGNED) — pinMode(255) faults the GPIO mux.
|
||||||
|
pinMode(BoardConfig::ACTIVE.batteryAdc, INPUT);
|
||||||
}
|
}
|
||||||
normalFreq = getCpuFrequencyMhz();
|
normalFreq = getCpuFrequencyMhz();
|
||||||
modeMutex = xSemaphoreCreateMutex();
|
modeMutex = xSemaphoreCreateMutex();
|
||||||
@@ -76,22 +94,19 @@ void HalPowerManager::startDeepSleep(HalGPIO& gpio) const {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Pre-sleep routines from the original firmware
|
// Pre-sleep routines from the original firmware
|
||||||
|
#if !SOC_PM_SUPPORT_EXT1_WAKEUP // RISC-V (C3 / X4)
|
||||||
// GPIO13 is connected to battery latch MOSFET, we need to make sure it's low during sleep
|
// GPIO13 is connected to battery latch MOSFET, we need to make sure it's low during sleep
|
||||||
// Note that this means the MCU will be completely powered off during sleep, including RTC
|
// Note that this means the MCU will be completely powered off during sleep, including RTC
|
||||||
|
// (X4-specific: on classic ESP32/M5Paper GPIO13 is SD MISO, so this is skipped.)
|
||||||
constexpr gpio_num_t GPIO_SPIWP = GPIO_NUM_13;
|
constexpr gpio_num_t GPIO_SPIWP = GPIO_NUM_13;
|
||||||
gpio_set_direction(GPIO_SPIWP, GPIO_MODE_OUTPUT);
|
gpio_set_direction(GPIO_SPIWP, GPIO_MODE_OUTPUT);
|
||||||
gpio_set_level(GPIO_SPIWP, 0);
|
gpio_set_level(GPIO_SPIWP, 0);
|
||||||
esp_sleep_config_gpio_isolate();
|
esp_sleep_config_gpio_isolate();
|
||||||
gpio_deep_sleep_hold_en();
|
gpio_deep_sleep_hold_en();
|
||||||
gpio_hold_en(GPIO_SPIWP);
|
gpio_hold_en(GPIO_SPIWP);
|
||||||
pinMode(InputManager::POWER_BUTTON_PIN, INPUT_PULLUP);
|
#endif
|
||||||
// Arm the wakeup trigger *after* the button is released
|
freeink::PowerManager::armPowerButtonWakeup();
|
||||||
// Note: this is only useful for waking up on USB power. On battery, the MCU will be completely powered off, so the
|
freeink::PowerManager::deepSleep();
|
||||||
// power button is hard-wired to briefly provide power to the MCU, waking it up regardless of the wakeup source
|
|
||||||
// configuration
|
|
||||||
esp_deep_sleep_enable_gpio_wakeup(1ULL << InputManager::POWER_BUTTON_PIN, ESP_GPIO_WAKEUP_GPIO_LOW);
|
|
||||||
// Enter Deep Sleep
|
|
||||||
esp_deep_sleep_start();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
uint16_t HalPowerManager::getBatteryPercentage() const {
|
uint16_t HalPowerManager::getBatteryPercentage() const {
|
||||||
@@ -101,27 +116,32 @@ uint16_t HalPowerManager::getBatteryPercentage() const {
|
|||||||
return _batteryCachedPercent;
|
return _batteryCachedPercent;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read SOC directly from I2C fuel gauge (16-bit LE register).
|
// Read SOC directly from the I2C fuel gauge (16-bit LE register). Gauge
|
||||||
// On I2C error, keep last known value to avoid UI jitter/slowdowns.
|
// address comes from the active board profile (all current gauges are
|
||||||
Wire.beginTransmission(I2C_ADDR_BQ27220);
|
// BQ27220-class, SOC at 0x2C). On I2C error, keep last known value to avoid
|
||||||
Wire.write(BQ27220_SOC_REG);
|
// UI jitter/slowdowns.
|
||||||
if (Wire.endTransmission(false) != 0) {
|
const uint8_t gaugeAddr = BoardConfig::ACTIVE.batteryGauge.gaugeAddr;
|
||||||
|
TwoWire& w = gaugeWire();
|
||||||
|
w.beginTransmission(gaugeAddr);
|
||||||
|
w.write(BQ27220_SOC_REG);
|
||||||
|
if (w.endTransmission(false) != 0) {
|
||||||
_batteryLastPollMs = now;
|
_batteryLastPollMs = now;
|
||||||
return _batteryCachedPercent;
|
return _batteryCachedPercent;
|
||||||
}
|
}
|
||||||
Wire.requestFrom(I2C_ADDR_BQ27220, (uint8_t)2);
|
w.requestFrom(gaugeAddr, (uint8_t)2);
|
||||||
if (Wire.available() < 2) {
|
if (w.available() < 2) {
|
||||||
_batteryLastPollMs = now;
|
_batteryLastPollMs = now;
|
||||||
return _batteryCachedPercent;
|
return _batteryCachedPercent;
|
||||||
}
|
}
|
||||||
const uint8_t lo = Wire.read();
|
const uint8_t lo = w.read();
|
||||||
const uint8_t hi = Wire.read();
|
const uint8_t hi = w.read();
|
||||||
const uint16_t soc = (hi << 8) | lo;
|
const uint16_t soc = (hi << 8) | lo;
|
||||||
_batteryCachedPercent = soc > 100 ? 100 : soc;
|
_batteryCachedPercent = soc > 100 ? 100 : soc;
|
||||||
_batteryLastPollMs = now;
|
_batteryLastPollMs = now;
|
||||||
return _batteryCachedPercent;
|
return _batteryCachedPercent;
|
||||||
}
|
}
|
||||||
static const BatteryMonitor battery = BatteryMonitor(BAT_GPIO0);
|
// ADC pin from the active profile (X4 GPIO0 / M5Paper GPIO35); default 2:1 divider.
|
||||||
|
static const BatteryMonitor battery = BatteryMonitor(BoardConfig::ACTIVE.batteryAdc);
|
||||||
|
|
||||||
// smooth the battery %.
|
// smooth the battery %.
|
||||||
if (_batteryCachedPercent == 0) {
|
if (_batteryCachedPercent == 0) {
|
||||||
|
|||||||
@@ -28,7 +28,16 @@ class HalPowerManager {
|
|||||||
SemaphoreHandle_t modeMutex = nullptr; // Protect access to currentLockMode
|
SemaphoreHandle_t modeMutex = nullptr; // Protect access to currentLockMode
|
||||||
|
|
||||||
public:
|
public:
|
||||||
static constexpr int LOW_POWER_FREQ = 10; // MHz
|
// On PSRAM boards (classic ESP32 / M5Paper) the APB clock follows the CPU below
|
||||||
|
// 80 MHz, and APB clocks both the SD SPI bus and the 80 MHz PSRAM (which holds
|
||||||
|
// the framebuffer). Dropping to 10 MHz breaks SD writes and PSRAM, so floor the
|
||||||
|
// low-power CPU at 80 MHz (APB stays pinned at 80 for CPU 80/160/240, so power
|
||||||
|
// still drops from the 240 MHz default while SD/PSRAM stay stable).
|
||||||
|
#if defined(BOARD_HAS_PSRAM)
|
||||||
|
static constexpr int LOW_POWER_FREQ = 80; // MHz (APB-safe floor for PSRAM/SD)
|
||||||
|
#else
|
||||||
|
static constexpr int LOW_POWER_FREQ = 10; // MHz
|
||||||
|
#endif
|
||||||
static constexpr unsigned long IDLE_POWER_SAVING_MS = 3000; // ms
|
static constexpr unsigned long IDLE_POWER_SAVING_MS = 3000; // ms
|
||||||
static constexpr unsigned long BATTERY_POLL_MS = 1500; // ms
|
static constexpr unsigned long BATTERY_POLL_MS = 1500; // ms
|
||||||
|
|
||||||
|
|||||||
@@ -38,6 +38,13 @@ void IRAM_ATTR __wrap_panic_print_backtrace(const void* frame, int core) {
|
|||||||
__real_panic_print_backtrace(frame, core);
|
__real_panic_print_backtrace(frame, core);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
#if !__riscv
|
||||||
|
// RvExcFrame and the flat SP scan below are RISC-V-only (C3). On Xtensa
|
||||||
|
// (classic ESP32 / S3) the exception frame is XtExcFrame with windowed-register
|
||||||
|
// unwinding, so fall back to the default backtrace.
|
||||||
|
__real_panic_print_backtrace(frame, core);
|
||||||
|
return;
|
||||||
|
#else
|
||||||
for (size_t i = 0; i < MAX_PANIC_STACK_DEPTH; i++) {
|
for (size_t i = 0; i < MAX_PANIC_STACK_DEPTH; i++) {
|
||||||
panicStack[i].sp = 0;
|
panicStack[i].sp = 0;
|
||||||
}
|
}
|
||||||
@@ -65,6 +72,7 @@ void IRAM_ATTR __wrap_panic_print_backtrace(const void* frame, int core) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
__real_panic_print_backtrace(frame, core);
|
__real_panic_print_backtrace(frame, core);
|
||||||
|
#endif // __riscv
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -26,6 +26,15 @@ bool HalTiltSensor::readReg(uint8_t reg, uint8_t* val) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
bool HalTiltSensor::readGyro(float& gx, float& gy, float& gz) const {
|
bool HalTiltSensor::readGyro(float& gx, float& gy, float& gz) const {
|
||||||
|
if (_backend == Backend::SdkImu) {
|
||||||
|
Imu::Sample sample;
|
||||||
|
if (!_sdkImu.read(sample)) return false;
|
||||||
|
gx = sample.gx;
|
||||||
|
gy = sample.gy;
|
||||||
|
gz = sample.gz;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
Wire.beginTransmission(_i2cAddr);
|
Wire.beginTransmission(_i2cAddr);
|
||||||
Wire.write(REG_GX_L); // Start reading at Gyro X Low
|
Wire.write(REG_GX_L); // Start reading at Gyro X Low
|
||||||
if (Wire.endTransmission(false) != 0) {
|
if (Wire.endTransmission(false) != 0) {
|
||||||
@@ -52,11 +61,22 @@ bool HalTiltSensor::readGyro(float& gx, float& gy, float& gz) const {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void HalTiltSensor::begin() {
|
void HalTiltSensor::begin() {
|
||||||
|
_backend = Backend::None;
|
||||||
if (!gpio.deviceIsX3()) {
|
if (!gpio.deviceIsX3()) {
|
||||||
_available = false;
|
_available = _sdkImu.begin();
|
||||||
|
if (!_available) {
|
||||||
|
LOG_ERR("GYR", "SDK IMU not found");
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
_backend = Backend::SdkImu;
|
||||||
|
_initMs = millis();
|
||||||
|
_lastPollMs = millis();
|
||||||
|
LOG_INF("GYR", "SDK IMU initialized");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_backend = Backend::Qmi8658;
|
||||||
|
|
||||||
// Try primary address, then alternate
|
// Try primary address, then alternate
|
||||||
uint8_t whoami = 0;
|
uint8_t whoami = 0;
|
||||||
_i2cAddr = I2C_ADDR_QMI8658;
|
_i2cAddr = I2C_ADDR_QMI8658;
|
||||||
@@ -89,6 +109,14 @@ bool HalTiltSensor::wake() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_backend == Backend::SdkImu) {
|
||||||
|
_lastPollMs = millis();
|
||||||
|
_lastTiltMs = millis();
|
||||||
|
_wakeMs = millis();
|
||||||
|
_isAwake = true;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
// Wait for init to complete before waking
|
// Wait for init to complete before waking
|
||||||
if ((millis() - _initMs) < SLEEP_STABILIZE_MS) {
|
if ((millis() - _initMs) < SLEEP_STABILIZE_MS) {
|
||||||
return false;
|
return false;
|
||||||
@@ -111,6 +139,13 @@ bool HalTiltSensor::deepSleep() {
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (_backend == Backend::SdkImu) {
|
||||||
|
clearPendingEvents();
|
||||||
|
_inTilt = false;
|
||||||
|
_isAwake = false;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
if ((millis() - _wakeMs) < SLEEP_STABILIZE_MS) {
|
if ((millis() - _wakeMs) < SLEEP_STABILIZE_MS) {
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,6 +1,7 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
#include <Arduino.h>
|
#include <Arduino.h>
|
||||||
|
#include <Imu.h>
|
||||||
#include <Wire.h>
|
#include <Wire.h>
|
||||||
|
|
||||||
#include "HalGPIO.h"
|
#include "HalGPIO.h"
|
||||||
@@ -18,8 +19,12 @@ class HalTiltSensor;
|
|||||||
extern HalTiltSensor halTiltSensor; // Singleton
|
extern HalTiltSensor halTiltSensor; // Singleton
|
||||||
|
|
||||||
class HalTiltSensor {
|
class HalTiltSensor {
|
||||||
|
enum class Backend : uint8_t { None, Qmi8658, SdkImu };
|
||||||
|
|
||||||
bool _available = false;
|
bool _available = false;
|
||||||
|
Backend _backend = Backend::None;
|
||||||
uint8_t _i2cAddr = 0;
|
uint8_t _i2cAddr = 0;
|
||||||
|
mutable Imu _sdkImu;
|
||||||
|
|
||||||
// Tilt gesture state machine
|
// Tilt gesture state machine
|
||||||
bool _tiltForwardEvent = false; // Consumed by wasTiltedForward()
|
bool _tiltForwardEvent = false; // Consumed by wasTiltedForward()
|
||||||
|
|||||||
-1
Submodule open-x4-sdk deleted from 198ad26721.
+87
-13
@@ -4,7 +4,7 @@ build_cache_dir = .cache
|
|||||||
extra_configs = platformio.local.ini
|
extra_configs = platformio.local.ini
|
||||||
|
|
||||||
[crosspoint]
|
[crosspoint]
|
||||||
version = 1.4.1
|
version = 1.3.0
|
||||||
|
|
||||||
[base]
|
[base]
|
||||||
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
|
platform = https://github.com/pioarduino/platform-espressif32/releases/download/55.03.37/platform-espressif32.zip
|
||||||
@@ -55,47 +55,121 @@ extra_scripts =
|
|||||||
pre:scripts/patch_jpegdec.py
|
pre:scripts/patch_jpegdec.py
|
||||||
post:scripts/register_unit_tests_target.py
|
post:scripts/register_unit_tests_target.py
|
||||||
|
|
||||||
; Libraries
|
; Libraries — FreeInk SDK (git submodule at ./freeink-sdk). The left-hand names
|
||||||
|
; are the include paths the firmware already uses (<EInkDisplay.h>, etc.); FreeInk's
|
||||||
|
; compat shim preserves them. BoardConfig + PowerManager are FreeInk-only and
|
||||||
|
; required (device profiles + the SoC-correct deep-sleep wakeup the HAL relies on).
|
||||||
lib_deps =
|
lib_deps =
|
||||||
BatteryMonitor=symlink://open-x4-sdk/libs/hardware/BatteryMonitor
|
BatteryMonitor=symlink://freeink-sdk/libs/hardware/BatteryMonitor
|
||||||
InputManager=symlink://open-x4-sdk/libs/hardware/InputManager
|
InputManager=symlink://freeink-sdk/libs/hardware/InputManager
|
||||||
EInkDisplay=symlink://open-x4-sdk/libs/display/EInkDisplay
|
EInkDisplay=symlink://freeink-sdk/libs/display/FreeInkDisplay
|
||||||
SDCardManager=symlink://open-x4-sdk/libs/hardware/SDCardManager
|
SDCardManager=symlink://freeink-sdk/libs/hardware/SDCardManager
|
||||||
|
BoardConfig=symlink://freeink-sdk/libs/hardware/BoardConfig
|
||||||
|
PowerManager=symlink://freeink-sdk/libs/hardware/PowerManager
|
||||||
|
Rtc=symlink://freeink-sdk/libs/hardware/Rtc
|
||||||
|
Imu=symlink://freeink-sdk/libs/hardware/Imu
|
||||||
|
FreeInkUI=symlink://freeink-sdk/libs/ui/FreeInkUI
|
||||||
|
Icons=symlink://freeink-sdk/libs/assets/Icons
|
||||||
bblanchon/ArduinoJson @ 7.4.2
|
bblanchon/ArduinoJson @ 7.4.2
|
||||||
ricmoo/QRCode @ 0.0.1
|
ricmoo/QRCode @ 0.0.1
|
||||||
bitbank2/PNGdec @ 1.1.6
|
bitbank2/PNGdec @ 1.1.6
|
||||||
https://github.com/bitbank2/JPEGDEC.git#86282979224c8a32fd51e091ed5a35b0c699a52b
|
https://github.com/bitbank2/JPEGDEC.git#86282979224c8a32fd51e091ed5a35b0c699a52b
|
||||||
links2004/WebSockets @ 2.7.3
|
links2004/WebSockets @ 2.7.3
|
||||||
|
|
||||||
[env:default]
|
; ESP32-C3 device set: X3 + X4 compiled into one binary, runtime-selected after
|
||||||
|
; the I2C fingerprint. FreeInk requires an explicit device selection, so the C3
|
||||||
|
; envs extend this instead of [base] directly. (M5Paper is a different MCU family
|
||||||
|
; and selects its own device below.)
|
||||||
|
[c3]
|
||||||
extends = base
|
extends = base
|
||||||
build_flags =
|
build_flags =
|
||||||
${base.build_flags}
|
${base.build_flags}
|
||||||
|
-DFREEINK_DEVICE_X3=1
|
||||||
|
-DFREEINK_DEVICE_X4=1
|
||||||
|
|
||||||
|
[env:default]
|
||||||
|
extends = c3
|
||||||
|
build_flags =
|
||||||
|
${c3.build_flags}
|
||||||
; CROSSPOINT_VERSION is set by scripts/git_branch.py (includes branch + short SHA)
|
; CROSSPOINT_VERSION is set by scripts/git_branch.py (includes branch + short SHA)
|
||||||
-DENABLE_SERIAL_LOG
|
-DENABLE_SERIAL_LOG
|
||||||
-DLOG_LEVEL=2 ; Set log level to debug for development builds
|
-DLOG_LEVEL=2 ; Set log level to debug for development builds
|
||||||
|
|
||||||
|
|
||||||
[env:gh_release]
|
[env:gh_release]
|
||||||
extends = base
|
extends = c3
|
||||||
build_flags =
|
build_flags =
|
||||||
${base.build_flags}
|
${c3.build_flags}
|
||||||
-DCROSSPOINT_VERSION=\"${crosspoint.version}\"
|
-DCROSSPOINT_VERSION=\"${crosspoint.version}\"
|
||||||
-DENABLE_SERIAL_LOG
|
-DENABLE_SERIAL_LOG
|
||||||
-DLOG_LEVEL=1 ; Set log level to info for release builds
|
-DLOG_LEVEL=1 ; Set log level to info for release builds
|
||||||
|
|
||||||
[env:gh_release_rc]
|
[env:gh_release_rc]
|
||||||
extends = base
|
extends = c3
|
||||||
build_flags =
|
build_flags =
|
||||||
${base.build_flags}
|
${c3.build_flags}
|
||||||
-DCROSSPOINT_VERSION=\"${crosspoint.version}-rc+${sysenv.CROSSPOINT_RC_HASH}\"
|
-DCROSSPOINT_VERSION=\"${crosspoint.version}-rc+${sysenv.CROSSPOINT_RC_HASH}\"
|
||||||
-DENABLE_SERIAL_LOG
|
-DENABLE_SERIAL_LOG
|
||||||
-DLOG_LEVEL=1 ; Set log level to info for release candidate builds
|
-DLOG_LEVEL=1 ; Set log level to info for release candidate builds
|
||||||
|
|
||||||
[env:slim]
|
[env:slim]
|
||||||
extends = base
|
extends = c3
|
||||||
build_flags =
|
build_flags =
|
||||||
${base.build_flags}
|
${c3.build_flags}
|
||||||
-DCROSSPOINT_VERSION=\"${crosspoint.version}-slim\"
|
-DCROSSPOINT_VERSION=\"${crosspoint.version}-slim\"
|
||||||
; serial output is disabled in slim builds to save space
|
; serial output is disabled in slim builds to save space
|
||||||
-UENABLE_SERIAL_LOG
|
-UENABLE_SERIAL_LOG
|
||||||
|
|
||||||
|
; --- LilyGo T5 S3 (ESP32-S3 N16R8, 4.7" ED047TC1 / raw-parallel EPD) ---------
|
||||||
|
; Uses FreeInk's LilyGo board-support library for the PCA9535/TPS65185 display
|
||||||
|
; power hooks and expander button.
|
||||||
|
; pio run -e lilygo_t5s3 -t upload --upload-port /dev/tty.usbmodemXXXX
|
||||||
|
[env:lilygo_t5s3]
|
||||||
|
extends = base
|
||||||
|
board = esp32-s3-devkitc1-n16r8
|
||||||
|
board_build.mcu = esp32s3
|
||||||
|
board_build.flash_mode = qio
|
||||||
|
board_build.arduino.memory_type = qio_opi
|
||||||
|
build_flags =
|
||||||
|
${base.build_flags}
|
||||||
|
-DBOARD_HAS_PSRAM
|
||||||
|
-DFREEINK_DEVICE_LILYGO=1
|
||||||
|
-DCROSSPOINT_VERSION=\"${crosspoint.version}-lilygo_t5s3\"
|
||||||
|
-DCROSSPOINT_SHOW_BUTTON_HINTS=0
|
||||||
|
-DENABLE_SERIAL_LOG
|
||||||
|
-DLOG_LEVEL=2
|
||||||
|
-DTOUCH_PROBE_DEBUG=1
|
||||||
|
lib_deps =
|
||||||
|
${base.lib_deps}
|
||||||
|
BoardT5S3=symlink://freeink-sdk/libs/hardware/BoardT5S3
|
||||||
|
m5stack/M5GFX @ 0.2.20
|
||||||
|
|
||||||
|
; --- M5Paper v1.1 (classic ESP32-D0WDQ6, 4.7" 540x960 / IT8951E) -------------
|
||||||
|
; Different MCU family than the C3 base: override board/mcu/flash, disable the
|
||||||
|
; C3-only native-USB CDC (logs over UART0), and select the M5Paper device.
|
||||||
|
; pio run -e m5paper_v11 -t upload --upload-port /dev/tty.usbserial-XXXX
|
||||||
|
[env:m5paper_v11]
|
||||||
|
extends = base
|
||||||
|
board = esp32dev
|
||||||
|
board_build.mcu = esp32
|
||||||
|
board_build.flash_mode = qio
|
||||||
|
; CP2104 bridge: 460800 is ~4x the 115200 fallback and reliable; drop if a flash
|
||||||
|
; stalls. (921600 usually works too.)
|
||||||
|
upload_speed = 460800
|
||||||
|
build_flags =
|
||||||
|
${base.build_flags}
|
||||||
|
-UARDUINO_USB_MODE
|
||||||
|
-UARDUINO_USB_CDC_ON_BOOT
|
||||||
|
-DBOARD_HAS_PSRAM
|
||||||
|
-DFREEINK_DEVICE_M5PAPER=1
|
||||||
|
; git_branch.py only injects CROSSPOINT_VERSION for the default env; set it here.
|
||||||
|
-DCROSSPOINT_VERSION=\"${crosspoint.version}-m5paper_v11\"
|
||||||
|
-DENABLE_SERIAL_LOG
|
||||||
|
-DLOG_LEVEL=2
|
||||||
|
; Touch + rotary: no physical button row, so hide on-screen button hints.
|
||||||
|
-DCROSSPOINT_SHOW_BUTTON_HINTS=0
|
||||||
|
; Archive-order workarounds for the classic-ESP32 link (see freeink-sdk
|
||||||
|
; platformio.crosspoint.sample.ini): force Arduino startup + the I2C HAL members.
|
||||||
|
-Wl,.pio/build/m5paper_v11/FrameworkArduino/main.cpp.o
|
||||||
|
-Wl,-u,i2cInit
|
||||||
|
-Wl,-u,i2cSlaveInit
|
||||||
Executable
+26
@@ -0,0 +1,26 @@
|
|||||||
|
#!/usr/bin/env bash
|
||||||
|
# Regenerate src/components/icons/generated_icons.h from icons.manifest, using the
|
||||||
|
# FreeInk SDK icon generator and its vendored Lucide submodule. generated_icons.h is
|
||||||
|
# a committed build product of these inputs — re-run this after editing the manifest.
|
||||||
|
#
|
||||||
|
# Requires: rsvg-convert (librsvg) + Pillow, and the Lucide submodule fetched
|
||||||
|
# (git submodule update --init in the SDK).
|
||||||
|
set -euo pipefail
|
||||||
|
|
||||||
|
ROOT="$(cd "$(dirname "$0")/.." && pwd)"
|
||||||
|
SDK="$ROOT/freeink-sdk"
|
||||||
|
SVGDIR="$SDK/libs/assets/Icons/lucide/icons"
|
||||||
|
|
||||||
|
if [ ! -d "$SVGDIR" ]; then
|
||||||
|
echo "Lucide SVGs not found at $SVGDIR" >&2
|
||||||
|
echo "Fetch the submodule: git -C \"$SDK\" submodule update --init libs/assets/Icons/lucide" >&2
|
||||||
|
exit 1
|
||||||
|
fi
|
||||||
|
|
||||||
|
python3 "$SDK/libs/assets/Icons/tools/gen_icons.py" \
|
||||||
|
--manifest "$ROOT/src/components/icons/icons.manifest" \
|
||||||
|
--svgdir "$SVGDIR" \
|
||||||
|
--sizes 24,32,40,48 \
|
||||||
|
--out "$ROOT/src/components/icons/generated_icons.h"
|
||||||
|
|
||||||
|
echo "Regenerated src/components/icons/generated_icons.h"
|
||||||
@@ -65,8 +65,6 @@ class CrossPointSettings {
|
|||||||
XTC_STATUS_BAR_MODE_COUNT
|
XTC_STATUS_BAR_MODE_COUNT
|
||||||
};
|
};
|
||||||
|
|
||||||
enum STATUS_BAR_CLOCK_MODE { STATUS_BAR_CLOCK_HIDE = 0, STATUS_BAR_CLOCK_RIGHT = 1, STATUS_BAR_CLOCK_LEFT = 2 };
|
|
||||||
|
|
||||||
enum ORIENTATION {
|
enum ORIENTATION {
|
||||||
PORTRAIT = 0, // 480x800 logical coordinates (current default)
|
PORTRAIT = 0, // 480x800 logical coordinates (current default)
|
||||||
LANDSCAPE_CW = 1, // 800x480 logical coordinates, rotated 180° (swap top/bottom)
|
LANDSCAPE_CW = 1, // 800x480 logical coordinates, rotated 180° (swap top/bottom)
|
||||||
@@ -190,7 +188,7 @@ class CrossPointSettings {
|
|||||||
uint8_t statusBarBattery = 1;
|
uint8_t statusBarBattery = 1;
|
||||||
uint8_t xtcStatusBarMode = XTC_STATUS_BAR_HIDE;
|
uint8_t xtcStatusBarMode = XTC_STATUS_BAR_HIDE;
|
||||||
// Clock display in status bar (X3 only, requires DS3231 RTC)
|
// Clock display in status bar (X3 only, requires DS3231 RTC)
|
||||||
uint8_t statusBarClock = STATUS_BAR_CLOCK_HIDE;
|
uint8_t statusBarClock = 0;
|
||||||
// Clock UTC offset in quarter-hour steps, biased by 48 so it fits in uint8_t.
|
// Clock UTC offset in quarter-hour steps, biased by 48 so it fits in uint8_t.
|
||||||
// Value 48 = UTC+0, 0 = UTC-12:00, 104 = UTC+14:00.
|
// Value 48 = UTC+0, 0 = UTC-12:00, 104 = UTC+14:00.
|
||||||
// Quarter-hour granularity supports oddball zones like Nepal (+5:45) and Chatham (+12:45).
|
// Quarter-hour granularity supports oddball zones like Nepal (+5:45) and Chatham (+12:45).
|
||||||
@@ -240,12 +238,15 @@ class CrossPointSettings {
|
|||||||
// Long-press page turn button behavior
|
// Long-press page turn button behavior
|
||||||
uint8_t longPressButtonBehavior = OFF;
|
uint8_t longPressButtonBehavior = OFF;
|
||||||
// Long-press Confirm function in EPUB reader (cycles through LONG_PRESS_MENU_FUNCTION values).
|
// Long-press Confirm function in EPUB reader (cycles through LONG_PRESS_MENU_FUNCTION values).
|
||||||
// Defaults to Disabled so shortcut-based bookmark toggling remains opt-in.
|
// Defaults to Bookmark to preserve the upstream long-press-Confirm-adds-bookmark behavior.
|
||||||
uint8_t longPressMenuFunction = LP_MENU_DISABLED;
|
uint8_t longPressMenuFunction = LP_MENU_BOOKMARK;
|
||||||
// UI Theme
|
// UI Theme
|
||||||
uint8_t uiTheme = LYRA;
|
uint8_t uiTheme = LYRA;
|
||||||
// Sunlight fading compensation
|
// Sunlight fading compensation
|
||||||
uint8_t fadingFix = 0;
|
uint8_t fadingFix = 0;
|
||||||
|
// Touch reader controls: tap zones for page back/forward + press-and-hold,
|
||||||
|
// mirroring the physical buttons. Touch devices only (hidden elsewhere).
|
||||||
|
uint8_t touchReaderControls = 1;
|
||||||
// Power button return from footnotes (1 = enabled, 0 = disabled)
|
// Power button return from footnotes (1 = enabled, 0 = disabled)
|
||||||
uint8_t pwrBtnFootnoteBack = 1;
|
uint8_t pwrBtnFootnoteBack = 1;
|
||||||
// Use book's embedded CSS styles for EPUB rendering (1 = enabled, 0 = disabled)
|
// Use book's embedded CSS styles for EPUB rendering (1 = enabled, 0 = disabled)
|
||||||
|
|||||||
@@ -423,9 +423,6 @@ bool JsonSettingsIO::saveBookmarks(const std::vector<BookmarkEntry>& bookmarks,
|
|||||||
obj["xpath"] = bookmark.xpath;
|
obj["xpath"] = bookmark.xpath;
|
||||||
obj["percentage"] = bookmark.percentage;
|
obj["percentage"] = bookmark.percentage;
|
||||||
obj["summary"] = bookmark.summary;
|
obj["summary"] = bookmark.summary;
|
||||||
obj["si"] = bookmark.computedSpineIndex;
|
|
||||||
obj["pc"] = bookmark.computedChapterPageCount;
|
|
||||||
obj["pp"] = bookmark.computedChapterProgress;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String json;
|
String json;
|
||||||
@@ -450,9 +447,6 @@ bool JsonSettingsIO::loadBookmarks(std::vector<BookmarkEntry>& bookmarks, const
|
|||||||
bookmark.xpath = obj["xpath"] | std::string("");
|
bookmark.xpath = obj["xpath"] | std::string("");
|
||||||
bookmark.percentage = obj["percentage"] | static_cast<float>(0);
|
bookmark.percentage = obj["percentage"] | static_cast<float>(0);
|
||||||
bookmark.summary = obj["summary"] | std::string("");
|
bookmark.summary = obj["summary"] | std::string("");
|
||||||
bookmark.computedSpineIndex = obj["si"] | static_cast<uint16_t>(0);
|
|
||||||
bookmark.computedChapterPageCount = obj["pc"] | static_cast<uint16_t>(0);
|
|
||||||
bookmark.computedChapterProgress = obj["pp"] | static_cast<uint16_t>(0);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_DBG("BKM", "Loaded %zu bookmarks from file", bookmarks.size());
|
LOG_DBG("BKM", "Loaded %zu bookmarks from file", bookmarks.size());
|
||||||
|
|||||||
+187
-3
@@ -1,8 +1,12 @@
|
|||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
|
|
||||||
|
#include <FreeInkUI.h>
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
|
|
||||||
|
#include <cstdlib>
|
||||||
|
|
||||||
#include "CrossPointSettings.h"
|
#include "CrossPointSettings.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
|
|
||||||
bool MappedInputManager::isNavDirectionSwapped() const {
|
bool MappedInputManager::isNavDirectionSwapped() const {
|
||||||
// Key the swap on the orientation the screen is *actually* rendered at, not the persisted reader
|
// Key the swap on the orientation the screen is *actually* rendered at, not the persisted reader
|
||||||
@@ -74,9 +78,182 @@ bool MappedInputManager::mapButton(const Button button, bool (HalGPIO::*fn)(uint
|
|||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
bool MappedInputManager::wasPressed(const Button button) const { return mapButton(button, &HalGPIO::wasPressed); }
|
// Top-left corner fallback, as a fraction of the logical screen. Generous to hit.
|
||||||
|
static constexpr float BACK_GESTURE_FRAC_X = 0.22f;
|
||||||
|
static constexpr float BACK_GESTURE_FRAC_Y = 0.12f;
|
||||||
|
static constexpr float BOTTOM_EDGE_BACK_GESTURE_FRAC_Y = 0.14f;
|
||||||
|
static constexpr unsigned long TOUCH_DOWN_SELECT_DELAY_MS = 90;
|
||||||
|
static constexpr unsigned long TOUCH_HELD_OVERRIDE_WINDOW_MS = 250;
|
||||||
|
|
||||||
bool MappedInputManager::wasReleased(const Button button) const { return mapButton(button, &HalGPIO::wasReleased); }
|
void MappedInputManager::rememberTouchHeldTime() const {
|
||||||
|
touchHeldOverrideValid = true;
|
||||||
|
touchHeldOverrideMs = gpio.lastTouchHeldMs();
|
||||||
|
touchHeldOverrideAt = millis();
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasBottomEdgeSwipeUp() const {
|
||||||
|
float nxs = 0.0f, nys = 0.0f, nxe = 0.0f, nye = 0.0f;
|
||||||
|
if (!gpio.wasSwipe(nxs, nys, nxe, nye)) return false;
|
||||||
|
|
||||||
|
int sx = 0, sy = 0, ex = 0, ey = 0;
|
||||||
|
renderer.tapToLogical(nxs, nys, sx, sy);
|
||||||
|
renderer.tapToLogical(nxe, nye, ex, ey);
|
||||||
|
|
||||||
|
const int screenHeight = renderer.getScreenHeight();
|
||||||
|
const int bottomEdgeTop = screenHeight - static_cast<int>(screenHeight * BOTTOM_EDGE_BACK_GESTURE_FRAC_Y);
|
||||||
|
const bool isBackSwipe = sy >= bottomEdgeTop && ey < sy && std::abs(ey - sy) > std::abs(ex - sx);
|
||||||
|
if (isBackSwipe) rememberTouchHeldTime();
|
||||||
|
return isBackSwipe;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasBackGesture() const {
|
||||||
|
if (wasBottomEdgeSwipeUp()) return true;
|
||||||
|
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false;
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
// A tap on the theme's header Back target acts as Back.
|
||||||
|
int id = 0;
|
||||||
|
if (TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Back, id)) {
|
||||||
|
rememberTouchHeldTime();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
// Else the top-left corner, for screens with no Back target (e.g. the reader).
|
||||||
|
const bool isTopLeftBack =
|
||||||
|
lx <= renderer.getScreenWidth() * BACK_GESTURE_FRAC_X && ly <= renderer.getScreenHeight() * BACK_GESTURE_FRAC_Y;
|
||||||
|
if (isTopLeftBack) rememberTouchHeldTime();
|
||||||
|
return isTopLeftBack;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasItemTapped(int& id) const {
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false;
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
const bool hit = TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Item, id);
|
||||||
|
if (hit) rememberTouchHeldTime();
|
||||||
|
return hit;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasItemTouchedDown(int& id) const {
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
unsigned long heldMs = 0;
|
||||||
|
if (!gpio.isTouchTapCandidate(nx, ny, heldMs)) {
|
||||||
|
touchSelectTracking = false;
|
||||||
|
touchSelectEmitted = false;
|
||||||
|
touchSelectId = -1;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (!touchSelectTracking) {
|
||||||
|
float downNx = 0.0f, downNy = 0.0f;
|
||||||
|
if (!gpio.wasTouchDown(downNx, downNy)) return false;
|
||||||
|
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(downNx, downNy, lx, ly);
|
||||||
|
int candidateId = -1;
|
||||||
|
if (!TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Item, candidateId)) {
|
||||||
|
touchSelectTracking = false;
|
||||||
|
touchSelectEmitted = false;
|
||||||
|
touchSelectId = -1;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
touchSelectTracking = true;
|
||||||
|
touchSelectEmitted = false;
|
||||||
|
touchSelectId = candidateId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (touchSelectEmitted || heldMs < TOUCH_DOWN_SELECT_DELAY_MS) return false;
|
||||||
|
touchSelectEmitted = true;
|
||||||
|
id = touchSelectId;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasItemLongPressed(int& id) const {
|
||||||
|
static constexpr unsigned long TOUCH_LONG_PRESS_MS = 500;
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false; // release frame
|
||||||
|
if (gpio.lastTouchHeldMs() < TOUCH_LONG_PRESS_MS) return false;
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
const bool hit = TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Item, id);
|
||||||
|
if (hit) rememberTouchHeldTime();
|
||||||
|
return hit;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasTabTapped(int& id) const {
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false;
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
const bool hit = TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Tab, id);
|
||||||
|
if (hit) rememberTouchHeldTime();
|
||||||
|
return hit;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasCoverTapped(int& id) const {
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false;
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
const bool hit = TouchRegistry::getInstance().hitTest(lx, ly, TouchRegistry::Cover, id);
|
||||||
|
if (hit) rememberTouchHeldTime();
|
||||||
|
return hit;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasScreenTapped(int& x, int& y) const {
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) return false;
|
||||||
|
renderer.tapToLogical(nx, ny, x, y);
|
||||||
|
rememberTouchHeldTime();
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasListScroll(int& index, int count, int pageItems) const {
|
||||||
|
if (count <= 0) return false;
|
||||||
|
if (pageItems < 1) pageItems = 1;
|
||||||
|
if (wasBottomEdgeSwipeUp()) return false;
|
||||||
|
const SwipeDir swipe = wasSwipe();
|
||||||
|
if (swipe == SwipeDir::Up) {
|
||||||
|
return freeink::ui::listPageIndex(index, +1, count, pageItems);
|
||||||
|
}
|
||||||
|
if (swipe == SwipeDir::Down) {
|
||||||
|
return freeink::ui::listPageIndex(index, -1, count, pageItems);
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
MappedInputManager::SwipeDir MappedInputManager::wasSwipe() const {
|
||||||
|
if (wasBottomEdgeSwipeUp()) return SwipeDir::None;
|
||||||
|
|
||||||
|
float nxs = 0.0f, nys = 0.0f, nxe = 0.0f, nye = 0.0f;
|
||||||
|
if (!gpio.wasSwipe(nxs, nys, nxe, nye)) return SwipeDir::None;
|
||||||
|
// Map both endpoints into the logical frame so the direction follows what the
|
||||||
|
// user sees regardless of panel mount/orientation.
|
||||||
|
int sx = 0, sy = 0, ex = 0, ey = 0;
|
||||||
|
renderer.tapToLogical(nxs, nys, sx, sy);
|
||||||
|
renderer.tapToLogical(nxe, nye, ex, ey);
|
||||||
|
const int dx = ex - sx;
|
||||||
|
const int dy = ey - sy;
|
||||||
|
if (std::abs(dx) >= std::abs(dy)) {
|
||||||
|
return dx < 0 ? SwipeDir::Left : SwipeDir::Right;
|
||||||
|
}
|
||||||
|
return dy < 0 ? SwipeDir::Up : SwipeDir::Down;
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasPressed(const Button button) const {
|
||||||
|
// A top-left tap fires on the release frame; expose it on Back's press edge too
|
||||||
|
// so menus that act on wasPressed(Back) also respond. Deliberately NOT folded
|
||||||
|
// into isPressed, so a quick tap never satisfies the readers' long-press-home.
|
||||||
|
if (button == Button::Back && wasBackGesture()) return true;
|
||||||
|
return mapButton(button, &HalGPIO::wasPressed);
|
||||||
|
}
|
||||||
|
|
||||||
|
bool MappedInputManager::wasReleased(const Button button) const {
|
||||||
|
if (button == Button::Back && wasBackGesture()) return true;
|
||||||
|
return mapButton(button, &HalGPIO::wasReleased);
|
||||||
|
}
|
||||||
|
|
||||||
bool MappedInputManager::isPressed(const Button button) const { return mapButton(button, &HalGPIO::isPressed); }
|
bool MappedInputManager::isPressed(const Button button) const { return mapButton(button, &HalGPIO::isPressed); }
|
||||||
|
|
||||||
@@ -84,7 +261,14 @@ bool MappedInputManager::wasAnyPressed() const { return gpio.wasAnyPressed(); }
|
|||||||
|
|
||||||
bool MappedInputManager::wasAnyReleased() const { return gpio.wasAnyReleased(); }
|
bool MappedInputManager::wasAnyReleased() const { return gpio.wasAnyReleased(); }
|
||||||
|
|
||||||
unsigned long MappedInputManager::getHeldTime() const { return gpio.getHeldTime(); }
|
unsigned long MappedInputManager::getHeldTime() const {
|
||||||
|
if (!gpio.wasAnyPressed() && !gpio.wasAnyReleased() && touchHeldOverrideValid &&
|
||||||
|
millis() - touchHeldOverrideAt <= TOUCH_HELD_OVERRIDE_WINDOW_MS) {
|
||||||
|
return touchHeldOverrideMs;
|
||||||
|
}
|
||||||
|
touchHeldOverrideValid = false;
|
||||||
|
return gpio.getHeldTime();
|
||||||
|
}
|
||||||
|
|
||||||
MappedInputManager::Labels MappedInputManager::mapLabels(const char* back, const char* confirm, const char* previous,
|
MappedInputManager::Labels MappedInputManager::mapLabels(const char* back, const char* confirm, const char* previous,
|
||||||
const char* next) const {
|
const char* next) const {
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ class GfxRenderer;
|
|||||||
class MappedInputManager {
|
class MappedInputManager {
|
||||||
public:
|
public:
|
||||||
enum class Button { Back, Confirm, Left, Right, Up, Down, Power, PageBack, PageForward, NavNext, NavPrevious };
|
enum class Button { Back, Confirm, Left, Right, Up, Down, Power, PageBack, PageForward, NavNext, NavPrevious };
|
||||||
|
enum class SwipeDir { None, Left, Right, Up, Down };
|
||||||
|
|
||||||
struct Labels {
|
struct Labels {
|
||||||
const char* btn1;
|
const char* btn1;
|
||||||
@@ -21,6 +22,33 @@ class MappedInputManager {
|
|||||||
bool wasPressed(Button button) const;
|
bool wasPressed(Button button) const;
|
||||||
bool wasReleased(Button button) const;
|
bool wasReleased(Button button) const;
|
||||||
bool isPressed(Button button) const;
|
bool isPressed(Button button) const;
|
||||||
|
// Touch "back" gesture: a tap on the theme's header Back target, or in the
|
||||||
|
// top-left corner, or a swipe up from the visible bottom edge. Folded into
|
||||||
|
// Back's edges, so every screen gets it for free.
|
||||||
|
bool wasBackGesture() const;
|
||||||
|
// True (and writes the id) if a tap this frame hit a TouchRegistry item.
|
||||||
|
// Activities treat the id as "select + activate". False on non-touch devices.
|
||||||
|
bool wasItemTapped(int& id) const;
|
||||||
|
// Stable touch-down candidate: fires once when a touch remains over an item
|
||||||
|
// briefly without crossing tap slop, so swipes do not show row selection.
|
||||||
|
bool wasItemTouchedDown(int& id) const;
|
||||||
|
// Subset of wasItemTapped's releases held past the long-press threshold (check
|
||||||
|
// this first). Distinguishes tap vs press-and-hold.
|
||||||
|
bool wasItemLongPressed(int& id) const;
|
||||||
|
// wasItemTapped for tab-bar tabs (id = tab index) and cover/card targets
|
||||||
|
// (id = item index). Distinct kinds so a screen with both doesn't confuse them.
|
||||||
|
bool wasTabTapped(int& id) const;
|
||||||
|
bool wasCoverTapped(int& id) const;
|
||||||
|
// True on a touch release anywhere on screen, with logical/oriented coords.
|
||||||
|
bool wasScreenTapped(int& x, int& y) const;
|
||||||
|
// Swipe direction in the current logical (oriented) frame, or None. A swipe also
|
||||||
|
// raises the tap helpers above, so check this first and consume it.
|
||||||
|
SwipeDir wasSwipe() const;
|
||||||
|
// Page-scroll a list selection by a vertical swipe (touch nav without buttons):
|
||||||
|
// swipe up advances down the list, swipe down moves up, by pageItems, clamped to
|
||||||
|
// [0, count-1]. Updates index and returns true when a vertical swipe occurred, so
|
||||||
|
// callers can requestUpdate() and return before the tap handlers run.
|
||||||
|
bool wasListScroll(int& index, int count, int pageItems) const;
|
||||||
bool wasAnyPressed() const;
|
bool wasAnyPressed() const;
|
||||||
bool wasAnyReleased() const;
|
bool wasAnyReleased() const;
|
||||||
unsigned long getHeldTime() const;
|
unsigned long getHeldTime() const;
|
||||||
@@ -44,4 +72,13 @@ class MappedInputManager {
|
|||||||
const GfxRenderer& renderer;
|
const GfxRenderer& renderer;
|
||||||
|
|
||||||
bool mapButton(Button button, bool (HalGPIO::*fn)(uint8_t) const) const;
|
bool mapButton(Button button, bool (HalGPIO::*fn)(uint8_t) const) const;
|
||||||
|
void rememberTouchHeldTime() const;
|
||||||
|
bool wasBottomEdgeSwipeUp() const;
|
||||||
|
|
||||||
|
mutable bool touchSelectTracking = false;
|
||||||
|
mutable bool touchSelectEmitted = false;
|
||||||
|
mutable int touchSelectId = -1;
|
||||||
|
mutable bool touchHeldOverrideValid = false;
|
||||||
|
mutable unsigned long touchHeldOverrideMs = 0;
|
||||||
|
mutable unsigned long touchHeldOverrideAt = 0;
|
||||||
};
|
};
|
||||||
+27
-7
@@ -1,6 +1,8 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
|
|
||||||
|
#include <BoardConfig.h>
|
||||||
#include <HalClock.h>
|
#include <HalClock.h>
|
||||||
|
#include <HalGPIO.h>
|
||||||
#include <HalTiltSensor.h>
|
#include <HalTiltSensor.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
#include <SdCardFontRegistry.h>
|
#include <SdCardFontRegistry.h>
|
||||||
@@ -151,10 +153,9 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
|
|||||||
StrId::STR_CAT_READER),
|
StrId::STR_CAT_READER),
|
||||||
SettingInfo::Toggle(StrId::STR_HYPHENATION, &CrossPointSettings::hyphenationEnabled, "hyphenationEnabled",
|
SettingInfo::Toggle(StrId::STR_HYPHENATION, &CrossPointSettings::hyphenationEnabled, "hyphenationEnabled",
|
||||||
StrId::STR_CAT_READER),
|
StrId::STR_CAT_READER),
|
||||||
SettingInfo::Enum(
|
SettingInfo::Enum(StrId::STR_ORIENTATION, &CrossPointSettings::orientation,
|
||||||
StrId::STR_ORIENTATION, &CrossPointSettings::orientation,
|
{StrId::STR_PORTRAIT, StrId::STR_LANDSCAPE_CW, StrId::STR_INVERTED, StrId::STR_LANDSCAPE_CCW},
|
||||||
{StrId::STR_PORTRAIT, StrId::STR_LANDSCAPE_CW, StrId::STR_ORIENTATION_INVERTED, StrId::STR_LANDSCAPE_CCW},
|
"orientation", StrId::STR_CAT_READER),
|
||||||
"orientation", StrId::STR_CAT_READER),
|
|
||||||
SettingInfo::Toggle(StrId::STR_EXTRA_SPACING, &CrossPointSettings::extraParagraphSpacing,
|
SettingInfo::Toggle(StrId::STR_EXTRA_SPACING, &CrossPointSettings::extraParagraphSpacing,
|
||||||
"extraParagraphSpacing", StrId::STR_CAT_READER),
|
"extraParagraphSpacing", StrId::STR_CAT_READER),
|
||||||
SettingInfo::Toggle(StrId::STR_TEXT_AA, &CrossPointSettings::textAntiAliasing, "textAntiAliasing",
|
SettingInfo::Toggle(StrId::STR_TEXT_AA, &CrossPointSettings::textAntiAliasing, "textAntiAliasing",
|
||||||
@@ -245,9 +246,8 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
|
|||||||
StrId::STR_CUSTOMISE_STATUS_BAR),
|
StrId::STR_CUSTOMISE_STATUS_BAR),
|
||||||
// Clock entries (web settings only; device UI uses ClockOffsetActivity for the offset).
|
// Clock entries (web settings only; device UI uses ClockOffsetActivity for the offset).
|
||||||
// Range 0..104 = quarter-hour steps from UTC-12:00 to UTC+14:00, biased by 48.
|
// Range 0..104 = quarter-hour steps from UTC-12:00 to UTC+14:00, biased by 48.
|
||||||
SettingInfo::Enum(StrId::STR_CLOCK, &CrossPointSettings::statusBarClock,
|
SettingInfo::Toggle(StrId::STR_CLOCK, &CrossPointSettings::statusBarClock, "statusBarClock",
|
||||||
{StrId::STR_HIDE, StrId::STR_DIR_LEFT, StrId::STR_DIR_RIGHT}, "statusBarClock",
|
StrId::STR_CUSTOMISE_STATUS_BAR),
|
||||||
StrId::STR_CUSTOMISE_STATUS_BAR),
|
|
||||||
SettingInfo::Value(StrId::STR_CLOCK_UTC_OFFSET, &CrossPointSettings::clockUtcOffsetQ, {0, 104, 1},
|
SettingInfo::Value(StrId::STR_CLOCK_UTC_OFFSET, &CrossPointSettings::clockUtcOffsetQ, {0, 104, 1},
|
||||||
"clockUtcOffsetQ", StrId::STR_CUSTOMISE_STATUS_BAR),
|
"clockUtcOffsetQ", StrId::STR_CUSTOMISE_STATUS_BAR),
|
||||||
SettingInfo::Enum(StrId::STR_CLOCK_FORMAT, &CrossPointSettings::clockFormat,
|
SettingInfo::Enum(StrId::STR_CLOCK_FORMAT, &CrossPointSettings::clockFormat,
|
||||||
@@ -258,6 +258,26 @@ inline std::vector<SettingInfo> getSettingsList(const SdCardFontRegistry* regist
|
|||||||
SettingInfo::Toggle(StrId::STR_CLOCK_SYNCED, &CrossPointSettings::clockHasBeenSynced, "clockHasBeenSynced",
|
SettingInfo::Toggle(StrId::STR_CLOCK_SYNCED, &CrossPointSettings::clockHasBeenSynced, "clockHasBeenSynced",
|
||||||
StrId::STR_CUSTOMISE_STATUS_BAR),
|
StrId::STR_CUSTOMISE_STATUS_BAR),
|
||||||
};
|
};
|
||||||
|
// Sunlight fading fix is Xteink-only (transflective panel); other devices get
|
||||||
|
// the touch reader controls toggle instead. Same gate as the reader runtime.
|
||||||
|
if (!gpio.isXteinkDevice()) {
|
||||||
|
v.erase(std::remove_if(v.begin(), v.end(),
|
||||||
|
[](const SettingInfo& s) { return s.nameId == StrId::STR_SUNLIGHT_FADING_FIX; }),
|
||||||
|
v.end());
|
||||||
|
for (auto it = v.begin(); it != v.end(); ++it) {
|
||||||
|
if (it->nameId == StrId::STR_SIDE_BTN_LAYOUT) {
|
||||||
|
v.insert(it, SettingInfo::Toggle(StrId::STR_TOUCH_READER_CONTROLS, &CrossPointSettings::touchReaderControls,
|
||||||
|
"touchReaderControls", StrId::STR_CAT_CONTROLS));
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (BoardConfig::hasTouch()) {
|
||||||
|
v.erase(std::remove_if(v.begin(), v.end(),
|
||||||
|
[](const SettingInfo& s) { return s.nameId == StrId::STR_FRONT_BTN_FOLLOW_ORIENTATION; }),
|
||||||
|
v.end());
|
||||||
|
}
|
||||||
|
|
||||||
// Only show tilt page turn setting when the QMI8658 IMU is present (X3)
|
// Only show tilt page turn setting when the QMI8658 IMU is present (X3)
|
||||||
if (halTiltSensor.isAvailable()) {
|
if (halTiltSensor.isAvailable()) {
|
||||||
// Insert after the short power button setting (end of Controls section)
|
// Insert after the short power button setting (end of Controls section)
|
||||||
|
|||||||
@@ -56,8 +56,7 @@ class Activity {
|
|||||||
// Finish this activity and return to the previous one on the stack (if any)
|
// Finish this activity and return to the previous one on the stack (if any)
|
||||||
void finish();
|
void finish();
|
||||||
|
|
||||||
// Convenience method to facilitate API transition to ActivityManager
|
// Convenience method to facilitate API transition to ActivityManager.
|
||||||
// TODO: remove this in near future
|
|
||||||
void onGoHome(HomeMenuItem item = HomeMenuItem::NONE);
|
void onGoHome(HomeMenuItem item = HomeMenuItem::NONE);
|
||||||
void onSelectBook(const std::string& path);
|
void onSelectBook(const std::string& path);
|
||||||
};
|
};
|
||||||
@@ -9,6 +9,7 @@
|
|||||||
#include "boot_sleep/BootActivity.h"
|
#include "boot_sleep/BootActivity.h"
|
||||||
#include "boot_sleep/SleepActivity.h"
|
#include "boot_sleep/SleepActivity.h"
|
||||||
#include "browser/OpdsBookBrowserActivity.h"
|
#include "browser/OpdsBookBrowserActivity.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
#include "home/CrashActivity.h"
|
#include "home/CrashActivity.h"
|
||||||
#include "home/FileBrowserActivity.h"
|
#include "home/FileBrowserActivity.h"
|
||||||
#include "home/HomeActivity.h"
|
#include "home/HomeActivity.h"
|
||||||
@@ -19,6 +20,13 @@
|
|||||||
#include "settings/SettingsActivity.h"
|
#include "settings/SettingsActivity.h"
|
||||||
#include "util/FullScreenMessageActivity.h"
|
#include "util/FullScreenMessageActivity.h"
|
||||||
|
|
||||||
|
// taskENTER_CRITICAL needs a real spinlock on dual-core targets (classic ESP32,
|
||||||
|
// e.g. M5Paper). On the single-core ESP32-C3 a nullptr mux was tolerated, but
|
||||||
|
// the dual-core port acquires an inter-core spinlock and asserts on a null
|
||||||
|
// pointer (spinlock_acquire, spinlock.h:84). One shared spinlock guards the
|
||||||
|
// short waitingTaskHandle critical sections below.
|
||||||
|
static portMUX_TYPE activityMux = portMUX_INITIALIZER_UNLOCKED;
|
||||||
|
|
||||||
void ActivityManager::begin() {
|
void ActivityManager::begin() {
|
||||||
xTaskCreate(&renderTaskTrampoline, "ActivityManagerRender",
|
xTaskCreate(&renderTaskTrampoline, "ActivityManagerRender",
|
||||||
8192, // Stack size
|
8192, // Stack size
|
||||||
@@ -42,14 +50,18 @@ void ActivityManager::renderTaskLoop() {
|
|||||||
RenderLock lock;
|
RenderLock lock;
|
||||||
if (currentActivity) {
|
if (currentActivity) {
|
||||||
HalPowerManager::Lock powerLock; // Ensure we don't go into low-power mode while rendering
|
HalPowerManager::Lock powerLock; // Ensure we don't go into low-power mode while rendering
|
||||||
|
// Touch targets are rebuilt every frame: clear before the activity draws, then
|
||||||
|
// publish so the next loop() hit-tests against exactly what's on screen.
|
||||||
|
TouchRegistry::getInstance().beginFrame();
|
||||||
currentActivity->render(std::move(lock));
|
currentActivity->render(std::move(lock));
|
||||||
|
TouchRegistry::getInstance().publish();
|
||||||
}
|
}
|
||||||
// Notify any task blocked in requestUpdateAndWait() that the render is done.
|
// Notify any task blocked in requestUpdateAndWait() that the render is done.
|
||||||
TaskHandle_t waiter = nullptr;
|
TaskHandle_t waiter = nullptr;
|
||||||
taskENTER_CRITICAL(nullptr);
|
taskENTER_CRITICAL(&activityMux);
|
||||||
waiter = waitingTaskHandle;
|
waiter = waitingTaskHandle;
|
||||||
waitingTaskHandle = nullptr;
|
waitingTaskHandle = nullptr;
|
||||||
taskEXIT_CRITICAL(nullptr);
|
taskEXIT_CRITICAL(&activityMux);
|
||||||
if (waiter) {
|
if (waiter) {
|
||||||
xTaskNotify(waiter, 1, eIncrement);
|
xTaskNotify(waiter, 1, eIncrement);
|
||||||
}
|
}
|
||||||
@@ -280,7 +292,7 @@ void ActivityManager::requestUpdateAndWait() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Atomic section to perform checks
|
// Atomic section to perform checks
|
||||||
taskENTER_CRITICAL(nullptr);
|
taskENTER_CRITICAL(&activityMux);
|
||||||
auto currTaskHandler = xTaskGetCurrentTaskHandle();
|
auto currTaskHandler = xTaskGetCurrentTaskHandle();
|
||||||
auto mutexHolder = xSemaphoreGetMutexHolder(renderingMutex);
|
auto mutexHolder = xSemaphoreGetMutexHolder(renderingMutex);
|
||||||
bool isRenderTask = (currTaskHandler == renderTaskHandle);
|
bool isRenderTask = (currTaskHandler == renderTaskHandle);
|
||||||
@@ -289,7 +301,7 @@ void ActivityManager::requestUpdateAndWait() {
|
|||||||
if (!alreadyWaiting && !isRenderTask && !holdingRenderLock) {
|
if (!alreadyWaiting && !isRenderTask && !holdingRenderLock) {
|
||||||
waitingTaskHandle = currTaskHandler;
|
waitingTaskHandle = currTaskHandler;
|
||||||
}
|
}
|
||||||
taskEXIT_CRITICAL(nullptr);
|
taskEXIT_CRITICAL(&activityMux);
|
||||||
|
|
||||||
// Render task cannot call requestUpdateAndWait() or it will cause a deadlock
|
// Render task cannot call requestUpdateAndWait() or it will cause a deadlock
|
||||||
assert(!isRenderTask && "Render task cannot call requestUpdateAndWait()");
|
assert(!isRenderTask && "Render task cannot call requestUpdateAndWait()");
|
||||||
|
|||||||
@@ -218,15 +218,7 @@ void SleepActivity::renderBitmapSleepScreen(const Bitmap& bitmap) const {
|
|||||||
renderer.invertScreen();
|
renderer.invertScreen();
|
||||||
}
|
}
|
||||||
|
|
||||||
if (hasGreyscale) {
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
||||||
// OEM grayscale pipeline base: on X3 this displays the frame with the
|
|
||||||
// dedicated "AA-pre-BW(mid)" differential waveform, leaving every pixel
|
|
||||||
// in the calibrated state the gray nudge refresh expects; on X4 it is a
|
|
||||||
// plain HALF refresh (previous behavior).
|
|
||||||
renderer.displayGrayscaleBase(HalDisplay::HALF_REFRESH);
|
|
||||||
} else {
|
|
||||||
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (hasGreyscale) {
|
if (hasGreyscale) {
|
||||||
bitmap.rewindToData();
|
bitmap.rewindToData();
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
#include "OpdsBookBrowserActivity.h"
|
#include "OpdsBookBrowserActivity.h"
|
||||||
|
|
||||||
|
#include <FreeInkUI.h>
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
#include <Logging.h>
|
#include <Logging.h>
|
||||||
@@ -10,6 +11,7 @@
|
|||||||
#include "SilentRestart.h"
|
#include "SilentRestart.h"
|
||||||
#include "activities/network/WifiSelectionActivity.h"
|
#include "activities/network/WifiSelectionActivity.h"
|
||||||
#include "activities/util/KeyboardEntryActivity.h"
|
#include "activities/util/KeyboardEntryActivity.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
#include "network/HttpDownloader.h"
|
#include "network/HttpDownloader.h"
|
||||||
@@ -31,7 +33,6 @@ void OpdsBookBrowserActivity::onEnter() {
|
|||||||
currentPath = "";
|
currentPath = "";
|
||||||
selectorIndex = 0;
|
selectorIndex = 0;
|
||||||
consumeConfirm = false;
|
consumeConfirm = false;
|
||||||
consumeBack = false;
|
|
||||||
errorMessage.clear();
|
errorMessage.clear();
|
||||||
statusMessage = tr(STR_CHECKING_WIFI);
|
statusMessage = tr(STR_CHECKING_WIFI);
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
@@ -60,10 +61,6 @@ void OpdsBookBrowserActivity::loop() {
|
|||||||
consumeConfirm = false;
|
consumeConfirm = false;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
if (consumeBack && mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
|
||||||
consumeBack = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
if (state == BrowserState::ERROR) {
|
if (state == BrowserState::ERROR) {
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
@@ -91,11 +88,28 @@ void OpdsBookBrowserActivity::loop() {
|
|||||||
if (state == BrowserState::DOWNLOADING) return;
|
if (state == BrowserState::DOWNLOADING) return;
|
||||||
|
|
||||||
if (state == BrowserState::BROWSING) {
|
if (state == BrowserState::BROWSING) {
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
if (!entries.empty()) {
|
||||||
if (!entries.empty()) {
|
if (mappedInput.wasListScroll(selectorIndex, static_cast<int>(entries.size()), PAGE_ITEMS)) {
|
||||||
const auto& entry = entries[selectorIndex];
|
requestUpdate();
|
||||||
entry.type == OpdsEntryType::BOOK ? downloadBook(entry) : navigateToEntry(entry);
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) &&
|
||||||
|
freeink::ui::listSelectIndex(selectorIndex, downId, static_cast<int>(entries.size()))) {
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
if (mappedInput.wasItemTapped(tappedId) && tappedId >= 0 && tappedId < static_cast<int>(entries.size())) {
|
||||||
|
selectorIndex = tappedId;
|
||||||
|
activateSelectedEntry();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
|
activateSelectedEntry();
|
||||||
} else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
} else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
navigateBack();
|
navigateBack();
|
||||||
} else if (mappedInput.wasReleased(MappedInputManager::Button::Left)) {
|
} else if (mappedInput.wasReleased(MappedInputManager::Button::Left)) {
|
||||||
@@ -178,13 +192,20 @@ void OpdsBookBrowserActivity::render(RenderLock&&) {
|
|||||||
std::string displayText = (entry.type == OpdsEntryType::NAVIGATION) ? "> " + entry.title : entry.title;
|
std::string displayText = (entry.type == OpdsEntryType::NAVIGATION) ? "> " + entry.title : entry.title;
|
||||||
if (entry.type == OpdsEntryType::BOOK && !entry.author.empty()) displayText += " - " + entry.author;
|
if (entry.type == OpdsEntryType::BOOK && !entry.author.empty()) displayText += " - " + entry.author;
|
||||||
auto item = renderer.truncatedText(UI_10_FONT_ID, displayText.c_str(), pageWidth - 40);
|
auto item = renderer.truncatedText(UI_10_FONT_ID, displayText.c_str(), pageWidth - 40);
|
||||||
renderer.drawText(UI_10_FONT_ID, 20, 60 + (i % PAGE_ITEMS) * 30, item.c_str(),
|
const int itemY = 60 + (i % PAGE_ITEMS) * 30;
|
||||||
i != static_cast<size_t>(selectorIndex));
|
renderer.drawText(UI_10_FONT_ID, 20, itemY, item.c_str(), i != static_cast<size_t>(selectorIndex));
|
||||||
|
TouchRegistry::getInstance().add(Rect{0, itemY - 2, pageWidth, 30}, static_cast<int>(i), TouchRegistry::Item);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
renderer.displayBuffer();
|
renderer.displayBuffer();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void OpdsBookBrowserActivity::activateSelectedEntry() {
|
||||||
|
if (entries.empty() || selectorIndex < 0 || selectorIndex >= static_cast<int>(entries.size())) return;
|
||||||
|
const auto& entry = entries[selectorIndex];
|
||||||
|
entry.type == OpdsEntryType::BOOK ? downloadBook(entry) : navigateToEntry(entry);
|
||||||
|
}
|
||||||
|
|
||||||
void OpdsBookBrowserActivity::fetchFeed(const std::string& path) {
|
void OpdsBookBrowserActivity::fetchFeed(const std::string& path) {
|
||||||
if (server.url.empty()) {
|
if (server.url.empty()) {
|
||||||
state = BrowserState::ERROR;
|
state = BrowserState::ERROR;
|
||||||
|
|||||||
@@ -33,7 +33,6 @@ class OpdsBookBrowserActivity final : public Activity {
|
|||||||
std::string currentPath;
|
std::string currentPath;
|
||||||
std::string searchTemplate;
|
std::string searchTemplate;
|
||||||
bool consumeConfirm = false;
|
bool consumeConfirm = false;
|
||||||
bool consumeBack = false; // Added missing member
|
|
||||||
int selectorIndex = 0;
|
int selectorIndex = 0;
|
||||||
std::string errorMessage;
|
std::string errorMessage;
|
||||||
std::string statusMessage;
|
std::string statusMessage;
|
||||||
@@ -51,5 +50,6 @@ class OpdsBookBrowserActivity final : public Activity {
|
|||||||
void downloadBook(const OpdsEntry& book);
|
void downloadBook(const OpdsEntry& book);
|
||||||
void launchSearch();
|
void launchSearch();
|
||||||
void performSearch(const std::string& query);
|
void performSearch(const std::string& query);
|
||||||
|
void activateSelectedEntry();
|
||||||
bool preventAutoSleep() override { return true; }
|
bool preventAutoSleep() override { return true; }
|
||||||
};
|
};
|
||||||
@@ -20,7 +20,9 @@ void CrashActivity::onEnter() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void CrashActivity::loop() {
|
void CrashActivity::loop() {
|
||||||
if (mappedInput.isPressed(MappedInputManager::Button::Back)) {
|
int tapX = 0;
|
||||||
|
int tapY = 0;
|
||||||
|
if (mappedInput.isPressed(MappedInputManager::Button::Back) || mappedInput.wasScreenTapped(tapX, tapY)) {
|
||||||
finish();
|
finish();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -206,7 +206,29 @@ void FileBrowserActivity::loop() {
|
|||||||
const int pathReserved = renderer.getLineHeight(SMALL_FONT_ID) + UITheme::getInstance().getMetrics().verticalSpacing;
|
const int pathReserved = renderer.getLineHeight(SMALL_FONT_ID) + UITheme::getInstance().getMetrics().verticalSpacing;
|
||||||
const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false, pathReserved);
|
const int pageItems = UITheme::getNumberOfItemsPerPage(renderer, true, false, true, false, pathReserved);
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
// Vertical swipe page-scrolls the list (touch nav without the side buttons).
|
||||||
|
int scrollIdx = static_cast<int>(selectorIndex);
|
||||||
|
if (mappedInput.wasListScroll(scrollIdx, static_cast<int>(files.size()), pageItems)) {
|
||||||
|
selectorIndex = scrollIdx;
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(files.size())) {
|
||||||
|
selectorIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
// A tap opens the tapped entry (held-time is 0 on a tap, so it takes the short-press
|
||||||
|
// open path below, never the long-press delete).
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped && tappedId >= 0 && tappedId < static_cast<int>(files.size())) {
|
||||||
|
selectorIndex = tappedId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tapped || mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
if (lockNextConfirmRelease) {
|
if (lockNextConfirmRelease) {
|
||||||
lockNextConfirmRelease = false;
|
lockNextConfirmRelease = false;
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -179,7 +179,29 @@ void HomeActivity::loop() {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
// Tap a menu button to select + activate it. The button menu registers
|
||||||
|
// menu-local ids (drawn with selectorIndex offset by recentBooks.size()), so map
|
||||||
|
// back into the global selector space.
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId)) {
|
||||||
|
selectorIndex = static_cast<int>(recentBooks.size()) + downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped) {
|
||||||
|
selectorIndex = static_cast<int>(recentBooks.size()) + tappedId;
|
||||||
|
}
|
||||||
|
|
||||||
|
// A tap on the continue-reading cover selects that book (home selector index).
|
||||||
|
int coverId = -1;
|
||||||
|
const bool coverTapped = mappedInput.wasCoverTapped(coverId);
|
||||||
|
if (coverTapped && coverId >= 0 && coverId < static_cast<int>(recentBooks.size())) {
|
||||||
|
selectorIndex = coverId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tapped || coverTapped || mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
if (selectorIndex < recentBooks.size()) {
|
if (selectorIndex < recentBooks.size()) {
|
||||||
onSelectBook(recentBooks[selectorIndex].path);
|
onSelectBook(recentBooks[selectorIndex].path);
|
||||||
} else {
|
} else {
|
||||||
@@ -233,7 +255,7 @@ void HomeActivity::render(RenderLock&&) {
|
|||||||
// Build menu items dynamically
|
// Build menu items dynamically
|
||||||
std::vector<const char*> menuItems = {tr(STR_BROWSE_FILES), tr(STR_MENU_RECENT_BOOKS), tr(STR_FILE_TRANSFER),
|
std::vector<const char*> menuItems = {tr(STR_BROWSE_FILES), tr(STR_MENU_RECENT_BOOKS), tr(STR_FILE_TRANSFER),
|
||||||
tr(STR_SETTINGS_TITLE)};
|
tr(STR_SETTINGS_TITLE)};
|
||||||
std::vector<UIIcon> menuIcons = {Folder, Recent, Transfer, Settings};
|
std::vector<UIIcon> menuIcons = {Folder, Book, Transfer, Settings};
|
||||||
|
|
||||||
if (hasOpdsServers) {
|
if (hasOpdsServers) {
|
||||||
menuItems.insert(menuItems.begin() + 2, tr(STR_OPDS_BROWSER));
|
menuItems.insert(menuItems.begin() + 2, tr(STR_OPDS_BROWSER));
|
||||||
@@ -246,12 +268,13 @@ void HomeActivity::render(RenderLock&&) {
|
|||||||
menuIcons.insert(menuIcons.begin(), Book);
|
menuIcons.insert(menuIcons.begin(), Book);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Menu fills the space between the cover and the bottom reserve (button hints
|
||||||
|
// when shown, else a margin). Sizing it to the real remaining height lets
|
||||||
|
// drawButtonMenu fit the items, so a scaled-up menu never runs off the bottom.
|
||||||
|
const int menuY = metrics.homeTopPadding + metrics.homeCoverTileHeight + metrics.homeMenuTopOffset;
|
||||||
|
const int bottomReserve = (BaseTheme::showButtonHints() ? metrics.buttonHintsHeight : 0) + metrics.verticalSpacing;
|
||||||
GUI.drawButtonMenu(
|
GUI.drawButtonMenu(
|
||||||
renderer,
|
renderer, Rect{0, menuY, pageWidth, pageHeight - menuY - bottomReserve}, static_cast<int>(menuItems.size()),
|
||||||
Rect{0, metrics.homeTopPadding + metrics.homeCoverTileHeight + metrics.homeMenuTopOffset, pageWidth,
|
|
||||||
pageHeight - (metrics.headerHeight + metrics.homeTopPadding + metrics.verticalSpacing +
|
|
||||||
metrics.homeMenuTopOffset + metrics.buttonHintsHeight)},
|
|
||||||
static_cast<int>(menuItems.size()),
|
|
||||||
metrics.homeContinueReadingInMenu ? selectorIndex : selectorIndex - recentBooks.size(),
|
metrics.homeContinueReadingInMenu ? selectorIndex : selectorIndex - recentBooks.size(),
|
||||||
[&menuItems](int index) { return std::string(menuItems[index]); },
|
[&menuItems](int index) { return std::string(menuItems[index]); },
|
||||||
[&menuIcons](int index) { return menuIcons[index]; });
|
[&menuIcons](int index) { return menuIcons[index]; });
|
||||||
|
|||||||
@@ -44,6 +44,14 @@ void RecentBooksActivity::onExit() {
|
|||||||
void RecentBooksActivity::loop() {
|
void RecentBooksActivity::loop() {
|
||||||
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, true);
|
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, true);
|
||||||
|
|
||||||
|
// Vertical swipe page-scrolls the list (touch nav without the side buttons).
|
||||||
|
int scrollIdx = static_cast<int>(selectorIndex);
|
||||||
|
if (mappedInput.wasListScroll(scrollIdx, static_cast<int>(recentBooks.size()), pageItems)) {
|
||||||
|
selectorIndex = scrollIdx;
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// After a long-press has fired, swallow input until Confirm is physically released
|
// After a long-press has fired, swallow input until Confirm is physically released
|
||||||
// (so the release doesn't also open the book; re-arm only once the button is up).
|
// (so the release doesn't also open the book; re-arm only once the button is up).
|
||||||
if (longPressFired) {
|
if (longPressFired) {
|
||||||
@@ -63,7 +71,16 @@ void RecentBooksActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(recentBooks.size())) {
|
||||||
|
selectorIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped && tappedId >= 0 && tappedId < static_cast<int>(recentBooks.size())) selectorIndex = tappedId;
|
||||||
|
if (tapped || mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
if (!recentBooks.empty() && selectorIndex < static_cast<int>(recentBooks.size())) {
|
if (!recentBooks.empty() && selectorIndex < static_cast<int>(recentBooks.size())) {
|
||||||
LOG_DBG("RBA", "Selected recent book: %s", recentBooks[selectorIndex].path.c_str());
|
LOG_DBG("RBA", "Selected recent book: %s", recentBooks[selectorIndex].path.c_str());
|
||||||
onSelectBook(recentBooks[selectorIndex].path);
|
onSelectBook(recentBooks[selectorIndex].path);
|
||||||
|
|||||||
@@ -4,13 +4,13 @@
|
|||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <esp_task_wdt.h>
|
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
#include "SilentRestart.h"
|
#include "SilentRestart.h"
|
||||||
#include "WifiSelectionActivity.h"
|
#include "WifiSelectionActivity.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
#include "network/TaskWatchdog.h"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
constexpr const char* HOSTNAME = "crosspoint";
|
constexpr const char* HOSTNAME = "crosspoint";
|
||||||
@@ -110,12 +110,12 @@ void CalibreConnectActivity::loop() {
|
|||||||
LOG_DBG("CAL", "WARNING: %lu ms gap since last handleClient", timeSinceLastHandleClient);
|
LOG_DBG("CAL", "WARNING: %lu ms gap since last handleClient", timeSinceLastHandleClient);
|
||||||
}
|
}
|
||||||
|
|
||||||
esp_task_wdt_reset();
|
feedTaskWatchdog();
|
||||||
constexpr int MAX_ITERATIONS = 80;
|
constexpr int MAX_ITERATIONS = 80;
|
||||||
for (int i = 0; i < MAX_ITERATIONS && webServer->isRunning(); i++) {
|
for (int i = 0; i < MAX_ITERATIONS && webServer->isRunning(); i++) {
|
||||||
webServer->handleClient();
|
webServer->handleClient();
|
||||||
if ((i & 0x07) == 0x07) {
|
if ((i & 0x07) == 0x07) {
|
||||||
esp_task_wdt_reset();
|
feedTaskWatchdog();
|
||||||
}
|
}
|
||||||
if ((i & 0x0F) == 0x0F) {
|
if ((i & 0x0F) == 0x0F) {
|
||||||
yield();
|
yield();
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
#include <WiFi.h>
|
#include <WiFi.h>
|
||||||
#include <esp_task_wdt.h>
|
|
||||||
|
|
||||||
#include <cstddef>
|
#include <cstddef>
|
||||||
|
|
||||||
@@ -16,6 +15,7 @@
|
|||||||
#include "activities/network/CalibreConnectActivity.h"
|
#include "activities/network/CalibreConnectActivity.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
#include "network/TaskWatchdog.h"
|
||||||
#include "util/QrUtils.h"
|
#include "util/QrUtils.h"
|
||||||
|
|
||||||
namespace {
|
namespace {
|
||||||
@@ -328,7 +328,7 @@ void CrossPointWebServerActivity::loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Reset watchdog BEFORE processing - HTTP header parsing can be slow
|
// Reset watchdog BEFORE processing - HTTP header parsing can be slow
|
||||||
esp_task_wdt_reset();
|
feedTaskWatchdog();
|
||||||
|
|
||||||
// Process HTTP requests in tight loop for maximum throughput
|
// Process HTTP requests in tight loop for maximum throughput
|
||||||
// More iterations = more data processed per main loop cycle
|
// More iterations = more data processed per main loop cycle
|
||||||
@@ -337,7 +337,7 @@ void CrossPointWebServerActivity::loop() {
|
|||||||
webServer->handleClient();
|
webServer->handleClient();
|
||||||
// Reset watchdog every 32 iterations
|
// Reset watchdog every 32 iterations
|
||||||
if ((i & 0x1F) == 0x1F) {
|
if ((i & 0x1F) == 0x1F) {
|
||||||
esp_task_wdt_reset();
|
feedTaskWatchdog();
|
||||||
}
|
}
|
||||||
// Yield and check for exit button every 64 iterations
|
// Yield and check for exit button every 64 iterations
|
||||||
if ((i & 0x3F) == 0x3F) {
|
if ((i & 0x3F) == 0x3F) {
|
||||||
|
|||||||
@@ -30,8 +30,17 @@ void NetworkModeSelectionActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle confirm button - select current option
|
int downId = -1;
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(MENU_ITEM_COUNT)) {
|
||||||
|
selectedIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Handle confirm button (or a tap) - select current option
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped && tappedId >= 0 && tappedId < static_cast<int>(MENU_ITEM_COUNT)) selectedIndex = tappedId;
|
||||||
|
if (tapped || mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
||||||
NetworkMode mode = NetworkMode::JOIN_NETWORK;
|
NetworkMode mode = NetworkMode::JOIN_NETWORK;
|
||||||
if (selectedIndex == 1) {
|
if (selectedIndex == 1) {
|
||||||
mode = NetworkMode::CONNECT_CALIBRE;
|
mode = NetworkMode::CONNECT_CALIBRE;
|
||||||
@@ -42,7 +51,6 @@ void NetworkModeSelectionActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle navigation
|
|
||||||
buttonNavigator.onNext([this] {
|
buttonNavigator.onNext([this] {
|
||||||
selectedIndex = ButtonNavigator::nextIndex(selectedIndex, MENU_ITEM_COUNT);
|
selectedIndex = ButtonNavigator::nextIndex(selectedIndex, MENU_ITEM_COUNT);
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
@@ -77,7 +85,6 @@ void NetworkModeSelectionActivity::render(RenderLock&&) {
|
|||||||
[](int index) { return std::string(I18N.get(menuItems[index])); },
|
[](int index) { return std::string(I18N.get(menuItems[index])); },
|
||||||
[](int index) { return std::string(I18N.get(menuDescs[index])); }, [](int index) { return menuIcons[index]; });
|
[](int index) { return std::string(I18N.get(menuDescs[index])); }, [](int index) { return menuIcons[index]; });
|
||||||
|
|
||||||
// Draw help text at bottom
|
|
||||||
const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), tr(STR_DIR_UP), tr(STR_DIR_DOWN));
|
||||||
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
GUI.drawButtonHints(renderer, labels.btn1, labels.btn2, labels.btn3, labels.btn4);
|
||||||
|
|
||||||
|
|||||||
@@ -409,6 +409,27 @@ void WifiSelectionActivity::loop() {
|
|||||||
|
|
||||||
// Handle network list state
|
// Handle network list state
|
||||||
if (state == WifiSelectionState::NETWORK_LIST) {
|
if (state == WifiSelectionState::NETWORK_LIST) {
|
||||||
|
// Vertical swipe page-scrolls the network list (touch nav without the side buttons).
|
||||||
|
int scrollIdx = static_cast<int>(selectedNetworkIndex);
|
||||||
|
if (mappedInput.wasListScroll(scrollIdx, static_cast<int>(networks.size()),
|
||||||
|
UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false))) {
|
||||||
|
selectedNetworkIndex = scrollIdx;
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
// Touch: stable press highlights; tap selects it (like Confirm). Drag/scroll contacts do not preselect a row.
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(networks.size())) {
|
||||||
|
selectedNetworkIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
int tappedId = -1;
|
||||||
|
if (mappedInput.wasItemTapped(tappedId) && tappedId >= 0 && tappedId < static_cast<int>(networks.size())) {
|
||||||
|
selectedNetworkIndex = tappedId;
|
||||||
|
selectNetwork(selectedNetworkIndex);
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
// Check for Back button to exit (cancel)
|
// Check for Back button to exit (cancel)
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
||||||
onComplete(false);
|
onComplete(false);
|
||||||
@@ -442,7 +463,6 @@ void WifiSelectionActivity::loop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Handle navigation
|
|
||||||
buttonNavigator.onNext([this] {
|
buttonNavigator.onNext([this] {
|
||||||
selectedNetworkIndex = ButtonNavigator::nextIndex(selectedNetworkIndex, networks.size());
|
selectedNetworkIndex = ButtonNavigator::nextIndex(selectedNetworkIndex, networks.size());
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
|
|||||||
@@ -41,8 +41,6 @@ namespace {
|
|||||||
// pagesPerRefresh now comes from SETTINGS.getRefreshFrequency()
|
// pagesPerRefresh now comes from SETTINGS.getRefreshFrequency()
|
||||||
// pages per minute, first item is 1 to prevent division by zero if accessed
|
// pages per minute, first item is 1 to prevent division by zero if accessed
|
||||||
constexpr int PAGE_TURN_RATES[] = {1, 1, 3, 6, 12};
|
constexpr int PAGE_TURN_RATES[] = {1, 1, 3, 6, 12};
|
||||||
constexpr size_t initialBookmarkCacheCapacity = 16;
|
|
||||||
constexpr float bookmarkProgressEpsilon = 0.0001f;
|
|
||||||
|
|
||||||
int clampPercent(int percent) {
|
int clampPercent(int percent) {
|
||||||
if (percent < 0) {
|
if (percent < 0) {
|
||||||
@@ -65,36 +63,6 @@ bool isInReadFolder(const std::string& path) {
|
|||||||
return path.size() > n && path.compare(0, n, READ_FOLDER) == 0 && path[n] == '/';
|
return path.size() > n && path.compare(0, n, READ_FOLDER) == 0 && path[n] == '/';
|
||||||
}
|
}
|
||||||
|
|
||||||
struct ProgressRange {
|
|
||||||
float start;
|
|
||||||
float end;
|
|
||||||
};
|
|
||||||
|
|
||||||
ProgressRange getPageProgressRange(const std::shared_ptr<Epub>& epub, const int spineIndex, const int page,
|
|
||||||
const int pageCount) {
|
|
||||||
if (pageCount <= 1) {
|
|
||||||
return {epub->calculateProgress(spineIndex, 0.0f), epub->calculateProgress(spineIndex, 1.0f)};
|
|
||||||
}
|
|
||||||
|
|
||||||
const float step = 1.0f / static_cast<float>(pageCount - 1);
|
|
||||||
const float anchor = std::clamp(static_cast<float>(page) * step, 0.0f, 1.0f);
|
|
||||||
const float start = std::max(0.0f, anchor - (step * 0.5f));
|
|
||||||
const float end = std::min(1.0f, anchor + (step * 0.5f));
|
|
||||||
return {epub->calculateProgress(spineIndex, start), epub->calculateProgress(spineIndex, end)};
|
|
||||||
}
|
|
||||||
|
|
||||||
bool bookmarkMatchesProgress(const BookmarkEntry& bookmark, const int spineIndex, const int page, const int pageCount,
|
|
||||||
const ProgressRange& pageRange) {
|
|
||||||
if (bookmark.computedSpineIndex == spineIndex && bookmark.computedChapterPageCount == pageCount &&
|
|
||||||
bookmark.computedChapterProgress == page) {
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
|
|
||||||
const float bookmarkProgress = std::clamp(bookmark.percentage, 0.0f, 1.0f);
|
|
||||||
return bookmarkProgress + bookmarkProgressEpsilon >= pageRange.start &&
|
|
||||||
bookmarkProgress - bookmarkProgressEpsilon <= pageRange.end;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pick a non-colliding destination path inside /Read/ for a finished book.
|
// Pick a non-colliding destination path inside /Read/ for a finished book.
|
||||||
// Mirrors the suffixing scheme used elsewhere: "name.epub" -> "name (2).epub", etc.
|
// Mirrors the suffixing scheme used elsewhere: "name.epub" -> "name (2).epub", etc.
|
||||||
std::string buildReadFolderDestination(const std::string& srcPath) {
|
std::string buildReadFolderDestination(const std::string& srcPath) {
|
||||||
@@ -197,8 +165,6 @@ void EpubReaderActivity::onEnter() {
|
|||||||
APP_STATE.saveToFile();
|
APP_STATE.saveToFile();
|
||||||
RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), epub->getThumbBmpPath());
|
RECENT_BOOKS.addBook(epub->getPath(), epub->getTitle(), epub->getAuthor(), epub->getThumbBmpPath());
|
||||||
|
|
||||||
loadCachedBookmarks();
|
|
||||||
|
|
||||||
// Trigger first update
|
// Trigger first update
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
}
|
}
|
||||||
@@ -211,14 +177,6 @@ void EpubReaderActivity::onExit() {
|
|||||||
|
|
||||||
APP_STATE.readerActivityLoadCount = 0;
|
APP_STATE.readerActivityLoadCount = 0;
|
||||||
APP_STATE.saveToFile();
|
APP_STATE.saveToFile();
|
||||||
|
|
||||||
// Leaving mid-footnote loses the in-RAM return stack on deep sleep; persist the
|
|
||||||
// pre-footnote position so the book reopens at the link origin, not the footnote.
|
|
||||||
if (footnoteDepth > 0 && epub) {
|
|
||||||
const SavedPosition& origin = savedPositions[0];
|
|
||||||
saveProgress(origin.spineIndex, origin.pageNumber, 0);
|
|
||||||
}
|
|
||||||
|
|
||||||
section.reset();
|
section.reset();
|
||||||
if (pendingReadFolderMove && epub) {
|
if (pendingReadFolderMove && epub) {
|
||||||
const std::string srcPath = epub->getPath();
|
const std::string srcPath = epub->getPath();
|
||||||
@@ -298,10 +256,14 @@ void EpubReaderActivity::loop() {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Enter reader menu activity on short-press Confirm. A long-press that fired a bound
|
// Touch page nav (idempotent within a frame, so read here and again below). The
|
||||||
// function (bookmark or KOReader sync) sets ignoreNextConfirmRelease so the release
|
// top-left Back corner is consumed by wasReleased(Back) above, never reaching here.
|
||||||
// following the hold does not also open the menu.
|
const auto touch = ReaderUtils::detectTouchPageTurn(renderer);
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
|
||||||
|
// Enter reader menu activity on short-press Confirm release, or a center touch-and-hold. A
|
||||||
|
// long-press that fired a bound function (bookmark or KOReader sync) sets ignoreNextConfirmRelease
|
||||||
|
// so the release following the hold does not also open the menu.
|
||||||
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) || ReaderUtils::isTouchMenuGesture(touch)) {
|
||||||
if (ignoreNextConfirmRelease) {
|
if (ignoreNextConfirmRelease) {
|
||||||
ignoreNextConfirmRelease = false;
|
ignoreNextConfirmRelease = false;
|
||||||
} else {
|
} else {
|
||||||
@@ -315,7 +277,7 @@ void EpubReaderActivity::loop() {
|
|||||||
const int bookProgressPercent = clampPercent(static_cast<int>(bookProgress + 0.5f));
|
const int bookProgressPercent = clampPercent(static_cast<int>(bookProgress + 0.5f));
|
||||||
startActivityForResult(std::make_unique<EpubReaderMenuActivity>(
|
startActivityForResult(std::make_unique<EpubReaderMenuActivity>(
|
||||||
renderer, mappedInput, epub->getTitle(), currentPage, totalPages, bookProgressPercent,
|
renderer, mappedInput, epub->getTitle(), currentPage, totalPages, bookProgressPercent,
|
||||||
SETTINGS.orientation, !currentPageFootnotes.empty(), !cachedBookmarks.empty()),
|
SETTINGS.orientation, !currentPageFootnotes.empty()),
|
||||||
[this](const ActivityResult& result) {
|
[this](const ActivityResult& result) {
|
||||||
// Always apply orientation change even if the menu was cancelled
|
// Always apply orientation change even if the menu was cancelled
|
||||||
const auto& menu = std::get<MenuResult>(result.data);
|
const auto& menu = std::get<MenuResult>(result.data);
|
||||||
@@ -400,7 +362,9 @@ void EpubReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
||||||
|
prevTriggered = prevTriggered || touch.prev;
|
||||||
|
nextTriggered = nextTriggered || touch.next;
|
||||||
if (!prevTriggered && !nextTriggered) {
|
if (!prevTriggered && !nextTriggered) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -418,7 +382,8 @@ void EpubReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool longPress = !fromTilt && mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
|
const unsigned long heldMs = (touch.prev || touch.next) ? touch.heldMs : mappedInput.getHeldTime();
|
||||||
|
const bool longPress = !fromTilt && heldMs > ReaderUtils::SKIP_HOLD_MS;
|
||||||
|
|
||||||
// Don't skip chapter after screenshot
|
// Don't skip chapter after screenshot
|
||||||
if (gpio.wasReleased(HalGPIO::BTN_POWER) && gpio.wasReleased(HalGPIO::BTN_DOWN)) {
|
if (gpio.wasReleased(HalGPIO::BTN_POWER) && gpio.wasReleased(HalGPIO::BTN_DOWN)) {
|
||||||
@@ -534,7 +499,6 @@ void EpubReaderActivity::jumpToPercent(int percent) {
|
|||||||
|
|
||||||
void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction action) {
|
void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction action) {
|
||||||
auto progressChangeResultHandler = [this](const ActivityResult& result) {
|
auto progressChangeResultHandler = [this](const ActivityResult& result) {
|
||||||
loadCachedBookmarks();
|
|
||||||
if (!result.isCancelled) {
|
if (!result.isCancelled) {
|
||||||
const auto& sync = std::get<ProgressChangeResult>(result.data);
|
const auto& sync = std::get<ProgressChangeResult>(result.data);
|
||||||
if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
|
if (currentSpineIndex != sync.spineIndex || (section && section->currentPage != sync.page)) {
|
||||||
@@ -650,10 +614,6 @@ void EpubReaderActivity::onReaderMenuConfirm(EpubReaderMenuActivity::MenuAction
|
|||||||
progressChangeResultHandler);
|
progressChangeResultHandler);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
case EpubReaderMenuActivity::MenuAction::TOGGLE_BOOKMARK: {
|
|
||||||
addBookmark();
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -788,7 +748,6 @@ void EpubReaderActivity::pageTurn(bool isForwardTurn) {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
// TODO: Failure handling
|
|
||||||
void EpubReaderActivity::render(RenderLock&& lock) {
|
void EpubReaderActivity::render(RenderLock&& lock) {
|
||||||
if (!epub) {
|
if (!epub) {
|
||||||
return;
|
return;
|
||||||
@@ -941,8 +900,6 @@ void EpubReaderActivity::render(RenderLock&& lock) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
updateBookmarkFlag();
|
|
||||||
|
|
||||||
{
|
{
|
||||||
auto p = section->loadPageFromSectionFile();
|
auto p = section->loadPageFromSectionFile();
|
||||||
if (!p) {
|
if (!p) {
|
||||||
@@ -974,7 +931,7 @@ void EpubReaderActivity::render(RenderLock&& lock) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (showBookmarkMessage) {
|
if (showBookmarkMessage) {
|
||||||
GUI.drawPopup(renderer, bookmarkRemoved ? tr(STR_BOOKMARK_REMOVED) : tr(STR_BOOKMARK_ADDED));
|
GUI.drawPopup(renderer, tr(STR_BOOKMARK_ADDED));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1017,31 +974,22 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
const int orientedMarginRight, const int orientedMarginBottom,
|
const int orientedMarginRight, const int orientedMarginBottom,
|
||||||
const int orientedMarginLeft) {
|
const int orientedMarginLeft) {
|
||||||
const auto t0 = millis();
|
const auto t0 = millis();
|
||||||
const int fontId = SETTINGS.getReaderFontId();
|
|
||||||
|
|
||||||
// Font prewarm: scan pass accumulates text, then prewarm, then real render
|
// Font prewarm: scan pass accumulates text, then prewarm, then real render
|
||||||
auto* fcm = renderer.getFontCacheManager();
|
auto* fcm = renderer.getFontCacheManager();
|
||||||
auto scope = fcm->createPrewarmScope();
|
auto scope = fcm->createPrewarmScope();
|
||||||
page->render(renderer, fontId, orientedMarginLeft, orientedMarginTop); // scan pass
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop); // scan pass
|
||||||
scope.endScanAndPrewarm();
|
scope.endScanAndPrewarm();
|
||||||
const auto tPrewarm = millis();
|
const auto tPrewarm = millis();
|
||||||
|
|
||||||
const bool pageHasImages = page->hasImages();
|
// Force special handling for pages with images when anti-aliasing is on
|
||||||
const bool needsTextGrayscale = SETTINGS.textAntiAliasing;
|
bool imagePageWithAA = page->hasImages() && SETTINGS.textAntiAliasing;
|
||||||
const bool needsAnyGrayscale = needsTextGrayscale || pageHasImages;
|
|
||||||
auto renderGrayscalePass = [&]() {
|
|
||||||
if (needsTextGrayscale) {
|
|
||||||
page->render(renderer, fontId, orientedMarginLeft, orientedMarginTop);
|
|
||||||
} else {
|
|
||||||
page->renderImages(renderer, fontId, orientedMarginLeft, orientedMarginTop);
|
|
||||||
}
|
|
||||||
};
|
|
||||||
|
|
||||||
page->render(renderer, fontId, orientedMarginLeft, orientedMarginTop);
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderStatusBar();
|
renderStatusBar();
|
||||||
const auto tBwRender = millis();
|
const auto tBwRender = millis();
|
||||||
|
|
||||||
if (pageHasImages) {
|
if (imagePageWithAA) {
|
||||||
// Double FAST_REFRESH with selective image blanking (pablohc's technique):
|
// Double FAST_REFRESH with selective image blanking (pablohc's technique):
|
||||||
// HALF_REFRESH sets particles too firmly for the grayscale LUT to adjust.
|
// HALF_REFRESH sets particles too firmly for the grayscale LUT to adjust.
|
||||||
// Instead, blank only the image area and do two fast refreshes.
|
// Instead, blank only the image area and do two fast refreshes.
|
||||||
@@ -1054,7 +1002,7 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
|
|
||||||
// Re-render page content to restore images into the blanked area
|
// Re-render page content to restore images into the blanked area
|
||||||
// Status bar is not re-rendered here to avoid reading stale dynamic values (e.g. battery %)
|
// Status bar is not re-rendered here to avoid reading stale dynamic values (e.g. battery %)
|
||||||
page->render(renderer, fontId, orientedMarginLeft, orientedMarginTop);
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderer.displayBuffer(HalDisplay::FAST_REFRESH);
|
renderer.displayBuffer(HalDisplay::FAST_REFRESH);
|
||||||
} else {
|
} else {
|
||||||
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
||||||
@@ -1078,7 +1026,7 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
// per plane, but renderCharImpl culls out-of-band glyphs before decode so the
|
// per plane, but renderCharImpl culls out-of-band glyphs before decode so the
|
||||||
// cost stays close to one render. Both text (drawPixel) and images
|
// cost stays close to one render. Both text (drawPixel) and images
|
||||||
// (DirectPixelWriter) honor the active strip target.
|
// (DirectPixelWriter) honor the active strip target.
|
||||||
if (needsAnyGrayscale && renderer.supportsStripGrayscale()) {
|
if (SETTINGS.textAntiAliasing && renderer.supportsStripGrayscale()) {
|
||||||
constexpr int STRIP_ROWS = 80;
|
constexpr int STRIP_ROWS = 80;
|
||||||
const int gh = renderer.getDisplayHeight();
|
const int gh = renderer.getDisplayHeight();
|
||||||
const int gwBytes = renderer.getDisplayWidthBytes();
|
const int gwBytes = renderer.getDisplayWidthBytes();
|
||||||
@@ -1094,7 +1042,7 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
|
const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
|
||||||
renderer.beginStripTarget(scratch.get(), y, rows);
|
renderer.beginStripTarget(scratch.get(), y, rows);
|
||||||
renderer.clearScreen(0x00);
|
renderer.clearScreen(0x00);
|
||||||
renderGrayscalePass();
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderer.endStripTarget();
|
renderer.endStripTarget();
|
||||||
renderer.writeGrayscalePlaneStrip(true, scratch.get(), y, rows);
|
renderer.writeGrayscalePlaneStrip(true, scratch.get(), y, rows);
|
||||||
}
|
}
|
||||||
@@ -1106,7 +1054,7 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
|
const int rows = (gh - y < STRIP_ROWS) ? (gh - y) : STRIP_ROWS;
|
||||||
renderer.beginStripTarget(scratch.get(), y, rows);
|
renderer.beginStripTarget(scratch.get(), y, rows);
|
||||||
renderer.clearScreen(0x00);
|
renderer.clearScreen(0x00);
|
||||||
renderGrayscalePass();
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderer.endStripTarget();
|
renderer.endStripTarget();
|
||||||
renderer.writeGrayscalePlaneStrip(false, scratch.get(), y, rows);
|
renderer.writeGrayscalePlaneStrip(false, scratch.get(), y, rows);
|
||||||
}
|
}
|
||||||
@@ -1131,28 +1079,22 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
} else {
|
} else {
|
||||||
// Fallback path for a controller without strip support. grayscale rendering
|
// Fallback path for a controller without strip support. grayscale rendering
|
||||||
// TODO: Only do this if font supports it
|
// TODO: Only do this if font supports it
|
||||||
if (needsAnyGrayscale) {
|
if (SETTINGS.textAntiAliasing) {
|
||||||
// Save the BW frame before the grayscale passes overwrite it, restore
|
// Save the BW frame before the grayscale passes overwrite it, restore
|
||||||
// after. Only needed when grayscale actually renders.
|
// after. Only needed when grayscale actually renders.
|
||||||
if (!renderer.storeBwBuffer()) {
|
renderer.storeBwBuffer();
|
||||||
LOG_ERR("ERS", "Failed to store BW buffer for grayscale render; skipping grayscale this page");
|
|
||||||
const auto tEnd = millis();
|
|
||||||
LOG_DBG("ERS", "Page render: prewarm=%lums bw_render=%lums display=%lums total=%lums", tPrewarm - t0,
|
|
||||||
tBwRender - tPrewarm, tDisplay - tBwRender, tEnd - t0);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const auto tBwStore = millis();
|
const auto tBwStore = millis();
|
||||||
|
|
||||||
renderer.clearScreen(0x00);
|
renderer.clearScreen(0x00);
|
||||||
renderer.setRenderMode(GfxRenderer::GRAYSCALE_LSB);
|
renderer.setRenderMode(GfxRenderer::GRAYSCALE_LSB);
|
||||||
renderGrayscalePass();
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderer.copyGrayscaleLsbBuffers();
|
renderer.copyGrayscaleLsbBuffers();
|
||||||
const auto tGrayLsb = millis();
|
const auto tGrayLsb = millis();
|
||||||
|
|
||||||
// Render and copy to MSB buffer
|
// Render and copy to MSB buffer
|
||||||
renderer.clearScreen(0x00);
|
renderer.clearScreen(0x00);
|
||||||
renderer.setRenderMode(GfxRenderer::GRAYSCALE_MSB);
|
renderer.setRenderMode(GfxRenderer::GRAYSCALE_MSB);
|
||||||
renderGrayscalePass();
|
page->render(renderer, SETTINGS.getReaderFontId(), orientedMarginLeft, orientedMarginTop);
|
||||||
renderer.copyGrayscaleMsbBuffers();
|
renderer.copyGrayscaleMsbBuffers();
|
||||||
const auto tGrayMsb = millis();
|
const auto tGrayMsb = millis();
|
||||||
|
|
||||||
@@ -1170,8 +1112,8 @@ void EpubReaderActivity::renderContents(std::unique_ptr<Page> page, const int or
|
|||||||
tPrewarm - t0, tBwRender - tPrewarm, tDisplay - tBwRender, tBwStore - tDisplay, tGrayLsb - tBwStore,
|
tPrewarm - t0, tBwRender - tPrewarm, tDisplay - tBwRender, tBwStore - tDisplay, tGrayLsb - tBwStore,
|
||||||
tGrayMsb - tGrayLsb, tGrayDisplay - tGrayMsb, tBwRestore - tGrayDisplay, tEnd - t0);
|
tGrayMsb - tGrayLsb, tGrayDisplay - tGrayMsb, tBwRestore - tGrayDisplay, tEnd - t0);
|
||||||
} else {
|
} else {
|
||||||
// No text AA and no images: BW frame already displayed above, no grayscale
|
// No anti-aliasing: BW frame already displayed above, no grayscale to
|
||||||
// to render, so no save/restore.
|
// render, so no save/restore.
|
||||||
const auto tEnd = millis();
|
const auto tEnd = millis();
|
||||||
LOG_DBG("ERS", "Page render: prewarm=%lums bw_render=%lums display=%lums total=%lums", tPrewarm - t0,
|
LOG_DBG("ERS", "Page render: prewarm=%lums bw_render=%lums display=%lums total=%lums", tPrewarm - t0,
|
||||||
tBwRender - tPrewarm, tDisplay - tBwRender, tEnd - t0);
|
tBwRender - tPrewarm, tDisplay - tBwRender, tEnd - t0);
|
||||||
@@ -1213,7 +1155,7 @@ void EpubReaderActivity::renderStatusBar() const {
|
|||||||
title = epub->getTitle();
|
title = epub->getTitle();
|
||||||
}
|
}
|
||||||
|
|
||||||
GUI.drawStatusBar(renderer, bookProgress, currentPage, pageCount, title, 0, textYOffset, true, currentPageBookmarked);
|
GUI.drawStatusBar(renderer, bookProgress, currentPage, pageCount, title, 0, textYOffset);
|
||||||
}
|
}
|
||||||
|
|
||||||
void EpubReaderActivity::navigateToHref(const std::string& hrefStr, const bool savePosition) {
|
void EpubReaderActivity::navigateToHref(const std::string& hrefStr, const bool savePosition) {
|
||||||
@@ -1275,31 +1217,11 @@ void EpubReaderActivity::restoreSavedPosition() {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
void EpubReaderActivity::loadCachedBookmarks() {
|
|
||||||
cachedBookmarks.clear();
|
|
||||||
if (cachedBookmarks.capacity() < initialBookmarkCacheCapacity) {
|
|
||||||
cachedBookmarks.reserve(initialBookmarkCacheCapacity);
|
|
||||||
}
|
|
||||||
if (!epub) {
|
|
||||||
currentPageBookmarked = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
const std::string bmPath = BookmarkUtil::getBookmarkPath(epub->getPath());
|
|
||||||
if (Storage.exists(bmPath.c_str())) {
|
|
||||||
String json = Storage.readFile(bmPath.c_str());
|
|
||||||
if (!json.isEmpty()) {
|
|
||||||
JsonSettingsIO::loadBookmarks(cachedBookmarks, json.c_str());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
updateBookmarkFlag();
|
|
||||||
}
|
|
||||||
|
|
||||||
void EpubReaderActivity::addBookmark() {
|
void EpubReaderActivity::addBookmark() {
|
||||||
if (!section || !epub) {
|
if (!section || !epub) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
LOG_DBG("ERS", "Toggle bookmark at spine %d, page %d", currentSpineIndex, section ? section->currentPage : -1);
|
LOG_DBG("ERS", "Adding bookmark at spine %d, page %d", currentSpineIndex, section ? section->currentPage : -1);
|
||||||
int currentPage;
|
int currentPage;
|
||||||
int pageCount;
|
int pageCount;
|
||||||
{
|
{
|
||||||
@@ -1308,56 +1230,43 @@ void EpubReaderActivity::addBookmark() {
|
|||||||
currentPage = section->currentPage;
|
currentPage = section->currentPage;
|
||||||
}
|
}
|
||||||
|
|
||||||
SavedProgressPosition progress = ProgressMapper::toSavedProgress(epub, getCurrentPosition());
|
std::string pageText;
|
||||||
const ProgressRange pageRange = getPageProgressRange(epub, currentSpineIndex, currentPage, pageCount);
|
if (currentPage >= 0 && currentPage < pageCount) {
|
||||||
|
pageText = section->getTextFromSectionFile();
|
||||||
const size_t bookmarkCountBeforeToggle = cachedBookmarks.size();
|
|
||||||
cachedBookmarks.erase(std::remove_if(cachedBookmarks.begin(), cachedBookmarks.end(),
|
|
||||||
[&](const BookmarkEntry& b) {
|
|
||||||
return bookmarkMatchesProgress(b, currentSpineIndex, currentPage, pageCount,
|
|
||||||
pageRange);
|
|
||||||
}),
|
|
||||||
cachedBookmarks.end());
|
|
||||||
if (cachedBookmarks.size() != bookmarkCountBeforeToggle) {
|
|
||||||
bookmarkRemoved = true;
|
|
||||||
currentPageBookmarked = false;
|
|
||||||
} else {
|
|
||||||
std::string pageText;
|
|
||||||
if (currentPage >= 0 && currentPage < pageCount) {
|
|
||||||
pageText = section->getTextFromSectionFile();
|
|
||||||
}
|
|
||||||
BookmarkEntry entry;
|
|
||||||
entry.percentage = progress.percentage;
|
|
||||||
entry.xpath = progress.xpath;
|
|
||||||
entry.summary = BookmarkUtil::sanitizeBookmarkSummary(pageText);
|
|
||||||
entry.computedSpineIndex = currentSpineIndex;
|
|
||||||
entry.computedChapterPageCount = pageCount;
|
|
||||||
entry.computedChapterProgress = currentPage;
|
|
||||||
cachedBookmarks.insert(cachedBookmarks.begin(), entry);
|
|
||||||
bookmarkRemoved = false;
|
|
||||||
currentPageBookmarked = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
SavedProgressPosition progress = ProgressMapper::toSavedProgress(epub, getCurrentPosition());
|
||||||
|
|
||||||
|
BookmarkEntry entry;
|
||||||
|
entry.percentage = progress.percentage;
|
||||||
|
entry.xpath = progress.xpath;
|
||||||
|
entry.summary = BookmarkUtil::sanitizeBookmarkSummary(pageText);
|
||||||
|
|
||||||
|
// Add bookmark
|
||||||
const std::string path = BookmarkUtil::getBookmarkPath(epub->getPath());
|
const std::string path = BookmarkUtil::getBookmarkPath(epub->getPath());
|
||||||
|
LOG_DBG("ERS", "Bookmark path: %s", path.c_str());
|
||||||
const std::string bookmarksDir = BookmarkUtil::getBookmarksDir();
|
const std::string bookmarksDir = BookmarkUtil::getBookmarksDir();
|
||||||
Storage.mkdir(bookmarksDir.c_str());
|
Storage.mkdir(bookmarksDir.c_str());
|
||||||
const bool ok = JsonSettingsIO::saveBookmarks(cachedBookmarks, path.c_str());
|
std::vector<BookmarkEntry> bookmarks;
|
||||||
if (!ok) {
|
if (Storage.exists(path.c_str())) {
|
||||||
LOG_ERR("ERS", "Failed to save bookmarks to: %s", path.c_str());
|
LOG_DBG("ERS", "Existing bookmark file found, loading bookmarks");
|
||||||
|
String json = Storage.readFile(path.c_str());
|
||||||
|
if (!json.isEmpty()) {
|
||||||
|
JsonSettingsIO::loadBookmarks(bookmarks, json.c_str());
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
LOG_DBG("ERS", "No existing bookmark file, starting with empty bookmark list");
|
||||||
|
}
|
||||||
|
bookmarks.insert(bookmarks.begin(), entry);
|
||||||
|
LOG_DBG("ERS", "Saving bookmark to file: %s", path.c_str());
|
||||||
|
const bool ok = JsonSettingsIO::saveBookmarks(bookmarks, path.c_str());
|
||||||
|
if (ok) {
|
||||||
|
showBookmarkMessage = true;
|
||||||
|
} else {
|
||||||
|
LOG_ERR("ERS", "Failed to save bookmark to: %s", path.c_str());
|
||||||
}
|
}
|
||||||
requestUpdate();
|
|
||||||
}
|
|
||||||
|
|
||||||
void EpubReaderActivity::updateBookmarkFlag() {
|
requestUpdate();
|
||||||
if (!section || !epub || cachedBookmarks.empty()) {
|
|
||||||
currentPageBookmarked = false;
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
const ProgressRange pageRange =
|
|
||||||
getPageProgressRange(epub, currentSpineIndex, section->currentPage, section->pageCount);
|
|
||||||
currentPageBookmarked = std::any_of(cachedBookmarks.begin(), cachedBookmarks.end(), [&](const BookmarkEntry& b) {
|
|
||||||
return bookmarkMatchesProgress(b, currentSpineIndex, section->currentPage, section->pageCount, pageRange);
|
|
||||||
});
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ScreenshotInfo EpubReaderActivity::getScreenshotInfo() const {
|
ScreenshotInfo EpubReaderActivity::getScreenshotInfo() const {
|
||||||
|
|||||||
@@ -5,7 +5,6 @@
|
|||||||
|
|
||||||
#include <optional>
|
#include <optional>
|
||||||
|
|
||||||
#include "BookmarkEntry.h"
|
|
||||||
#include "EpubReaderMenuActivity.h"
|
#include "EpubReaderMenuActivity.h"
|
||||||
#include "ProgressMapper.h"
|
#include "ProgressMapper.h"
|
||||||
#include "activities/Activity.h"
|
#include "activities/Activity.h"
|
||||||
@@ -35,9 +34,6 @@ class EpubReaderActivity final : public Activity {
|
|||||||
bool automaticPageTurnActive = false;
|
bool automaticPageTurnActive = false;
|
||||||
bool showBookmarkMessage = false;
|
bool showBookmarkMessage = false;
|
||||||
bool ignoreNextConfirmRelease = false;
|
bool ignoreNextConfirmRelease = false;
|
||||||
bool currentPageBookmarked = false;
|
|
||||||
bool bookmarkRemoved = false; // true when last toggle removed (controls popup text)
|
|
||||||
std::vector<BookmarkEntry> cachedBookmarks;
|
|
||||||
// Tracks whether this book is currently removed from Recent Books by the
|
// Tracks whether this book is currently removed from Recent Books by the
|
||||||
// removeReadBooksFromRecents feature (set at End-of-Book, cleared if paged back in).
|
// removeReadBooksFromRecents feature (set at End-of-Book, cleared if paged back in).
|
||||||
bool recentsEntryRemoved = false;
|
bool recentsEntryRemoved = false;
|
||||||
@@ -70,9 +66,7 @@ class EpubReaderActivity final : public Activity {
|
|||||||
void applyOrientation(uint8_t orientation);
|
void applyOrientation(uint8_t orientation);
|
||||||
void toggleAutoPageTurn(uint8_t selectedPageTurnOption);
|
void toggleAutoPageTurn(uint8_t selectedPageTurnOption);
|
||||||
void pageTurn(bool isForwardTurn);
|
void pageTurn(bool isForwardTurn);
|
||||||
void loadCachedBookmarks();
|
|
||||||
void addBookmark();
|
void addBookmark();
|
||||||
void updateBookmarkFlag();
|
|
||||||
|
|
||||||
// Footnote navigation
|
// Footnote navigation
|
||||||
void navigateToHref(const std::string& href, bool savePosition = false);
|
void navigateToHref(const std::string& href, bool savePosition = false);
|
||||||
|
|||||||
@@ -39,6 +39,14 @@ void EpubReaderBookmarksActivity::onEnter() {
|
|||||||
bookmarks.shrink_to_fit();
|
bookmarks.shrink_to_fit();
|
||||||
} else {
|
} else {
|
||||||
JsonSettingsIO::loadBookmarks(bookmarks, json.c_str());
|
JsonSettingsIO::loadBookmarks(bookmarks, json.c_str());
|
||||||
|
|
||||||
|
// pre-compute bookmark page values for quicker rendering
|
||||||
|
for (auto& bookmark : bookmarks) {
|
||||||
|
CrossPointPosition pos = ProgressMapper::toCrossPoint(epub, {bookmark.xpath, bookmark.percentage}, renderer);
|
||||||
|
bookmark.computedSpineIndex = pos.spineIndex;
|
||||||
|
bookmark.computedChapterPageCount = pos.totalPages;
|
||||||
|
bookmark.computedChapterProgress = pos.pageNumber;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
LOG_DBG("EPB", "No bookmark file found at %s, starting with empty bookmarks", path.c_str());
|
LOG_DBG("EPB", "No bookmark file found at %s, starting with empty bookmarks", path.c_str());
|
||||||
@@ -85,14 +93,6 @@ void EpubReaderBookmarksActivity::loop() {
|
|||||||
selectorIndex--;
|
selectorIndex--;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (bookmarks.empty()) {
|
|
||||||
ActivityResult result;
|
|
||||||
result.isCancelled = true;
|
|
||||||
setResult(std::move(result));
|
|
||||||
finish();
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
confirmingDelete = DELETE_MODE_OFF;
|
confirmingDelete = DELETE_MODE_OFF;
|
||||||
return;
|
return;
|
||||||
@@ -103,7 +103,24 @@ void EpubReaderBookmarksActivity::loop() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) { // Open
|
if (confirmingDelete < DELETE_MODE_DISPLAY) {
|
||||||
|
// Vertical swipe page-scrolls the list (touch nav without the side buttons).
|
||||||
|
const int pageItems = GUI.getListPageItems(getListHeight(renderer), true);
|
||||||
|
if (mappedInput.wasListScroll(selectorIndex, static_cast<int>(bookmarks.size()), pageItems)) {
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(bookmarks.size())) {
|
||||||
|
selectorIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = (confirmingDelete < DELETE_MODE_DISPLAY) && mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped && tappedId >= 0 && tappedId < static_cast<int>(bookmarks.size())) selectorIndex = tappedId;
|
||||||
|
if (tapped || mappedInput.wasReleased(MappedInputManager::Button::Confirm)) { // Open
|
||||||
if (bookmarks.empty()) {
|
if (bookmarks.empty()) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -186,12 +203,9 @@ void EpubReaderBookmarksActivity::render(RenderLock&&) {
|
|||||||
auto bookmark = bookmarks.at(confirmingDelete >= DELETE_MODE_DISPLAY ? selectorIndex : index);
|
auto bookmark = bookmarks.at(confirmingDelete >= DELETE_MODE_DISPLAY ? selectorIndex : index);
|
||||||
auto tocIndex = epub->getTocIndexForSpineIndex(bookmark.computedSpineIndex);
|
auto tocIndex = epub->getTocIndexForSpineIndex(bookmark.computedSpineIndex);
|
||||||
auto tocTitle = (tocIndex >= 0) ? (epub->getTocItem(tocIndex)).title : tr(STR_UNNAMED);
|
auto tocTitle = (tocIndex >= 0) ? (epub->getTocItem(tocIndex)).title : tr(STR_UNNAMED);
|
||||||
std::string subtitle = std::to_string((int)(std::clamp(bookmark.percentage, 0.0f, 1.0f) * 100.0f + 0.5f)) + "% - ";
|
return std::to_string((int)(std::clamp(bookmark.percentage, 0.0f, 1.0f) * 100.0f + 0.5f)) + "% - " +
|
||||||
if (bookmark.computedChapterPageCount > 0) {
|
std::to_string(bookmark.computedChapterProgress + 1) + "/" +
|
||||||
subtitle += std::to_string(bookmark.computedChapterProgress + 1) + "/" +
|
std::to_string(bookmark.computedChapterPageCount) + " - " + tocTitle;
|
||||||
std::to_string(bookmark.computedChapterPageCount) + " - ";
|
|
||||||
}
|
|
||||||
return subtitle + tocTitle;
|
|
||||||
};
|
};
|
||||||
const auto getBookmarkIcon = [isPortrait](int index) {
|
const auto getBookmarkIcon = [isPortrait](int index) {
|
||||||
// only enabled icon in portrait mode due to limitation with rotating icons for other orientations
|
// only enabled icon in portrait mode due to limitation with rotating icons for other orientations
|
||||||
@@ -211,8 +225,11 @@ void EpubReaderBookmarksActivity::render(RenderLock&&) {
|
|||||||
getBookmarkTitle, getBookmarkSubtitle, getBookmarkIcon);
|
getBookmarkTitle, getBookmarkSubtitle, getBookmarkIcon);
|
||||||
|
|
||||||
GUI.drawHelpText(renderer, Rect{contentX, pageHeight - hintGutterBottom, contentWidth, LINE_HEIGHT},
|
GUI.drawHelpText(renderer, Rect{contentX, pageHeight - hintGutterBottom, contentWidth, LINE_HEIGHT},
|
||||||
tr(STR_HOLD_OPEN_TO_DELETE));
|
tr(STR_HOLD_CONFIRM_TO_DELETE));
|
||||||
}
|
}
|
||||||
|
} else {
|
||||||
|
GUI.drawHelpText(renderer, Rect{contentX, LINE_HEIGHT * 2, contentWidth, LINE_HEIGHT},
|
||||||
|
tr(STR_BOOKMARK_INSTRUCTIONS));
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto backLabel = confirmingDelete >= DELETE_MODE_DISPLAY ? tr(STR_CANCEL) : tr(STR_BACK);
|
const auto backLabel = confirmingDelete >= DELETE_MODE_DISPLAY ? tr(STR_CANCEL) : tr(STR_BACK);
|
||||||
|
|||||||
@@ -3,11 +3,39 @@
|
|||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
int EpubReaderChapterSelectionActivity::getTotalItems() const { return epub->getTocItemsCount(); }
|
int EpubReaderChapterSelectionActivity::getTotalItems() const { return epub ? epub->getTocItemsCount() : 0; }
|
||||||
|
|
||||||
|
void EpubReaderChapterSelectionActivity::cancelAndFinish() {
|
||||||
|
ActivityResult result;
|
||||||
|
result.isCancelled = true;
|
||||||
|
setResult(std::move(result));
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
|
void EpubReaderChapterSelectionActivity::activateSelection(int index) {
|
||||||
|
const int totalItems = getTotalItems();
|
||||||
|
if (!epub || totalItems <= 0) {
|
||||||
|
cancelAndFinish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
index = std::clamp(index, 0, totalItems - 1);
|
||||||
|
const auto tocItem = epub->getTocItem(index);
|
||||||
|
if (tocItem.spineIndex < 0 || tocItem.spineIndex >= epub->getSpineItemsCount()) {
|
||||||
|
cancelAndFinish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
selectorIndex = index;
|
||||||
|
setResult(ChapterResult{tocItem.spineIndex, tocItem.anchor});
|
||||||
|
finish();
|
||||||
|
}
|
||||||
|
|
||||||
void EpubReaderChapterSelectionActivity::onEnter() {
|
void EpubReaderChapterSelectionActivity::onEnter() {
|
||||||
Activity::onEnter();
|
Activity::onEnter();
|
||||||
@@ -30,23 +58,38 @@ void EpubReaderChapterSelectionActivity::onExit() { Activity::onExit(); }
|
|||||||
void EpubReaderChapterSelectionActivity::loop() {
|
void EpubReaderChapterSelectionActivity::loop() {
|
||||||
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false);
|
const int pageItems = UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false);
|
||||||
const int totalItems = getTotalItems();
|
const int totalItems = getTotalItems();
|
||||||
|
if (!epub || totalItems <= 0) {
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
const auto tocItem = epub->getTocItem(selectorIndex);
|
cancelAndFinish();
|
||||||
if (tocItem.spineIndex == -1) {
|
|
||||||
ActivityResult result;
|
|
||||||
result.isCancelled = true;
|
|
||||||
setResult(std::move(result));
|
|
||||||
finish();
|
|
||||||
} else {
|
|
||||||
setResult(ChapterResult{tocItem.spineIndex, tocItem.anchor});
|
|
||||||
finish();
|
|
||||||
}
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
// Vertical swipe page-scrolls the list (touch nav without the side buttons).
|
||||||
|
if (mappedInput.wasListScroll(selectorIndex, totalItems, pageItems)) {
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < totalItems) {
|
||||||
|
selectorIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
const bool validTap = tapped && tappedId >= 0 && tappedId < totalItems;
|
||||||
|
const bool confirm = mappedInput.wasReleased(MappedInputManager::Button::Confirm);
|
||||||
|
if (validTap) {
|
||||||
|
selectorIndex = tappedId;
|
||||||
|
}
|
||||||
|
if (validTap || confirm) {
|
||||||
|
activateSelection(selectorIndex);
|
||||||
|
return;
|
||||||
} else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
} else if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
ActivityResult result;
|
cancelAndFinish();
|
||||||
result.isCancelled = true;
|
return;
|
||||||
setResult(std::move(result));
|
|
||||||
finish();
|
|
||||||
}
|
}
|
||||||
|
|
||||||
buttonNavigator.onNextRelease([this, totalItems] {
|
buttonNavigator.onNextRelease([this, totalItems] {
|
||||||
@@ -83,10 +126,12 @@ void EpubReaderChapterSelectionActivity::render(RenderLock&&) {
|
|||||||
const int contentHeight = screen.height - contentTop - metrics.verticalSpacing;
|
const int contentHeight = screen.height - contentTop - metrics.verticalSpacing;
|
||||||
|
|
||||||
const int totalItems = getTotalItems();
|
const int totalItems = getTotalItems();
|
||||||
GUI.drawList(renderer, Rect{screen.x, contentTop, screen.width, contentHeight}, totalItems, selectorIndex,
|
const int displayIndex = totalItems > 0 ? std::clamp(selectorIndex, 0, totalItems - 1) : 0;
|
||||||
|
GUI.drawList(renderer, Rect{screen.x, contentTop, screen.width, contentHeight}, totalItems, displayIndex,
|
||||||
[this](int index) {
|
[this](int index) {
|
||||||
auto item = epub->getTocItem(index);
|
auto item = epub->getTocItem(index);
|
||||||
std::string indent((item.level - 1) * 2, ' ');
|
const int level = item.level > 0 ? item.level - 1 : 0;
|
||||||
|
std::string indent(level * 2, ' ');
|
||||||
return indent + item.title;
|
return indent + item.title;
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
@@ -19,6 +19,8 @@ class EpubReaderChapterSelectionActivity final : public Activity {
|
|||||||
|
|
||||||
// Total TOC items count
|
// Total TOC items count
|
||||||
int getTotalItems() const;
|
int getTotalItems() const;
|
||||||
|
void cancelAndFinish();
|
||||||
|
void activateSelection(int index);
|
||||||
|
|
||||||
public:
|
public:
|
||||||
explicit EpubReaderChapterSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
explicit EpubReaderChapterSelectionActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
#include "EpubReaderFootnotesActivity.h"
|
#include "EpubReaderFootnotesActivity.h"
|
||||||
|
|
||||||
|
#include <FreeInkUI.h>
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
@@ -18,6 +20,30 @@ void EpubReaderFootnotesActivity::onEnter() {
|
|||||||
void EpubReaderFootnotesActivity::onExit() { Activity::onExit(); }
|
void EpubReaderFootnotesActivity::onExit() { Activity::onExit(); }
|
||||||
|
|
||||||
void EpubReaderFootnotesActivity::loop() {
|
void EpubReaderFootnotesActivity::loop() {
|
||||||
|
constexpr int lineHeight = 36;
|
||||||
|
const auto orientation = renderer.getOrientation();
|
||||||
|
const bool isPortraitInverted = orientation == GfxRenderer::Orientation::PortraitInverted;
|
||||||
|
const int contentY = isPortraitInverted ? 50 : 0;
|
||||||
|
const int visibleCount = std::max(1, (renderer.getScreenHeight() - contentY) / lineHeight);
|
||||||
|
if (mappedInput.wasListScroll(selectedIndex, static_cast<int>(footnotes.size()), visibleCount)) {
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) &&
|
||||||
|
freeink::ui::listSelectIndex(selectedIndex, downId, static_cast<int>(footnotes.size()))) {
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
if (mappedInput.wasItemTapped(tappedId) && tappedId >= 0 && tappedId < static_cast<int>(footnotes.size())) {
|
||||||
|
selectedIndex = tappedId;
|
||||||
|
setResult(FootnoteResult{footnotes[selectedIndex].href});
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
ActivityResult result;
|
ActivityResult result;
|
||||||
result.isCancelled = true;
|
result.isCancelled = true;
|
||||||
@@ -102,6 +128,7 @@ void EpubReaderFootnotesActivity::render(RenderLock&&) {
|
|||||||
label = tr(STR_LINK);
|
label = tr(STR_LINK);
|
||||||
}
|
}
|
||||||
renderer.drawText(UI_10_FONT_ID, marginLeft, y + 4, label.c_str(), !isSelected);
|
renderer.drawText(UI_10_FONT_ID, marginLeft, y + 4, label.c_str(), !isSelected);
|
||||||
|
TouchRegistry::getInstance().add(Rect{contentX, y, contentWidth, lineHeight}, i, TouchRegistry::Item);
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "", "");
|
const auto labels = mappedInput.mapLabels(tr(STR_BACK), tr(STR_SELECT), "", "");
|
||||||
|
|||||||
@@ -10,27 +10,23 @@
|
|||||||
EpubReaderMenuActivity::EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
EpubReaderMenuActivity::EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput,
|
||||||
const std::string& title, const int currentPage, const int totalPages,
|
const std::string& title, const int currentPage, const int totalPages,
|
||||||
const int bookProgressPercent, const uint8_t currentOrientation,
|
const int bookProgressPercent, const uint8_t currentOrientation,
|
||||||
const bool hasFootnotes, const bool hasBookmarks)
|
const bool hasFootnotes)
|
||||||
: Activity("EpubReaderMenu", renderer, mappedInput),
|
: Activity("EpubReaderMenu", renderer, mappedInput),
|
||||||
menuItems(buildMenuItems(hasFootnotes, hasBookmarks)),
|
menuItems(buildMenuItems(hasFootnotes)),
|
||||||
title(title),
|
title(title),
|
||||||
pendingOrientation(currentOrientation),
|
pendingOrientation(currentOrientation),
|
||||||
currentPage(currentPage),
|
currentPage(currentPage),
|
||||||
totalPages(totalPages),
|
totalPages(totalPages),
|
||||||
bookProgressPercent(bookProgressPercent) {}
|
bookProgressPercent(bookProgressPercent) {}
|
||||||
|
|
||||||
std::vector<EpubReaderMenuActivity::MenuItem> EpubReaderMenuActivity::buildMenuItems(bool hasFootnotes,
|
std::vector<EpubReaderMenuActivity::MenuItem> EpubReaderMenuActivity::buildMenuItems(bool hasFootnotes) {
|
||||||
bool hasBookmarks) {
|
|
||||||
std::vector<MenuItem> items;
|
std::vector<MenuItem> items;
|
||||||
items.reserve(12);
|
items.reserve(11);
|
||||||
items.push_back({MenuAction::SELECT_CHAPTER, StrId::STR_SELECT_CHAPTER});
|
items.push_back({MenuAction::SELECT_CHAPTER, StrId::STR_SELECT_CHAPTER});
|
||||||
if (hasFootnotes) {
|
if (hasFootnotes) {
|
||||||
items.push_back({MenuAction::FOOTNOTES, StrId::STR_FOOTNOTES});
|
items.push_back({MenuAction::FOOTNOTES, StrId::STR_FOOTNOTES});
|
||||||
}
|
}
|
||||||
if (hasBookmarks) {
|
items.push_back({MenuAction::BOOKMARKS, StrId::STR_BOOKMARKS});
|
||||||
items.push_back({MenuAction::BOOKMARKS, StrId::STR_BOOKMARKS});
|
|
||||||
}
|
|
||||||
items.push_back({MenuAction::TOGGLE_BOOKMARK, StrId::STR_TOGGLE_BOOKMARK});
|
|
||||||
items.push_back({MenuAction::ROTATE_SCREEN, StrId::STR_ORIENTATION});
|
items.push_back({MenuAction::ROTATE_SCREEN, StrId::STR_ORIENTATION});
|
||||||
items.push_back({MenuAction::AUTO_PAGE_TURN, StrId::STR_AUTO_TURN_PAGES_PER_MIN});
|
items.push_back({MenuAction::AUTO_PAGE_TURN, StrId::STR_AUTO_TURN_PAGES_PER_MIN});
|
||||||
items.push_back({MenuAction::GO_TO_PERCENT, StrId::STR_GO_TO_PERCENT});
|
items.push_back({MenuAction::GO_TO_PERCENT, StrId::STR_GO_TO_PERCENT});
|
||||||
@@ -50,7 +46,6 @@ void EpubReaderMenuActivity::onEnter() {
|
|||||||
void EpubReaderMenuActivity::onExit() { Activity::onExit(); }
|
void EpubReaderMenuActivity::onExit() { Activity::onExit(); }
|
||||||
|
|
||||||
void EpubReaderMenuActivity::loop() {
|
void EpubReaderMenuActivity::loop() {
|
||||||
// Handle navigation
|
|
||||||
buttonNavigator.onNext([this] {
|
buttonNavigator.onNext([this] {
|
||||||
selectedIndex = ButtonNavigator::nextIndex(selectedIndex, static_cast<int>(menuItems.size()));
|
selectedIndex = ButtonNavigator::nextIndex(selectedIndex, static_cast<int>(menuItems.size()));
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
@@ -61,7 +56,27 @@ void EpubReaderMenuActivity::loop() {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
});
|
});
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
// Vertical swipe page-scrolls the menu (touch nav without the side buttons).
|
||||||
|
if (mappedInput.wasListScroll(selectedIndex, static_cast<int>(menuItems.size()),
|
||||||
|
UITheme::getInstance().getNumberOfItemsPerPage(renderer, true, false, true, false))) {
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < static_cast<int>(menuItems.size())) {
|
||||||
|
selectedIndex = downId;
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
// A tap selects the item and activates it in one gesture (falls into Confirm below).
|
||||||
|
int tappedId = -1;
|
||||||
|
const bool tapped = mappedInput.wasItemTapped(tappedId);
|
||||||
|
if (tapped && tappedId >= 0 && tappedId < static_cast<int>(menuItems.size())) {
|
||||||
|
selectedIndex = tappedId;
|
||||||
|
}
|
||||||
|
|
||||||
|
if (tapped || mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
const auto selectedAction = menuItems[selectedIndex].action;
|
const auto selectedAction = menuItems[selectedIndex].action;
|
||||||
if (selectedAction == MenuAction::ROTATE_SCREEN) {
|
if (selectedAction == MenuAction::ROTATE_SCREEN) {
|
||||||
// Cycle orientation preview locally; actual rotation happens on menu exit.
|
// Cycle orientation preview locally; actual rotation happens on menu exit.
|
||||||
|
|||||||
@@ -18,7 +18,6 @@ class EpubReaderMenuActivity final : public Activity {
|
|||||||
AUTO_PAGE_TURN,
|
AUTO_PAGE_TURN,
|
||||||
ROTATE_SCREEN,
|
ROTATE_SCREEN,
|
||||||
BOOKMARKS,
|
BOOKMARKS,
|
||||||
TOGGLE_BOOKMARK,
|
|
||||||
SCREENSHOT,
|
SCREENSHOT,
|
||||||
DISPLAY_QR,
|
DISPLAY_QR,
|
||||||
GO_HOME,
|
GO_HOME,
|
||||||
@@ -28,7 +27,7 @@ class EpubReaderMenuActivity final : public Activity {
|
|||||||
|
|
||||||
explicit EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::string& title,
|
explicit EpubReaderMenuActivity(GfxRenderer& renderer, MappedInputManager& mappedInput, const std::string& title,
|
||||||
const int currentPage, const int totalPages, const int bookProgressPercent,
|
const int currentPage, const int totalPages, const int bookProgressPercent,
|
||||||
const uint8_t currentOrientation, const bool hasFootnotes, bool hasBookmarks);
|
const uint8_t currentOrientation, const bool hasFootnotes);
|
||||||
|
|
||||||
void onEnter() override;
|
void onEnter() override;
|
||||||
void onExit() override;
|
void onExit() override;
|
||||||
@@ -41,7 +40,7 @@ class EpubReaderMenuActivity final : public Activity {
|
|||||||
StrId labelId;
|
StrId labelId;
|
||||||
};
|
};
|
||||||
|
|
||||||
static std::vector<MenuItem> buildMenuItems(bool hasFootnotes, bool hasBookmarks);
|
static std::vector<MenuItem> buildMenuItems(bool hasFootnotes);
|
||||||
|
|
||||||
// Fixed menu layout
|
// Fixed menu layout
|
||||||
const std::vector<MenuItem> menuItems;
|
const std::vector<MenuItem> menuItems;
|
||||||
|
|||||||
@@ -3,6 +3,8 @@
|
|||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
|
|
||||||
|
#include <algorithm>
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
@@ -32,6 +34,22 @@ void EpubReaderPercentSelectionActivity::adjustPercent(const int delta) {
|
|||||||
requestUpdate();
|
requestUpdate();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool EpubReaderPercentSelectionActivity::setPercentFromTouch(const int x, const int y) {
|
||||||
|
auto& theme = UITheme::getInstance();
|
||||||
|
const auto metrics = theme.getMetrics();
|
||||||
|
const Rect screen = theme.getScreenSafeArea(renderer, true, false);
|
||||||
|
const int contentTop = screen.y + metrics.topPadding + metrics.headerHeight + metrics.verticalSpacing * 4;
|
||||||
|
constexpr int barWidth = 360;
|
||||||
|
constexpr int barHeight = 16;
|
||||||
|
const int barX = screen.x + (screen.width - barWidth) / 2;
|
||||||
|
const int barY = contentTop + metrics.verticalSpacing * 2;
|
||||||
|
if (y < barY - 28 || y > barY + barHeight + 36 || x < barX - 20 || x > barX + barWidth + 20) return false;
|
||||||
|
|
||||||
|
const int clampedX = std::max(barX, std::min(x, barX + barWidth));
|
||||||
|
percent = (clampedX - barX) * 100 / barWidth;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
void EpubReaderPercentSelectionActivity::loop() {
|
void EpubReaderPercentSelectionActivity::loop() {
|
||||||
// Back cancels, confirm selects, arrows adjust the percent.
|
// Back cancels, confirm selects, arrows adjust the percent.
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Back)) {
|
||||||
@@ -48,6 +66,31 @@ void EpubReaderPercentSelectionActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (mappedInput.wasSwipe()) {
|
||||||
|
case MappedInputManager::SwipeDir::Left:
|
||||||
|
adjustPercent(-kSmallStep);
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Right:
|
||||||
|
adjustPercent(kSmallStep);
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Up:
|
||||||
|
adjustPercent(kLargeStep);
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Down:
|
||||||
|
adjustPercent(-kLargeStep);
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::None:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
int tapX = 0;
|
||||||
|
int tapY = 0;
|
||||||
|
if (mappedInput.wasScreenTapped(tapX, tapY) && setPercentFromTouch(tapX, tapY)) {
|
||||||
|
setResult(PercentResult{percent});
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Left}, [this] { adjustPercent(-kSmallStep); });
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Left}, [this] { adjustPercent(-kSmallStep); });
|
||||||
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Right}, [this] { adjustPercent(kSmallStep); });
|
buttonNavigator.onPressAndContinuous({MappedInputManager::Button::Right}, [this] { adjustPercent(kSmallStep); });
|
||||||
|
|
||||||
|
|||||||
@@ -24,4 +24,5 @@ class EpubReaderPercentSelectionActivity final : public Activity {
|
|||||||
|
|
||||||
// Change the current percent by a delta and clamp within bounds.
|
// Change the current percent by a delta and clamp within bounds.
|
||||||
void adjustPercent(int delta);
|
void adjustPercent(int delta);
|
||||||
|
bool setPercentFromTouch(int x, int y);
|
||||||
};
|
};
|
||||||
@@ -21,6 +21,13 @@ void QrDisplayActivity::loop() {
|
|||||||
finish();
|
finish();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
int tapX = 0;
|
||||||
|
int tapY = 0;
|
||||||
|
if (mappedInput.wasScreenTapped(tapX, tapY)) {
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void QrDisplayActivity::render(RenderLock&&) {
|
void QrDisplayActivity::render(RenderLock&&) {
|
||||||
|
|||||||
@@ -2,6 +2,7 @@
|
|||||||
|
|
||||||
#include <CrossPointSettings.h>
|
#include <CrossPointSettings.h>
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
|
#include <HalGPIO.h>
|
||||||
#include <HalTiltSensor.h>
|
#include <HalTiltSensor.h>
|
||||||
#include <Logging.h>
|
#include <Logging.h>
|
||||||
|
|
||||||
@@ -13,6 +14,9 @@ constexpr unsigned long GO_HOME_MS = 1000;
|
|||||||
constexpr unsigned long SKIP_HOLD_MS = 700;
|
constexpr unsigned long SKIP_HOLD_MS = 700;
|
||||||
constexpr unsigned long BOOKMARK_HOLD_MS = 400;
|
constexpr unsigned long BOOKMARK_HOLD_MS = 400;
|
||||||
constexpr unsigned long BOOKMARK_MESSAGE_DURATION_MS = 2500;
|
constexpr unsigned long BOOKMARK_MESSAGE_DURATION_MS = 2500;
|
||||||
|
// Press-and-hold in the center touch zone (see detectTouchPageTurn) opens the
|
||||||
|
// reader menu, the touch analogue of releasing the Confirm button.
|
||||||
|
constexpr unsigned long TOUCH_MENU_HOLD_MS = 400;
|
||||||
|
|
||||||
inline void applyOrientation(GfxRenderer& renderer, const uint8_t orientation) {
|
inline void applyOrientation(GfxRenderer& renderer, const uint8_t orientation) {
|
||||||
switch (orientation) {
|
switch (orientation) {
|
||||||
@@ -59,6 +63,46 @@ inline PageTurnResult detectPageTurn(const MappedInputManager& input) {
|
|||||||
return {prev, next, tiltPrev || tiltNext};
|
return {prev, next, tiltPrev || tiltNext};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Touch reader controls: left third = page back, right third = forward, center =
|
||||||
|
// open menu on press-and-hold (see isTouchMenuGesture). heldMs is the contact
|
||||||
|
// duration, for the same long-press behavior as the buttons (chapter skip).
|
||||||
|
// All-false on Xteink (no touch) or when the setting is off.
|
||||||
|
struct TouchPageTurn {
|
||||||
|
bool prev;
|
||||||
|
bool next;
|
||||||
|
bool center;
|
||||||
|
unsigned long heldMs;
|
||||||
|
};
|
||||||
|
|
||||||
|
inline TouchPageTurn detectTouchPageTurn(GfxRenderer& renderer) {
|
||||||
|
TouchPageTurn result{false, false, false, 0};
|
||||||
|
if (gpio.isXteinkDevice() || !SETTINGS.touchReaderControls) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
float nx = 0.0f, ny = 0.0f;
|
||||||
|
if (!gpio.wasTouchTap(nx, ny)) {
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
int lx = 0, ly = 0;
|
||||||
|
renderer.tapToLogical(nx, ny, lx, ly);
|
||||||
|
const int third = renderer.getScreenWidth() / 3;
|
||||||
|
if (lx < third) {
|
||||||
|
result.prev = true;
|
||||||
|
} else if (lx >= 2 * third) {
|
||||||
|
result.next = true;
|
||||||
|
} else {
|
||||||
|
result.center = true;
|
||||||
|
}
|
||||||
|
result.heldMs = gpio.lastTouchHeldMs();
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
|
// True when the center zone was pressed and held long enough to open the reader
|
||||||
|
// menu (touch analogue of a Confirm release).
|
||||||
|
inline bool isTouchMenuGesture(const TouchPageTurn& touch) {
|
||||||
|
return touch.center && touch.heldMs >= TOUCH_MENU_HOLD_MS;
|
||||||
|
}
|
||||||
|
|
||||||
inline void displayWithRefreshCycle(const GfxRenderer& renderer, int& pagesUntilFullRefresh) {
|
inline void displayWithRefreshCycle(const GfxRenderer& renderer, int& pagesUntilFullRefresh) {
|
||||||
if (pagesUntilFullRefresh <= 1) {
|
if (pagesUntilFullRefresh <= 1) {
|
||||||
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
||||||
|
|||||||
@@ -73,7 +73,12 @@ void TxtReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
// Touch page nav (left third = back, right third = forward).
|
||||||
|
const auto touch = ReaderUtils::detectTouchPageTurn(renderer);
|
||||||
|
|
||||||
|
auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
||||||
|
prevTriggered = prevTriggered || touch.prev;
|
||||||
|
nextTriggered = nextTriggered || touch.next;
|
||||||
if (!prevTriggered && !nextTriggered) {
|
if (!prevTriggered && !nextTriggered) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -54,8 +54,11 @@ void XtcReaderActivity::onExit() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
void XtcReaderActivity::loop() {
|
void XtcReaderActivity::loop() {
|
||||||
// Enter chapter selection activity
|
// Touch page nav; center hold opens chapter selection (the Confirm analogue).
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
const auto touch = ReaderUtils::detectTouchPageTurn(renderer);
|
||||||
|
|
||||||
|
// Enter chapter selection activity (Confirm release, or a center touch-and-hold).
|
||||||
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm) || ReaderUtils::isTouchMenuGesture(touch)) {
|
||||||
if (xtc && xtc->hasChapters() && !xtc->getChapters().empty()) {
|
if (xtc && xtc->hasChapters() && !xtc->getChapters().empty()) {
|
||||||
startActivityForResult(
|
startActivityForResult(
|
||||||
std::make_unique<XtcReaderChapterSelectionActivity>(renderer, mappedInput, xtc, currentPage),
|
std::make_unique<XtcReaderChapterSelectionActivity>(renderer, mappedInput, xtc, currentPage),
|
||||||
@@ -80,7 +83,9 @@ void XtcReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
auto [prevTriggered, nextTriggered, fromTilt] = ReaderUtils::detectPageTurn(mappedInput);
|
||||||
|
prevTriggered = prevTriggered || touch.prev;
|
||||||
|
nextTriggered = nextTriggered || touch.next;
|
||||||
if (!prevTriggered && !nextTriggered) {
|
if (!prevTriggered && !nextTriggered) {
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -96,8 +101,9 @@ void XtcReaderActivity::loop() {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
const bool skipPages = !fromTilt && SETTINGS.longPressButtonBehavior == SETTINGS.CHAPTER_SKIP &&
|
const unsigned long heldMs = (touch.prev || touch.next) ? touch.heldMs : mappedInput.getHeldTime();
|
||||||
mappedInput.getHeldTime() > ReaderUtils::SKIP_HOLD_MS;
|
const bool skipPages =
|
||||||
|
!fromTilt && SETTINGS.longPressButtonBehavior == SETTINGS.CHAPTER_SKIP && heldMs > ReaderUtils::SKIP_HOLD_MS;
|
||||||
const int skipAmount = skipPages ? 10 : 1;
|
const int skipAmount = skipPages ? 10 : 1;
|
||||||
|
|
||||||
if (prevTriggered) {
|
if (prevTriggered) {
|
||||||
@@ -294,19 +300,7 @@ void XtcReaderActivity::renderPage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (pagesUntilFullRefresh <= 1) {
|
ReaderUtils::displayWithRefreshCycle(renderer, pagesUntilFullRefresh);
|
||||||
// Periodic ghost cleanup: scrub via the normal path, then run the
|
|
||||||
// settle flavor of the grayscale base pass (DTM planes are equal after
|
|
||||||
// the display sync, so only the gentle reinforcement cells fire).
|
|
||||||
renderer.displayBuffer(HalDisplay::HALF_REFRESH);
|
|
||||||
renderer.preconditionGrayscale();
|
|
||||||
pagesUntilFullRefresh = SETTINGS.getRefreshFrequency();
|
|
||||||
} else {
|
|
||||||
// OEM grayscale pipeline base: differential "AA-pre-BW(mid)" update as
|
|
||||||
// the page turn on X3; plain FAST refresh on X4 (previous behavior).
|
|
||||||
renderer.displayGrayscaleBase(HalDisplay::FAST_REFRESH);
|
|
||||||
pagesUntilFullRefresh--;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Pass 2: LSB buffer - mark DARK gray only (XTH value 1)
|
// Pass 2: LSB buffer - mark DARK gray only (XTH value 1)
|
||||||
// In LUT: 0 bit = apply gray effect, 1 bit = untouched
|
// In LUT: 0 bit = apply gray effect, 1 bit = untouched
|
||||||
|
|||||||
@@ -1,11 +1,13 @@
|
|||||||
#include "XtcReaderChapterSelectionActivity.h"
|
#include "XtcReaderChapterSelectionActivity.h"
|
||||||
|
|
||||||
|
#include <FreeInkUI.h>
|
||||||
#include <GfxRenderer.h>
|
#include <GfxRenderer.h>
|
||||||
#include <I18n.h>
|
#include <I18n.h>
|
||||||
|
|
||||||
#include <algorithm>
|
#include <algorithm>
|
||||||
|
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
@@ -56,6 +58,26 @@ void XtcReaderChapterSelectionActivity::loop() {
|
|||||||
const int pageItems = getPageItems();
|
const int pageItems = getPageItems();
|
||||||
const int totalItems = static_cast<int>(xtc->getChapters().size());
|
const int totalItems = static_cast<int>(xtc->getChapters().size());
|
||||||
|
|
||||||
|
// Vertical swipe page-scrolls the list (touch nav without the side buttons).
|
||||||
|
if (mappedInput.wasListScroll(selectorIndex, totalItems, pageItems)) {
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && freeink::ui::listSelectIndex(selectorIndex, downId, totalItems)) {
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
if (mappedInput.wasItemTapped(tappedId) && tappedId >= 0 && tappedId < totalItems) {
|
||||||
|
selectorIndex = tappedId;
|
||||||
|
const auto& chapters = xtc->getChapters();
|
||||||
|
setResult(PageResult{chapters[selectorIndex].startPage});
|
||||||
|
finish();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasReleased(MappedInputManager::Button::Confirm)) {
|
||||||
const auto& chapters = xtc->getChapters();
|
const auto& chapters = xtc->getChapters();
|
||||||
if (!chapters.empty() && selectorIndex >= 0 && selectorIndex < static_cast<int>(chapters.size())) {
|
if (!chapters.empty() && selectorIndex >= 0 && selectorIndex < static_cast<int>(chapters.size())) {
|
||||||
@@ -127,7 +149,9 @@ void XtcReaderChapterSelectionActivity::render(RenderLock&&) {
|
|||||||
for (int i = pageStartIndex; i < static_cast<int>(chapters.size()) && i < pageStartIndex + pageItems; i++) {
|
for (int i = pageStartIndex; i < static_cast<int>(chapters.size()) && i < pageStartIndex + pageItems; i++) {
|
||||||
const auto& chapter = chapters[i];
|
const auto& chapter = chapters[i];
|
||||||
const char* title = chapter.name.empty() ? tr(STR_UNNAMED) : chapter.name.c_str();
|
const char* title = chapter.name.empty() ? tr(STR_UNNAMED) : chapter.name.c_str();
|
||||||
renderer.drawText(UI_10_FONT_ID, contentX + 20, 60 + contentY + (i % pageItems) * 30, title, i != selectorIndex);
|
const int itemY = 60 + contentY + (i % pageItems) * 30;
|
||||||
|
renderer.drawText(UI_10_FONT_ID, contentX + 20, itemY, title, i != selectorIndex);
|
||||||
|
TouchRegistry::getInstance().add(Rect{contentX, itemY - 2, contentWidth, 30}, i, TouchRegistry::Item);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Skip button hints in landscape CW mode (they overlap content)
|
// Skip button hints in landscape CW mode (they overlap content)
|
||||||
|
|||||||
@@ -122,6 +122,27 @@ void ClearCacheActivity::clearCache() {
|
|||||||
|
|
||||||
void ClearCacheActivity::loop() {
|
void ClearCacheActivity::loop() {
|
||||||
if (state == WARNING) {
|
if (state == WARNING) {
|
||||||
|
int tapX = 0;
|
||||||
|
int tapY = 0;
|
||||||
|
if (mappedInput.wasScreenTapped(tapX, tapY)) {
|
||||||
|
const int actionTop = renderer.getScreenHeight() - UITheme::getInstance().getMetrics().buttonHintsHeight - 12;
|
||||||
|
if (tapY >= actionTop) {
|
||||||
|
if (tapX < renderer.getScreenWidth() / 2) {
|
||||||
|
LOG_DBG("CLEAR_CACHE", "User cancelled via touch");
|
||||||
|
goBack();
|
||||||
|
} else {
|
||||||
|
LOG_DBG("CLEAR_CACHE", "User confirmed via touch, starting cache clear");
|
||||||
|
{
|
||||||
|
RenderLock lock(*this);
|
||||||
|
state = CLEARING;
|
||||||
|
}
|
||||||
|
requestUpdateAndWait();
|
||||||
|
clearCache();
|
||||||
|
}
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
||||||
LOG_DBG("CLEAR_CACHE", "User confirmed, starting cache clear");
|
LOG_DBG("CLEAR_CACHE", "User confirmed, starting cache clear");
|
||||||
{
|
{
|
||||||
@@ -141,7 +162,9 @@ void ClearCacheActivity::loop() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (state == SUCCESS || state == FAILED) {
|
if (state == SUCCESS || state == FAILED) {
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
int tapX = 0;
|
||||||
|
int tapY = 0;
|
||||||
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back) || mappedInput.wasScreenTapped(tapX, tapY)) {
|
||||||
goBack();
|
goBack();
|
||||||
}
|
}
|
||||||
return;
|
return;
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
|
|
||||||
#include "CrossPointSettings.h"
|
#include "CrossPointSettings.h"
|
||||||
#include "MappedInputManager.h"
|
#include "MappedInputManager.h"
|
||||||
|
#include "components/TouchRegistry.h"
|
||||||
#include "components/UITheme.h"
|
#include "components/UITheme.h"
|
||||||
#include "fontIds.h"
|
#include "fontIds.h"
|
||||||
|
|
||||||
@@ -108,14 +109,57 @@ void ClockOffsetActivity::adjustActiveField(int delta) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void ClockOffsetActivity::selectRelativeField(const int delta) {
|
||||||
|
activeField = static_cast<Field>((activeField + delta + FIELD_COUNT) % FIELD_COUNT);
|
||||||
|
}
|
||||||
|
|
||||||
void ClockOffsetActivity::loop() {
|
void ClockOffsetActivity::loop() {
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
if (mappedInput.wasPressed(MappedInputManager::Button::Back)) {
|
||||||
finish();
|
finish();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
switch (mappedInput.wasSwipe()) {
|
||||||
|
case MappedInputManager::SwipeDir::Up:
|
||||||
|
adjustActiveField(+1);
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Down:
|
||||||
|
adjustActiveField(-1);
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Left:
|
||||||
|
selectRelativeField(+1);
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::Right:
|
||||||
|
selectRelativeField(-1);
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
case MappedInputManager::SwipeDir::None:
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
int downId = -1;
|
||||||
|
if (mappedInput.wasItemTouchedDown(downId) && downId >= 0 && downId < FIELD_COUNT) {
|
||||||
|
activeField = static_cast<Field>(downId);
|
||||||
|
requestUpdate();
|
||||||
|
}
|
||||||
|
|
||||||
|
int tappedId = -1;
|
||||||
|
if (mappedInput.wasItemTapped(tappedId) && tappedId >= 0 && tappedId < FIELD_COUNT) {
|
||||||
|
const Field tappedField = static_cast<Field>(tappedId);
|
||||||
|
if (activeField == tappedField) {
|
||||||
|
adjustActiveField(+1);
|
||||||
|
} else {
|
||||||
|
activeField = tappedField;
|
||||||
|
}
|
||||||
|
requestUpdate();
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
if (mappedInput.wasPressed(MappedInputManager::Button::Confirm)) {
|
||||||
activeField = static_cast<Field>((activeField + 1) % FIELD_COUNT);
|
selectRelativeField(+1);
|
||||||
requestUpdate();
|
requestUpdate();
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
@@ -183,6 +227,8 @@ void ClockOffsetActivity::render(RenderLock&&) {
|
|||||||
}
|
}
|
||||||
const int textX = boxX + (boxWidth - widthOf(text)) / 2;
|
const int textX = boxX + (boxWidth - widthOf(text)) / 2;
|
||||||
renderer.drawText(UI_12_FONT_ID, textX, centreY, text, true, EpdFontFamily::BOLD);
|
renderer.drawText(UI_12_FONT_ID, textX, centreY, text, true, EpdFontFamily::BOLD);
|
||||||
|
TouchRegistry::getInstance().add(Rect{boxX - 4, centreY - 8, boxWidth + 8, fieldHeight + 16},
|
||||||
|
static_cast<int>(field), TouchRegistry::Item);
|
||||||
};
|
};
|
||||||
|
|
||||||
drawField(signStr, x, signBoxW, FIELD_SIGN);
|
drawField(signStr, x, signBoxW, FIELD_SIGN);
|
||||||
|
|||||||
@@ -34,4 +34,5 @@ class ClockOffsetActivity final : public Activity {
|
|||||||
void saveToSettings() const;
|
void saveToSettings() const;
|
||||||
void adjustActiveField(int delta);
|
void adjustActiveField(int delta);
|
||||||
void clampForSign();
|
void clampForSign();
|
||||||
|
void selectRelativeField(int delta);
|
||||||
};
|
};
|
||||||
Loaded 100 of 151 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user