Uh oh!
There was an error while loading.Please reload this page.
- Notifications
You must be signed in to change notification settings - Fork8.2k
Calc ESP32 TIMER_SCALE scale by GPTIMER_CLK_SRC_DEFAULT#17316
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.
Already on GitHub?Sign in to your account
Draft
BSoD123456 wants to merge764 commits intomicropython:masterChoose a base branch fromBSoD123456:mydev-esp32c6-lcd
base:master
Could not load branches
Branch not found:{{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
Uh oh!
There was an error while loading.Please reload this page.
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.Learn more about bidirectional Unicode characters
This would update lv_bindings when running 'make submodules'
export XDG_RUNTIME_DIR to remove SDL warning
export XDG_RUNTIME_DIR to remove SDL warning
Updated lv_bindings with espidf.h bugfixDisabled ESP32-S2 because it is currently not supported by espidh.hand by native modules that rely on espidf.h such as modrtch.c
.github/workflows/ports_esp32.yml added backUpdated lv_bindings with espidf.h bugfixDisabled ESP32-S2 because it is currently not supported by espidh.hand by native modules that rely on espidf.h such as modrtch.c
Added ESP32 workflow badge
Remove obsolete lvesp32
Condition lv_bindings/mkrules.cmake include by CMAKE_BUILD_EARLY_EXPANSIONRelated:https://forum.lvgl.io/t/build-error-on-latest-lv-micropython-add-executable-command-is-not-scriptable-fix-workaround-provided-not-sure-how-to-suggest-long-term-fix-or-something-else/6243
LVGL should be initialized before display driver
Added .gitpod, Dockerfile and badge to README
The `num_stas` was uninitialised and if it happened to take the value 0then no results were returned. It now has the correct maximum value.Signed-off-by: Damien George <damien@micropython.org>
Configuring the AP for cyw43 writes to some buffers that are only sent tothe modem when the interface is brought up. This means you can't configurethe AP after calling active(True), the new settings seem to be accepted butthe radio doesn't change.This is different to the WLAN behaviour on other ports. The esp8266 portrequires calling active(True) on the AP before configuring, even.Fix this by bouncing the AP interface after a config change, if it'sactive. Configuring with active(False) still works the same as before.Adds a static variable to track interface active state, rather than relyingon the LWIP interface state. This is because the interface state is updatedby a driver callback and there's a race: if code calls active(True) andthen config(a=b) then the driver doesn't know it's active yet and thechanges aren't correctly applied.It is possible this pattern will cause the AP to come up briefly with thedefault "PICOabcd" SSID before being reconfigured, however (due to theaforementioned race condition) it seems like this may not happen at allbefore the new config is applied.This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>
- Previously the call to esp_wifi_set_channel() would be immediately overridden by calling esp_wifi_config(...) with the previous channel set.- AP interface doesn't seem to need more than esp_wifi_config(...) to work. It will automatically configure 40MHz bandwidth and place the secondary channel using similar logic to what was being explicitly calculated here.- However, calling esp_wifi_set_channel() on the STA interface is necessary if using this interface with ESP-NOW (without connecting to an AP). So the esp_wifi_set_channel() call is kept in for this purpose. Without this, tests/multi_espnow/70_channel.py fails.This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>
ESP32 has hardware V1 and S2/S3 has V2, and future chipsmay have different versions.This should still compile to the same binary before and after.This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>
Closesmicropython#13178.TouchPad confirmed working on both chips, and fixes the the ESP32-S3reading constant max value. Was unable to reproduce the bug on ESP32-S2 butthis may be due to my test setup, and it still works with the fix.This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>
This fixes a bug in FrameBuffer.ellipse where it goes into an infinite loopif both radii are 0.This fixes the bug with a simple pre-check to see if both radii are 0, andin that case sets a single pixel at the center. This is consistent with thebehaviour of the method when called with just one of the radii set to 0,where it will draw a horizontal or vertical line of 1 pixel width.The pixel is set with setpixel_checked so it should handle out-of-boundsdrawing correctly.This fix also includes three new tests: one for the default behaviour, onefor drawing out-of-bounds, and one for when the sector mask is 0.Fixes issuemicropython#16053.Signed-off-by: Corran Webster <cwebster@unital.dev>
The micro:bit board (and probably other boards using the music or displaymodule) locked up on soft reboot. Reason was a buffer overflow caused byan index counter, which was not reset on soft_reboot.That's fixed in this commit. Tested with a micro:bit board, performing aseries of soft reboots.Signed-off-by: robert-hh <robert@hammelrath.com>
Recent MSVC versions have changed the definition of NAN to a non-constantexpression! This is a bug, C standard says it should be a constant.Good explanation and workaround at:https://stackoverflow.com/a/79199887This work was funded through GitHub Sponsors.Signed-off-by: Angus Gratton <angus@redyak.com.au>
Signed-off-by: Damien George <damien@micropython.org>
added to step 8 `mpy-cross/Makefile` to remove `-Werror` updated step 12 to find the micropython script in the `build-standard` directory
Updated README.md - update Unix (Mac OS) port instructions
…o update/micropython_v1.24.1-usermodPatch release for mpremote, rp2 IGMP, esp32 PWM, SDCard, and AP channelThis is a patch release containing the following commits:- tools/mpremote: fix UnboundLocalError in Transport.fs_writefile()- esp32/machine_pwm: use IDF functions to calculate resolution correctly- pic16bit: make it build with recent XC16 versions- py/objdeque: fix buffer overflow in deque_subscr- extmod/modlwip: fix IGMP address type when IPv6 is enabled- esp32/machine_pwm: restore PWM support for ESP-IDF v5.0.x and v5.1.x- esp32: workaround native code execution crash on ESP32-S2- tools/mpremote: make sure stdout and stderr output appear in order- tools/mpremote: add test for forced copy- tools/mpremote: support trailing slash on dest for non-recursive copy- esp32/modsocket: fix getaddrinfo hints to set AI_CANONNAME- extmod/vfs_blockdev: support bool return from Python read/write blocks- extmod/network_cyw43: fix isconnected() result on AP interface- extmod/network_cyw43: fix uninitialised variable in status('stations')- extmod/network_cyw43: allow configuring active AP interface- esp32: fix setting WLAN channel in AP mode- esp32: use hardware version for touchpad macro defines- esp32: fix machine.TouchPad startup on ESP32-S2 and S3- extmod/modframebuf: fix 0 radius bug in FrameBuffer.ellipse- nrf/drivers/ticker: reset slow ticker callback count on soft reboot- py/objfloat: workaround non-constant NAN definition on Windows MSVC# Conflicts:#.github/workflows/code_formatting.yml#.github/workflows/code_size.yml#.github/workflows/commit_formatting.yml#.github/workflows/docs.yml#.github/workflows/examples.yml#.github/workflows/mpremote.yml#.github/workflows/mpy_format.yml#.github/workflows/ports.yml#.github/workflows/ports_cc3200.yml#.github/workflows/ports_esp32.yml#.github/workflows/ports_esp8266.yml#.github/workflows/ports_mimxrt.yml#.github/workflows/ports_nrf.yml#.github/workflows/ports_powerpc.yml#.github/workflows/ports_renesas-ra.yml#.github/workflows/ports_rp2.yml#.github/workflows/ports_samd.yml#.github/workflows/ports_stm32.yml#.github/workflows/ports_unix.yml#.github/workflows/ports_webassembly.yml#.github/workflows/ports_windows.yml#.github/workflows/ports_zephyr.yml#README.md#extmod/extmod.mk#ports/esp32/.gitignore#ports/esp32/CMakeLists.txt#ports/esp32/boards/ESP32_GENERIC/mpconfigboard.cmake#ports/esp32/boards/sdkconfig.base#ports/esp32/main.c#ports/esp32/main/CMakeLists.txt#ports/stm32/Makefile#ports/stm32/boards/STM32F7DISC/mpconfigboard.mk#ports/stm32/boards/manifest.py#ports/stm32/boards/stm32f7xx_hal_conf_base.h#ports/unix/Makefile#ports/unix/variants/manifest.py#ports/unix/variants/mpconfigvariant_common.h#ports/windows/mpconfigport.h#py/makeqstrdata.py#py/qstr.c#py/qstr.h#tools/ci.sh#tools/makemanifest.py#tools/mpy-tool.py
…nd M5Core2 board; remove ESP32 specific LVGL modules (soft links)
…repo; add a few build and deploy scripts; update lv_binding
… ESP32 SPIRAM variant
Update to MicroPython v1.24.1 and use LVGL as MicroPython user module
- drivers/generic/st77xx: Support use on platforms without machine.PWM
* Update readme files and fix ESP-IDF path in scripts folder* Update LVGL readme file
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Firstly, I apologize for not knowing how to PR only a portion of the files. So please forgive the confusion of this PR.
Please only focus on the last 2 commits of "ports/esp32/machine_timer.h" and "ports/esp32/machine_timer.c".
Summary
In esp-edf v5.2, for esp32-c6, the default clock source used by timers is not XTAL_CLK or APB_CLK (they're all 40mhz in c6), but F80M_CLK (it's 80mhz). Therefore, using APB_CLK_FREQ to calculate TIMER_SCALE will cause the timer to run at double speed.
Testing
I ran the pre and post modification version on my ESP32C6 dev board, and confirmed that the pre modification timer was at double speed, while the post modification timer at normal speed.