diff options
| author | sommersoft <sommersoft@gmail.com> | 2020-04-09 09:10:55 -0500 |
|---|---|---|
| committer | sommersoft <sommersoft@gmail.com> | 2020-04-09 09:10:55 -0500 |
| commit | b5d98da6fc6fb8daf0f9221af99fbf79b5499593 (patch) | |
| tree | 92bb125757fe3bb297be92c550adb508bf9cc7d6 | |
| parent | ae07ced795e51653ce6d69e5a2d30688ca420dd4 (diff) | |
| parent | b3b8b5ca71dc58415083180d04b407185514c216 (diff) | |
Merge branch 'master' of https://github.com/adafruit/circuitpython into sphinx3_fix
| -rw-r--r-- | .github/workflows/build.yml | 2 | ||||
| -rw-r--r-- | shared-module/displayio/Display.c | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index b56fb35b8..455f83a21 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -24,7 +24,7 @@ jobs: run: | sudo apt-get install -y eatmydata sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 - pip install requests sh click setuptools cpp-coveralls Sphinx sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml + pip install requests sh click setuptools cpp-coveralls "Sphinx<3" sphinx-rtd-theme recommonmark sphinxcontrib-svg2pdfconverter polib pyyaml - name: Versions run: | gcc --version diff --git a/shared-module/displayio/Display.c b/shared-module/displayio/Display.c index 820fbcce6..2edded927 100644 --- a/shared-module/displayio/Display.c +++ b/shared-module/displayio/Display.c @@ -69,6 +69,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self, self->auto_brightness = auto_brightness; self->first_manual_refresh = !auto_refresh; self->data_as_commands = data_as_commands; + self->backlight_on_high = backlight_on_high; self->native_frames_per_second = native_frames_per_second; self->native_ms_per_frame = 1000 / native_frames_per_second; |