Thomas Hebb 8ac96e8cff Merge remote-tracking branch 'upstream/master' ... Merge in a number of upstream changes from Bouffalo, resolving conflicts. Most conflicts came from warring whitespace fixes, which is better than no whitespace fixes in either repo. I generally took the upstream version in such cases to make future merges easier. I have left out all upstream docs changes from this merge, since those will have to be separately merged into our bl602-docs submodule.		2021-01-03 10:19:08 -08:00
..
benchmark_security_aes	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_boot2	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_boot2_mini	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_demo_at	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_demo_blemeshnode	ble mesh node	2020-12-24 16:24:20 +08:00
bl602_demo_event	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_demo_nano	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_demo_noconnectivity	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
bl602_demo_wifi	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_audio_udp	limit amount of make jobs	2020-11-04 20:52:22 +03:00
sdk_app_ble_sync	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_bledemo	ble demo	2020-12-23 16:31:47 +08:00
sdk_app_blog	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_cli	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_cronalarm	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_dac	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_easyflash	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_event	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_fdt	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_gpio	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_hbnram	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_heap	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_helloworld	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_http_client_socket	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_http_client_tcp	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_i2c	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_ir	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_mdns	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_pwm	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_romfs	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_spi	Add sample of sdk_app_spi	2020-12-10 10:17:37 +08:00
sdk_app_timer	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_uart_ctl	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
sdk_app_uart_echo	Merge remote-tracking branch 'upstream/master'	2021-01-03 10:19:08 -08:00
Makefile	fix makefile so that it no longer ignores errors	2020-11-21 16:12:54 +03:00