Add support for large font. #226

francoisgeorgy · 2023-02-15T13:06:42Z

Here is my proposal for a firmware upgrade to support large fonts.

I put the code in the experimental folder because I'm still very new in this project and my code probably needs some work before being merged in the firmware.

I included four fonts that, imho, display nicely in he EuroPi OLED. Of course, other truetype fonts can be imported with the script mentioned in the largefont_writer.py module.

To use a large font, simply add the font= argument to either Display.text() or Display.centre_text() methods. Example :

import freesans17
oled.centre_text('Hi folks', font=freesans17)

Regarding the centre_text() method, I paid attention not to introduce any regression. I tested the updated method and the current one with the 8x8 monospaced font to be sure there was no differences. There is only one change: the current code allows a text of four lines to be displayed, the first line will be clipped. The new version only allows three lines, like the specifications says. This change comes from using an integer division // instead of round() when computing the number of lines.

I included the contrib/largefont_demo.py script that allows to quickly check if the large font support is working or not. It displays a text using the regular 8x8 font and the four new FreeSans large fonts. The display loops between these five fonts. The screen border is also alternatively displayed in order to get a better overview of how the fonts are aligned.

- introduce ConfigPoints and ConfigPointsBuilder classes - make configurable the value that the TM write switch writes - add config point for pico board type

fall back to defaults properly

add int config point add tests for different config point failures make the TM pulses bits configurable move europi_config.py to the firmware diagnostic temp units are configurable also black format diagnostic

- removed builder - simplified EuroPiScript.config_point() - introduced ConfigPoint class - rename config_points.py -> configuration.py - move configPoint helpers out of ConfigSpec class - move europi config to its own var, this removes the need care about conflicts and namespacing - only load config points that exist in the spec - take a range object for IntegerConfigPoint instead of recreating its api - europi_script validates config when loading it - move generic file utils out of europi_script - moved config file methods out of EuroPiScript

add config point for cpu freq

add make target to copy config files

configuration system

* Initial commit of a sequential switch implementation * Put the screensaver timeout back in; it got accidentally deleted * Add the logic script * Copypasta * Remove the sequential switch script * Replace comment blocks with docstrings, small code refactoring * Change the order of Ain and Din to match the orientation on the panel instead of being alphabetical --------- Co-authored-by: Chris I-B <c.iverachbrereton@gmail.com>

redoxcode · 2023-02-20T08:18:10Z

software/firmware/europi.py

+            self.writers[n] = Writer(self, font)
+        return self.writers[n]
+
+    def text(self, s, x, y, c=None, font=None):


Why is here a c parameter again? It's not used later in the function?
-edit:
super().text() does accept a c (color) parameter: FrameBuffer.text(s, x, y[, c])

The c parameter is there to keep the method signature similar to the one in the FrameBuffer class. I left this c parameter in case someone uses code that expect the FrameBuffer.text(...) method signature.

redoxcode

I think this should be implemented in a way that still enables the color parameter to work.
Please see my suggestions.

software/firmware/europi.py

software/firmware/experimental/largefont_writer.py

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

…seful when using a custom font which may not be monospaced. The import for largefont_writer is changed too, the largefont_writer module must be placed in lib/.

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

…seful when using a custom font which may not be monospaced. The import for largefont_writer is changed too, the largefont_writer module must be placed in lib/.

…ont_support # Conflicts: # software/firmware/europi.py

redoxcode · 2023-02-23T12:25:29Z

software/firmware/europi.py

-freq(OVERCLOCKED_CPU_FREQ)
-
-# Reset the module state upon import.
-reset_state()


Some how github shows the whole file as changed in the div?
Maybe because of changed line ending as described here?
Maybe we should fix this as it might mess up things for other users merging this PR into their forks and people doing the next PR?

I rebased my PR to get the last updates from the main branch.
The line ending problem is unfortunately a common one. Maybe it's on my side because I'm using both a Mac and Linux box and, since I just replaced my Mac with a new Mac Mini, I forgot to check my git config on this new machine.

We could delete this PR and I could re-create a new one. Maybe it's the simplest solution.

Hmm.. Maybe I can try to make a suggestion that fixes this...

software/firmware/europi.py

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

francoisgeorgy · 2023-02-23T15:10:58Z

Looks good now. Thank you for your help!

redoxcode · 2023-02-23T15:14:20Z

Glad that worked. LGTM now

mjaskula

Hello @francoisgeorgy thanks for the PR. The addition of some new fonts has been asked for before and would go a long way towards making the EuroPi UI more flexible.

One problem I'm having, however, is that the PR contains a bunch of unrelated commits that are making it difficult to identify your actual changes. Most of these seem related to the config changes, but there are others as well.

It would be helpful to have these extra commits removed before doing an in depth review of your changes. If you need help with the git actions to make this happen, please feel free to reach out.

francoisgeorgy · 2023-02-28T20:55:30Z

Hi @mjaskula . You re right, this PR has become a mess. I created it just before the big changes related to the new configuration feature. And, on top of that, we had a linebreak issue.
I'll try to rebase it. Or maybe it's simpler to trash it a simply create a new PR? Do you have a preference?

mjaskula · 2023-02-28T21:15:00Z

Hi @mjaskula . You re right, this PR has become a mess. I created it just before the big changes related to the new configuration feature. And, on top of that, we had a linebreak issue. I'll try to rebase it. Or maybe it's simpler to trash it a simply create a new PR? Do you have a preference?

Whichever is easier for you is fine.

francoisgeorgy · 2023-03-01T09:01:32Z

Hi,
I tried to rebase my PR and cherry-pick only the commits related to the large_font changes, but this created event more commits. I probably made a mistake somewhere.

I think creating a new PR is the simplest solution, but I fear we my lose all the history of the current PR.

If you know how to clean the current PR I'd would be more than happy to follow your instructions. Otherwise I propose that we close the current PR and I open a new one.

mjaskula · 2023-03-01T20:49:37Z

Hi, I tried to rebase my PR and cherry-pick only the commits related to the large_font changes, but this created event more commits. I probably made a mistake somewhere.

I think creating a new PR is the simplest solution, but I fear we my lose all the history of the current PR.

If you know how to clean the current PR I'd would be more than happy to follow your instructions. Otherwise I propose that we close the current PR and I open a new one.

I tried looking into it and repairing it on my local checkout, but I do not understand when GH is showing those commits. I think that we might as well cut our losses and open a new PR. You can put links between the new and old PRs such that the history is not lost. It will be more inconvenient, but not lost.

francoisgeorgy · 2023-03-02T21:11:41Z

This PR is replaced by #234.

francoisgeorgy and others added 14 commits February 15, 2023 13:45

Add support for large font.

8aaf6f0

Source reformatted with black.

58b0110

add config save and load methods to EuroPiScript

d001469

- introduce ConfigPoints and ConfigPointsBuilder classes - make configurable the value that the TM write switch writes - add config point for pico board type

add ability to save values to config file

a604120

fall back to defaults properly

config improvements and clean up

d59a3c5

add int config point add tests for different config point failures make the TM pulses bits configurable move europi_config.py to the firmware diagnostic temp units are configurable also black format diagnostic

make europi config points available to all scripts

e880966

use configuration in europi.py

1027c45

add config point for cpu freq

add script to generate default config files

0b2095d

add make target to copy config files

add execution instructions to generate_default_configs.py

40616cd

use namedtuple for validation

c254eb1

don't use config lookup outside of __init__

f8ddba5

Merge pull request Allen-Synthesis#220 from mjaskula/mjj/config_script

758144c

configuration system

redoxcode reviewed Feb 20, 2023

View reviewed changes

redoxcode suggested changes Feb 21, 2023

View reviewed changes

software/firmware/europi.py Outdated Show resolved Hide resolved

software/firmware/experimental/largefont_writer.py Outdated Show resolved Hide resolved

francoisgeorgy and others added 9 commits February 21, 2023 21:53

Update software/firmware/experimental/largefont_writer.py

0381ff9

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

Update software/firmware/europi.py

ea2c56f

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

New method text_len to get the pixel length of a string. Especially u…

3581395

…seful when using a custom font which may not be monospaced. The import for largefont_writer is changed too, the largefont_writer module must be placed in lib/.

Add support for large font.

ef3cf87

Source reformatted with black.

e1a53d4

Update software/firmware/experimental/largefont_writer.py

6c0b545

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

Update software/firmware/europi.py

f8d4d78

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

New method text_len to get the pixel length of a string. Especially u…

1dd5512

…seful when using a custom font which may not be monospaced. The import for largefont_writer is changed too, the largefont_writer module must be placed in lib/.

Merge remote-tracking branch 'origin/large_font_support' into large_f…

27b4c36

…ont_support # Conflicts: # software/firmware/europi.py

redoxcode reviewed Feb 23, 2023

View reviewed changes

software/firmware/europi.py Outdated Show resolved Hide resolved

Update software/firmware/europi.py

b849256

Co-authored-by: redoxcode <117983047+redoxcode@users.noreply.github.com>

mjaskula requested changes Feb 28, 2023

View reviewed changes

francoisgeorgy mentioned this pull request Mar 2, 2023

Basic support for large fonts #234

Closed

francoisgeorgy closed this Mar 2, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Add support for large font. #226

Add support for large font. #226

francoisgeorgy commented Feb 15, 2023

redoxcode Feb 20, 2023

francoisgeorgy Feb 20, 2023

redoxcode left a comment

redoxcode Feb 23, 2023 •

edited

francoisgeorgy Feb 23, 2023

redoxcode Feb 23, 2023

francoisgeorgy commented Feb 23, 2023

redoxcode commented Feb 23, 2023

mjaskula left a comment

francoisgeorgy commented Feb 28, 2023

mjaskula commented Feb 28, 2023

francoisgeorgy commented Mar 1, 2023

mjaskula commented Mar 1, 2023

francoisgeorgy commented Mar 2, 2023

Add support for large font. #226

Add support for large font. #226

Conversation

francoisgeorgy commented Feb 15, 2023

redoxcode Feb 20, 2023

Choose a reason for hiding this comment

francoisgeorgy Feb 20, 2023

Choose a reason for hiding this comment

redoxcode left a comment

Choose a reason for hiding this comment

redoxcode Feb 23, 2023 • edited

Choose a reason for hiding this comment

francoisgeorgy Feb 23, 2023

Choose a reason for hiding this comment

redoxcode Feb 23, 2023

Choose a reason for hiding this comment

francoisgeorgy commented Feb 23, 2023

redoxcode commented Feb 23, 2023

mjaskula left a comment

Choose a reason for hiding this comment

francoisgeorgy commented Feb 28, 2023

mjaskula commented Feb 28, 2023

francoisgeorgy commented Mar 1, 2023

mjaskula commented Mar 1, 2023

francoisgeorgy commented Mar 2, 2023

redoxcode Feb 23, 2023 •

edited