djsundog/circuitpython
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/adafruit/circuitpython into sphinx3_fix

Browse Source
This commit is contained in:
sommersoft 2020-04-09 09:10:55 -05:00
commit b5d98da6fc
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/build.yml vendored
View File

@ -24,7 +24,7 @@ jobs:
run: | run: |
sudo apt-get install -y eatmydata sudo apt-get install -y eatmydata
sudo eatmydata apt-get install -y gettext librsvg2-bin mingw-w64 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 - name: Versions
run: | run: |
gcc --version gcc --version

1
shared-module/displayio/Display.c
View File

@ -69,6 +69,7 @@ void common_hal_displayio_display_construct(displayio_display_obj_t* self,
self->auto_brightness = auto_brightness; self->auto_brightness = auto_brightness;
self->first_manual_refresh = !auto_refresh; self->first_manual_refresh = !auto_refresh;
self->data_as_commands = data_as_commands; 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_frames_per_second = native_frames_per_second;
self->native_ms_per_frame = 1000 / native_frames_per_second; self->native_ms_per_frame = 1000 / native_frames_per_second;