Merge branch 'master' into m5stack-dev

This commit is contained in:
0x1abin
2018-03-16 12:04:57 +08:00
198 changed files with 2661 additions and 37659 deletions
@@ -80,6 +80,7 @@ CONFIG_MICROPY_HW_BOARD_NAME="M5Stack"
CONFIG_MICROPY_HW_MCU_NAME="ESP32"
CONFIG_MICROPY_TIMEZONE="GMT0BST"
CONFIG_MICROPY_USE_OTA=
CONFIG_BOOT_SET_LED=-1
#
# System settings