Michael (XIAO Xufeng)
546be98e0f
Merge branch 'ci/add_flash_performance_info' into 'master'
...
ci: Add more information for flash performance test
Closes IDF-2739
See merge request espressif/esp-idf!12912
2021-04-26 06:22:12 +00:00
Jiang Jiang Jian
1312815be2
Merge branch 'bugfix/fix_c3_ble_disconnect_due_to_con_param_update' into 'master'
...
fix esp32c3 and esp32s3 ble disconnect due to connection paramters update
See merge request espressif/esp-idf!13324
2021-04-26 04:43:55 +00:00
Jakob Hasse
be55a5eb2b
[system]: put xtensa_intr_asm into IRAM
2021-04-26 12:11:20 +08:00
Michael (XIAO Xufeng)
835a652a63
Merge branch 'feature/usb_hcd_uses_irp_directly' into 'master'
...
USB HCD uses IRPs directly
Closes IDF-2937
See merge request espressif/esp-idf!12646
2021-04-26 03:57:23 +00:00
morris
988c88a6b1
systimer: optimise esp_timer_get_time
2021-04-26 11:54:02 +08:00
xiehang
ce5a25abac
esp_wifi: Fix setting channel error after WiFi stop
2021-04-26 11:32:59 +08:00
Michael (XIAO Xufeng)
cfa4beb661
test_sd: merge emmc SDR/DDR test cases of 4-bit mode
2021-04-26 09:55:39 +08:00
Darian Leung
738af3fd38
USB HCD uses IRPs directly for transfer
...
This commit updates the HCD so that transfer requests are no longer used.
The USB IRP object is updated so that the it can be directly passed to the HCD
to start a transfer. HCD API, tests, and documentation updated accordingly.
2021-04-25 21:52:07 +08:00
Jiang Jiang Jian
3f7b637a15
Merge branch 'bugfix/update_esp32c3_phy_init_data' into 'master'
...
esp_wifi: update esp32c3 phy init data
See merge request espressif/esp-idf!13282
2021-04-25 13:23:13 +00:00
zwj
3c06fea8a1
fix esp32c3 and esp32s3 ble disconnect due to connection paramters update
2021-04-25 20:18:21 +08:00
Michael (XIAO Xufeng)
02970813b8
sdmmc_host: add unit tests and improve documents about using eMMC in 4-line SDR mode
2021-04-25 18:34:37 +08:00
Cao Sen Miao
2059990c94
ci: Add more information for flash performance test
2021-04-25 17:59:10 +08:00
Cao Sen Miao
0d81edb174
spi_flash: refactoring flash encryption into new api
2021-04-25 17:09:25 +08:00
Shu Chen
00a66083c7
Merge branch 'roll-openthread-210416' into 'master'
...
openthread: update openthread submodule
See merge request espressif/esp-idf!13166
2021-04-25 02:18:03 +00:00
Angus Gratton
f2d193a7c3
Merge branch 'bugfix/esp32c3_eco3_efuse_programming' into 'master'
...
esp32c3 espefuse: Fix efuse programming timing on ESP32-C3 ECO3
See merge request espressif/esp-idf!13295
2021-04-23 22:30:41 +00:00
David Čermák
4dc024422c
Merge branch 'feature/lwip-route-hook' into 'master'
...
lw-ip: add config options and hooks for Thread IPv6 border routing
See merge request espressif/esp-idf!13099
2021-04-23 18:41:11 +00:00
Angus Gratton
69309c88a0
Merge branch 'bugfix/fix_c3_typos' into 'master'
...
esp32c3: fix typos of c3 path
See merge request espressif/esp-idf!13318
2021-04-23 13:05:09 +00:00
Michael (XIAO Xufeng)
5997fcd45d
Merge branch 'feature/update_adc_programming_guide_on_c3' into 'master'
...
adc: update esp32c3 programming guide
Closes IDF-2333
See merge request espressif/esp-idf!12563
2021-04-23 12:52:07 +00:00
Michael (XIAO Xufeng)
bea022ce1c
Merge branch 'refactor/usb_common_and_hal_types' into 'master'
...
Separate USB HAL and common USB types
Closes IDF-2931
See merge request espressif/esp-idf!12642
2021-04-23 12:50:35 +00:00
Ivan Grokhotkov
83e68ee19e
Merge branch 'bugfix/replace_setjmp_rom' into 'master'
...
[system]: Made longjmp save for context switch
Closes IDFGH-3232
See merge request espressif/esp-idf!13119
2021-04-23 12:39:29 +00:00
Angus Gratton
65fc657339
Merge branch 'bugfix/otatool_wrong_switch_ota_partition_slots' into 'master'
...
otatool: Fix incorrect using otadata.seq&crc in switch_ota_partition cmd
Closes IDFGH-4983
See merge request espressif/esp-idf!12900
2021-04-23 12:37:13 +00:00
Angus Gratton
2f70a76572
Merge branch 'bugfix/mac_addr_target_support' into 'master'
...
system: Restructure MAC address support documentation
See merge request espressif/esp-idf!13298
2021-04-23 10:56:42 +00:00
Shu Chen
ff3320ca8a
esp32c3: fix typos of c3 path
2021-04-23 18:11:39 +08:00
Ivan Grokhotkov
ea7d020f20
Merge branch 'feature/ubsan' into 'master'
...
system: add option to enable undefined behavior sanitizer (UBSAN)
Closes IDF-166 and IDF-1824
See merge request espressif/esp-idf!11318
2021-04-23 09:27:42 +00:00
Ivan Grokhotkov
9522034144
Merge branch 'doc/linux_host_testing' into 'master'
...
Doc: Linux host test documentation
See merge request espressif/esp-idf!11857
2021-04-23 09:08:42 +00:00
Angus Gratton
88829d68fc
log: Document that normally logging APIs don't work in critical sections
...
Closes https://github.com/espressif/esp-idf/issues/6600
2021-04-23 18:27:20 +10:00
Angus Gratton
9dc0bd16a3
docs: Update the main log document with recent API changes
2021-04-23 18:27:20 +10:00
Angus Gratton
29348270e7
log: Cause ESP_EARLY_LOGx in the app to use the default runtime log level
...
Tag filtering still doesn't work for this log type, but it will use the
default '*' log level instead of only the runtime level.
* Closes https://github.com/espressif/esp-idf/issues/2285
* Related to https://github.com/espressif/esp-idf/issues/5542
2021-04-23 18:25:41 +10:00
Angus Gratton
6bd9580137
log: Allow setting maximum log level higher than default
...
Main change is possibility the log cache locking functions will
be called before the scheduler has started.
This change doesn't change the behaviour of ESP_EARLY_LOGx, this is
done in the following commit.
Closes https://github.com/espressif/esp-idf/issues/5542
2021-04-23 18:25:41 +10:00
Kapil Gupta
20bb0c3b02
wpa_supplicant: Group key reinstallation fixes
...
This commit reverts previous commit for GTK reinstallation fix
and corrects original fix.
2021-04-23 13:44:02 +05:30
Angus Gratton
6e80811ca2
log: Remove redundant definition of LOG_LOCAL_LEVEL
...
After adding a maximum setting, the default value of LOG_LOCAL_LEVEL
will be CONFIG_LOG_MAXIMUM_LEVEL not CONFIG_LOG_DEFAULT_LEVEL
2021-04-23 18:13:04 +10:00
Jakob Hasse
fc22e3c645
[system]: Made longjmp save for context switch
...
* Patched longjmp to be context-switch safe
longjmp modifies the windowbase and windowstart
registers, which isn't safe if a context switch
occurs during the modification. After a context
switch, windowstart and windowbase will be
different, leading to a wrongly set windowstart
bit due to longjmp writing it based on the
windowbase before the context switch. This
corrupts the registers at the next window
overflow reaching that wrongly set bit.
The solution is to disable interrupts during
this code. It is only 6 instructions long,
the impact shouldn't be significant.
The fix is implemented as a wrapper which
replaces the original first instructions of
longjmp which are buggy. Then, it jumps back
to execute the rest of the original longjmp
function.
Added a comparably reliable test to the
test apps.
2021-04-23 15:55:31 +08:00
Angus Gratton
0be81903cc
Merge branch 'bugfix/hal_duplicated_interrupt_functions' into 'master'
...
[hal]: merged duplicated HAL layer functions
Closes IDF-2308
See merge request espressif/esp-idf!12444
2021-04-23 07:47:51 +00:00
Angus Gratton
96c2acd9a8
Merge branch 'refactor/strip_systimer_hal_layer' into 'master'
...
refactor HAL driver of systimer to a common systimer_hal
Closes IDF-2996
See merge request espressif/esp-idf!13027
2021-04-23 07:45:31 +00:00
Wang Meng Yang
85841922a1
Merge branch 'refactor/bt_lib_submodules' into 'master'
...
Refactor/bt lib submodules
See merge request espressif/esp-idf!13247
2021-04-23 07:19:18 +00:00
laokaiyao
e0004dc443
gdma: replaced DMA_CHECK with ESP_GOTO_ON_FALSE and ESP_GOTO_ON_ERROR
2021-04-23 14:49:30 +08:00
Sachin Parekh
b1eacc24f2
stdatomic: Implemented legacy __sync APIs and __atomic_exchange_n
...
These APIs are used when the architecture doesn't have atomic
instruction support
Closes https://github.com/espressif/esp-idf/issues/6463
2021-04-23 11:18:58 +05:30
David Čermák
0d6482b8ee
Merge branch 'feature/esp_eth_ksz8851snl' into 'master'
...
Add a KSZ8851SNL SPI Ethernet driver
Closes IDFGH-4736 and IDFGH-4837
See merge request espressif/esp-idf!12574
2021-04-23 05:14:16 +00:00
Angus Gratton
64a96ca96d
Merge branch 'bugfix/RTC_CLK_CAL_CYCLES' into 'master'
...
esp32xx: Fix the Number of cycles for RTC_SLOW_CLK calibration
See merge request espressif/esp-idf!13202
2021-04-23 04:55:28 +00:00
KonstantinKondrashov
d1befe83ef
otatool: Fix incorrect using otadata.seq&crc in switch_ota_partition cmd
...
Closes: https://github.com/espressif/esp-idf/issues/6773
2021-04-23 04:55:06 +00:00
Angus Gratton
7bb5c8cc82
esp32c3 espefuse: Fix efuse programming timing on ESP32-C3 ECO3
...
Without this timing change, efuse programming occasionally appears to fail
(although the efuse is programmed correctly).
2021-04-23 13:42:23 +10:00
Michael (XIAO Xufeng)
fdb8736a95
Merge branch 'feature/spi_slave_hd_segment_example' into 'master'
...
spi_slave_halfduplex: add an example for segment mode
Closes IDF-1699
See merge request espressif/esp-idf!10043
2021-04-23 03:23:25 +00:00
fuzhibo
928c5b6ce3
Driver(Touch sensor): fix the touch sensor wait cycle after wakeup from sleep
2021-04-23 02:59:58 +00:00
Michael (XIAO Xufeng)
dfdc337e27
Merge branch 'bugfix/twai_caps_naming_and_tidy_up' into 'master'
...
Fix TWAI caps
Closes IDF-2456
See merge request espressif/esp-idf!13172
2021-04-23 02:21:47 +00:00
Jakob Hasse
68393c41c4
doc: linux host test documentation
2021-04-23 09:27:35 +08:00
Ivan Grokhotkov
e449728b7d
hal: fix planted break instruction for Xtensa targets
...
On Xtensa, "break 0, 0" encodes a software breakpoint which is placed
into the program by the debug monitor. Planted breakpoints (added in
the code to trap into debugger) should be encoded as "break 1, 15".
See table "Breakpoint Instruction Operand Conventions" in the ISA
Reference manual.
2021-04-22 23:33:47 +02:00
Ivan Grokhotkov
da90775d98
hal: mpu: fix signed overflow error
2021-04-22 23:33:47 +02:00
Ivan Grokhotkov
4e73cff729
esp_netif: enable UBSAN in component test app
2021-04-22 23:33:47 +02:00
Ivan Grokhotkov
9069f70db3
system: add option to enable undefined behavior sanitizer (UBSAN)
...
Closes https://github.com/espressif/esp-idf/issues/1574
2021-04-22 23:33:45 +02:00
Ivan Grokhotkov
cfdfeed973
freertos: linker.lf rules fixes
...
1. Add conditions based on Kconfig options for functions which are
compiled based on those options.
2. Static allocation is always enabled, move corresponding functions
into the common list.
2021-04-22 17:14:46 +02:00
David Cermak
1e674f1d20
esp_eth: Update KSZ8851SNL driver to use global error checkers
...
Also updated KSZ8851SNL per internal code review:
* Removed Link status change interrupt as it's handled with polling
* Added auto negotiation timeout
* Updated typedefs, moved types to appropriate source, updated
components/esp_eth/src/ksz8851.h to use only inherent device types
* Applied IDF code formatting
* Updated header file order to include first the most generic to more
specific
2021-04-22 13:55:51 +00:00
Vladimir Chistyakov
c4f131e6ee
esp_eth: Add a KSZ8851SNL SPI Ethernet driver
...
Implement the PHY and MAC layers in the driver similar to
the W5500 driver.
Update Kconfig, CMakeLists.txt, and component.mk to incorporate
the changes.
Resolves : #6542
Merges https://github.com/espressif/esp-idf/pull/6636
Closes https://github.com/espressif/esp-idf/issues/6542
2021-04-22 13:55:51 +00:00
morris
ec898b771e
systimer: strip hal driver
2021-04-22 21:08:39 +08:00
morris
7c1e1c9e2d
systimer: update soc data
2021-04-22 21:07:35 +08:00
morris
7eb9ecb4f6
esp_ds: move timeout mechanism to driver layer
2021-04-22 21:07:35 +08:00
Mahavir Jain
812d61295d
Merge branch 'bugfix/log_arg_in_bootloader_support' into 'master'
...
bootloader_support: Fix min size of OTA partition in error log
See merge request espressif/esp-idf!13288
2021-04-22 12:31:56 +00:00
Darian Leung
2906a25988
Separate USB HAL and common USB types
...
This commit separates out the common USB types used throughout most of the stack into its
own header file inside the USB component. The types used in the USB HAL are now exclusive
to the HAL.
2021-04-22 19:24:48 +08:00
chenjianxing
372d8c6003
esp_wifi: update esp32c3 phy init data
2021-04-22 19:17:20 +08:00
yuanjm
93604b1a11
mbedtls: Fix mbedtls_ssl_send_alert_message crash due to ssl->out_iv is NULL
2021-04-22 09:33:59 +00:00
Shubham Patil
c2b0db75e8
bootloader_support: Fix min size of OTA partition in error log
2021-04-22 14:00:42 +05:30
Jiacheng Guo
fd3553b66d
lwip: add config options for Thread IPv6 border routing
2021-04-22 06:13:47 +00:00
Angus Gratton
7cb83c8787
system doc: Re-structure description of MAC addresses, especially on newer chip targets
...
Includes a note about calculating the Ethernet MAC on platforms with no built-in
Ethernet, and removes documentation for esp_efuse_mac_get_custom() on targets
other than ESP32
2021-04-22 16:08:55 +10:00
David Čermák
7f34657013
Merge branch 'feature/ethernet_link_check_esp_timer' into 'master'
...
esp_eth: using esp_timer to check link status
Closes IDFGH-4953
See merge request espressif/esp-idf!13155
2021-04-22 06:08:00 +00:00
Angus Gratton
eb38eb670c
system: Return ESP_ERR_NOT_SUPPORTED for esp_read_mac(ESP_MAC_BT, ...) on ESP32-S2
...
Previously this function returned ESP_OK but no MAC was set.
2021-04-22 12:22:46 +10:00
Angus Gratton
c8cb803378
system: Simplify esp_derive_local_mac() function
...
Previously this function included a loop but would never run more
than one iteration of it.
2021-04-22 12:22:46 +10:00
Mahavir Jain
a82466674a
Merge branch 'bugfix/esp_http_client_read' into 'master'
...
Fix esp_http_client_read for file size aligned to 289 bytes
Closes IDFGH-4981
See merge request espressif/esp-idf!13193
2021-04-22 01:48:00 +00:00
wangmengyang
d703424ef7
component/bt: add another bt-lib submodule and refactor the directories
2021-04-22 07:41:46 +08:00
Angus Gratton
f91d6c7a69
Merge branch 'bugfix/tls_threadptr_calculation' into 'master'
...
freertos: fix TLS run-time address calculation
See merge request espressif/esp-idf!13271
2021-04-21 23:13:13 +00:00
Shubham Kulkarni
b148433fbd
esp_http_client_read: Add check for esp_http_client_is_complete_data_received before returning ESP_FAIL
...
Closes: https://github.com/espressif/esp-idf/issues/6772
2021-04-21 17:28:54 +05:30
wangmengyang
b81c687327
remove original esp32-bt-lib submodule
2021-04-21 19:51:32 +08:00
Ivan Grokhotkov
0535195983
freertos: fix TLS run-time address calculation
...
Since dd849ffc
, _rodata_start label has been moved to a different
linker output section from where the TLS templates (.tdata, .tbss)
are located. Since link-time addresses of thread-local variables are
calculated relative to the section start address, this resulted in
incorrect calculation of THREADPTR/$tp registers.
Fix by introducing new linker label, _flash_rodata_start, which points
to the .flash.rodata output section where TLS variables are located,
and use it when calculating THREADPTR/$tp.
Also remove the hardcoded rodata section alignment for Xtensa targets.
Alignment of rodata can be affected by the user application, which is
the issue dd849ffc
was fixing. To accommodate any possible alignment,
save it in a linker label (_flash_rodata_align) and then use when
calculating THREADPTR. Note that this is not required on RISC-V, since
this target doesn't use TPOFF.
2021-04-21 13:45:21 +02:00
Ivan Grokhotkov
d4e8987a39
Merge branch 'feature/prevent_unwind_code_linking' into 'master'
...
prevent unwind code linking
Closes IDF-2577, IDFGH-3394, IDFGH-3417, and IDFGH-3153
See merge request espressif/esp-idf!12328
2021-04-21 10:04:15 +00:00
Wang Meng Yang
81723243cf
Merge branch 'bugfix/ble_timeout_disconnected_no_report' into 'master'
...
Fix the controller do not report the disconnect event to host
See merge request espressif/esp-idf!13261
2021-04-21 09:43:33 +00:00
“YangZhao”
1def09cc99
bugfix: Fix the issue that the controller do not report the timeout
...
disconnect event. This issue is caused by modem sleep.The sleep interrupt
will come the second time before the CLKN interrupt. If we disable the sleep
interrupt when it comes in the first time, the CLKN will never come.
2021-04-21 14:49:44 +08:00
morris
0733adab5e
esp_eth: using esp_timer to check link status
2021-04-21 13:08:07 +08:00
morris
537617aec7
esp_eth: support user customized PHY io function
...
Closes https://www.github.com/espressif/esp-idf/issues/6745
2021-04-21 13:08:07 +08:00
morris
c833ec5533
global: remove esp_ssc.h
2021-04-21 13:08:07 +08:00
Mahavir Jain
104830107a
Merge branch 'fix/esp_https_client_compile_warning' into 'master'
...
esp_https_ota: Fix build warning when CONFIG_OTA_ALLOW_HTTP is set
Closes IDFGH-5098
See merge request espressif/esp-idf!13192
2021-04-21 04:57:49 +00:00
Mahavir Jain
c22805e94b
Merge branch 'bugfix/bootloader_min_revision_c3' into 'master'
...
Fix bootloader minimum revision check and print for ESP32-C3
Closes IDFGH-5106
See merge request espressif/esp-idf!13248
2021-04-21 04:41:47 +00:00
Armando
3177130256
adc: add adc programming guide on c3
2021-04-21 10:40:55 +08:00
Angus Gratton
15575346f5
Merge branch 'bugfix/freertos_current_tcb_unpinned' into 'master'
...
freertos: Fix race condition returning incorrect TCB on unpinned tasks
Closes WIFI-3125
See merge request espressif/esp-idf!13189
2021-04-21 01:03:32 +00:00
Ivan Grokhotkov
d34421dd7b
Merge branch 'feature/build_nvs_host_test_ci' into 'master'
...
Add nvs page host test to CI
Closes IDF-2425
See merge request espressif/esp-idf!12417
2021-04-20 23:32:01 +00:00
Ivan Grokhotkov
c248dcc724
Merge branch 'bugfix/flash_rodata_any_alignement' into 'master'
...
build: (Custom) App version info is now on a dedicated section
Closes IDFGH-4927
See merge request espressif/esp-idf!12786
2021-04-20 23:30:03 +00:00
Jiang Jiang Jian
9b73403efd
Merge branch 'bugfix/ftm_fixes_logging_change' into 'master'
...
wifi/ftm: Move FTM report logging into application and general Bugfixes
Closes WIFI-3294
See merge request espressif/esp-idf!13009
2021-04-20 15:26:49 +00:00
Wang Meng Yang
c94916de8f
Merge branch 'bugfix/optimize_c3_multi_con_and_add_connection_retry' into 'master'
...
optimize c3 multi con and add connection retry
See merge request espressif/esp-idf!12983
2021-04-20 14:48:11 +00:00
Mahavir Jain
4f71805255
Merge branch 'bugfix/update_tinycbor_for_static_analysis_fix' into 'master'
...
Update tinycbor for static analysis fix
Closes IDF-2792
See merge request espressif/esp-idf!13190
2021-04-20 14:40:05 +00:00
Aditya Patwardhan
31445c1566
esp_https_ota: Warn users when CONFIG_OTA_ALLOW_HTTP is set
2021-04-20 20:06:41 +05:30
Island
3e05abe7bb
Merge branch 'bugfix/endianness_in_output_or_input_oob' into 'master'
...
ble_mesh: stack: Fix endianness error in output or input oob data of number
See merge request espressif/esp-idf!13160
2021-04-20 13:09:01 +00:00
Jiacheng Guo
64c498a584
openthread: update openthread submodule
...
Roll OpenThread submodule and rename OpenThread config macros and api
calls accordingly.
2021-04-20 20:26:19 +08:00
Armando
44fafd4991
spi_slave_hd: add polling api to read/write buf to essl_spi
2021-04-20 20:08:30 +08:00
Armando
85e29dace7
spi_slave_hd: add callback after data is loaded to the DMA for segment mode
2021-04-20 20:08:29 +08:00
Wang Meng Yang
b05ac11456
Merge branch 'nimble/add_c3_config_max_conn' into 'master'
...
NimBLE: Add max connection config option for C3
See merge request espressif/esp-idf!12226
2021-04-20 09:49:11 +00:00
Axel Lin
39792bd7cc
esp_https_ota: Fix build warning when CONFIG_OTA_ALLOW_HTTP is set
...
Fix below build warning when CONFIG_OTA_ALLOW_HTTP is set:
esp_https_ota.c:165:13: warning: 'is_server_verification_enabled' defined but not used [-Wunused-function]
While at it, also simplify the is_server_verification_enabled logic.
Fixes: 48987ad9df
("esp_https_ota: Enable option of using global_ca_store and x509_crt_bundle")
Signed-off-by: Axel Lin <axel.lin@gmail.com>
Closes https://github.com/espressif/esp-idf/pull/6882
Signed-off-by: Aditya Patwardhan <aditya.patwardhan@espressif.com>
2021-04-20 14:48:44 +05:30
Mahavir Jain
a4f38db53d
bootloader_support: fix min. revision error print for < C3-ECO3 revisions
2021-04-20 14:22:14 +05:30
Mahavir Jain
f9699e2412
bootloader: fix print related to min. chip revision
...
Closes https://github.com/espressif/esp-idf/issues/6890
Closes IDFGH-5106
2021-04-20 14:19:17 +05:30
Jakob Hasse
2fb5b42eb1
[nvs] add nvs page host test to CI
...
Closes IDF-2425
2021-04-20 14:40:16 +08:00
KonstantinKondrashov
8e1256ca88
esp32xx: Fix the Number of cycles for RTC_SLOW_CLK calibration
2021-04-20 06:29:42 +00:00
Jakob Hasse
2552c7ba0f
[C++]: wrapper functions around unwind code
...
* Replaced all C++ exception related
functions with wrappers if -fno-exception
is used. This prevents linking of the
corresponding code in libgcc. The code
size will decrease by around 7-9 KB when
building with -fno-exception.
* added no except test app
Closes https://github.com/espressif/esp-idf/pull/5380
Closes https://github.com/espressif/esp-idf/issues/5363
Closes https://github.com/espressif/esp-idf/issues/5224
Closes IDFGH-3153
Closes IDF-2577
2021-04-20 14:27:58 +08:00
wangjialiang
dd0fbb2f5e
ble_mesh: stack: Fix endianness error in output or input oob data of number
...
Closes https://github.com/espressif/esp-idf/issues/6862
2021-04-20 06:25:52 +00:00
Angus Gratton
79ae7a7bd9
freertos: test: Add stress test for thread local storage
...
(Fails without the fix applied in parent commit.)
2021-04-20 14:46:49 +10:00