Skip to content

Commit 4d2d04b

Browse files
authored
Merge pull request #5488 from tonhuisman/feature/Feb-2026-improvements-and-fixes
[Fixes] Various fixes and improvements Feb 2026
2 parents 2d4ac41 + a3f4617 commit 4d2d04b

15 files changed

+468
-103
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ name: Build
55
on:
66
push:
77
branches: [mega]
8-
tags-ignore: '**'
8+
tags-ignore: ['**']
99
paths-ignore:
1010
- 'dist/Release_notes.txt'
1111
- 'docs/**'

.github/workflows/release.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ name: Release
99

1010
on:
1111
push:
12-
branches-ignore: '**'
13-
tags: 'mega-*'
12+
branches-ignore: ['**']
13+
tags: ['mega-*']
1414

1515
permissions:
1616
contents: read
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
.. include:: ../Plugin/_plugin_substitutions_p10x.repl
2+
.. _P104-Font-Cyrillic-ext_page:
3+
4+
|P104-Font-Cyrillic-ext_typename|
5+
======================================================
6+
7+
A set of Cyrillic characters, as an extension to the regular ASCII characters, numerics and punctuation.
8+
9+
.. image:: P104_Font_Cyrillic-ext.png

docs/source/Plugin/P104.rst

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,9 @@ Available options:
227227
.. image:: P104_ZoneFontOptions.png
228228
:alt: Zone font options
229229

230-
All available fonts have been taken from the example code of the used Parola library.
230+
Most available fonts have been taken from the example code of the used Parola library, and the Cyrillic font from a post in the arduino.ru forum.
231231

232-
The Arabic, Greek and Katakana fonts have all their characters in the 'high-ascii' range (> 128 ascii values), so they can (and should) **not** be used to 'translate' normal text to Arabic, Greek or Katakana.
232+
The Arabic, Greek, Katakana and Cyrillic fonts have all their characters in the 'high-ascii' range (> 128 ascii values), so they can (and should) **not** be used to 'translate' normal text to Arabic, Greek or Katakana.
233233

234234
On 'bin-size-challenged' builds the *Full, double height* font is replaced by the *Numeric, double height* font, to limit the bin-size a bit more. This font can display only numeric (actually hexadecimal, 0..9 and A..F) and date/time content.
235235

@@ -244,6 +244,7 @@ Font overview:
244244
* :ref:`P104-Font-Arabic_page`
245245
* :ref:`P104-Font-Greek_page`
246246
* :ref:`P104-Font-Katakana_page`
247+
* :ref:`P104-Font-Cyrillic-ext_page`
247248

248249
.. spacer
249250
76.1 KB
Loading
-95 Bytes
Loading

docs/source/Plugin/_plugin_substitutions_p10x.repl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
.. |P104-Font-Arabic_typename| replace:: `Arabic font characters`
7474
.. |P104-Font-Greek_typename| replace:: `Greek font characters`
7575
.. |P104-Font-Katakana_typename| replace:: `Katakana font characters`
76+
.. |P104-Font-Cyrillic-ext_typename| replace:: `Cyrillic ext. font characters`
7677

7778

7879
.. |P105_name| replace:: :cyan:`AHT1x/AHT2x/DHT20/AM2301B`

docs/source/Plugin/_plugin_substitutions_p16x.repl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@
6767
.. |P167_type| replace:: :cyan:`Environment`
6868
.. |P167_typename| replace:: :cyan:`Environment - Sensirion SEN5x (IKEA Vindstyrka)`
6969
.. |P167_porttype| replace:: `.`
70-
.. |P167_status| replace:: :yellow:`CLIMATE B`
70+
.. |P167_status| replace:: :yellow:`CLIMATE A`
7171
.. |P167_github| replace:: P167_Vindstyrka.ino
7272
.. _P167_github: https://github.com/letscontrolit/ESPEasy/blob/mega/src/_P167_Vindstyrka.ino
7373
.. |P167_usedby| replace:: `.`

docs/source/conf.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# import os
1616
# import sys
1717
# sys.path.insert(0, os.path.abspath('.'))
18-
from recommonmark.parser import CommonMarkParser
18+
# from recommonmark.parser import CommonMarkParser
1919
import sphinx_bootstrap_theme
2020

2121
# -- Project information -----------------------------------------------------
@@ -52,15 +52,15 @@
5252
# Add any paths that contain templates here, relative to this directory.
5353
templates_path = ['_templates']
5454

55-
source_parsers = {
56-
'.md': CommonMarkParser,
57-
}
55+
# source_parsers = {
56+
# '.md': CommonMarkParser,
57+
# }
5858

5959
# The suffix(es) of source filenames.
6060
# You can specify multiple suffix as a list of string:
6161
#
62-
source_suffix = ['.rst', '.md']
63-
#source_suffix = '.rst'
62+
# source_suffix = ['.rst', '.md']
63+
source_suffix = {'.rst': 'restructuredtext'}
6464

6565
# The master toctree document.
6666
master_doc = 'index'

docs/source/index.rst

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ Welcome to ESP Easy's documentation!
5656
Controller/C*
5757
Notify/N*
5858
Plugin/P*
59+
Network/NW*
5960
Rules/HTTPResponseParser.rst
6061

6162

0 commit comments

Comments
 (0)