Skip to content

Commit b5d98da

Browse files
committed
Merge branch 'master' of https://github.com/adafruit/circuitpython into sphinx3_fix
2 parents ae07ced + b3b8b5c commit b5d98da

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

.github/workflows/build.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ jobs:
2424
run: |
2525
sudo apt-get install -y eatmydata
2626
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64
27-
pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
27+
pip install requests sh click setuptools cpp-coveralls "Sphinx<3" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml
2828
- name: Versions
2929
run: |
3030
gcc --version

shared-module/displayio/Display.c

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
6969
self->auto_brightness = auto_brightness;
7070
self->first_manual_refresh = !auto_refresh;
7171
self->data_as_commands = data_as_commands;
72+
self->backlight_on_high = backlight_on_high;
7273

7374
self->native_frames_per_second = native_frames_per_second;
7475
self->native_ms_per_frame = 1000 / native_frames_per_second;

0 commit comments

Comments
 (0)