Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-05-06 22:48:27 +02:00
commit 3e879fa279
2 changed files with 2 additions and 2 deletions

View File

@ -505,7 +505,7 @@ jobs:
id: idf-cache id: idf-cache
with: with:
path: ${{ github.workspace }}/.idf_tools path: ${{ github.workspace }}/.idf_tools
key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210422 key: ${{ runner.os }}-idf-tools-${{ hashFiles('.git/modules/ports/esp32s2/esp-idf/HEAD') }}-20210506
- name: Clone IDF submodules - name: Clone IDF submodules
run: | run: |
(cd $IDF_PATH && git submodule update --init) (cd $IDF_PATH && git submodule update --init)

View File

@ -42,7 +42,7 @@
//| The ``clock``, ``data`` and ``latch`` parameters are ``DigitalInOut`` //| The ``clock``, ``data`` and ``latch`` parameters are ``DigitalInOut``
//| objects connected to the shift register controlling the buttons. //| objects connected to the shift register controlling the buttons.
//| //|
//| They button presses are accumulated, until the ``get_pressed`` method //| The button presses are accumulated, until the ``get_pressed`` method
//| is called, at which point the button state is cleared, and the new //| is called, at which point the button state is cleared, and the new
//| button presses start to be recorded. //| button presses start to be recorded.
//| //|