Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
F
firmware
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
External wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
fleur
firmware
Commits
03825955
Commit
03825955
authored
5 years ago
by
rahix
Browse files
Options
Downloads
Plain Diff
Merge 'transparent bg font rendering'
See merge request
card10/firmware!299
parents
f7cb6d82
4124ecf2
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
epicardium/epicardium.h
+1
-1
1 addition, 1 deletion
epicardium/epicardium.h
pycardium/modules/py/display.py
+2
-2
2 additions, 2 deletions
pycardium/modules/py/display.py
with
3 additions
and
3 deletions
epicardium/epicardium.h
+
1
−
1
View file @
03825955
...
...
@@ -1347,7 +1347,7 @@ enum disp_font_name {
* :param posy: y position to print to. 0 <= y <= 80
* :param pString: string to print
* :param fg: foreground color in rgb565
* :param bg: background color in rgb565
* :param bg: background color in rgb565
, no background is drawn if bg==fg
* :return: ``0`` on success or a negative value in case of an error:
*
* - ``-EBUSY``: Display was already locked from another task.
...
...
This diff is collapsed.
Click to expand it.
pycardium/modules/py/display.py
+
2
−
2
View file @
03825955
...
...
@@ -74,7 +74,7 @@ class Display:
:param text: Text to print
:param fg: Foreground color (expects RGB triple)
:param bg: Background color (expects RGB triple)
:param bg: Background color (expects RGB triple)
or None for transparent background
:param posx: X-Position of the first character, 0 <= posx <= 159
:param posy: Y-Position of the first character, 0 <= posy <= 79
:param font: 0 <= font <= 4 (currently) selects a font
...
...
@@ -97,7 +97,7 @@ class Display:
d.update()
"""
fg
=
fg
or
color
.
WHITE
bg
=
bg
or
color
.
BLACK
bg
=
bg
or
fg
sys_display
.
print_adv
(
text
,
posx
,
posy
,
fg
,
bg
,
font
)
return
self
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment