mirror of
https://github.com/m5stack/M5Stack_MicroPython.git
synced 2026-05-20 10:14:44 -07:00
Fixed bug in machine.RTC
Added ARM Xtenssa toolchain
This commit is contained in:
@@ -30,7 +30,7 @@ sdkconfig.fw_esp32
|
||||
sdkconfig.fw_esp32_ota
|
||||
sdkconfig.fw_psram
|
||||
sdkconfig.fw_psram_ota
|
||||
sdkconfig.fw_esp32_all
|
||||
sdkconfig.fw_esp32_all_psram
|
||||
sdkconfig.fw_all
|
||||
sdkconfig.fw_all_psram
|
||||
|
||||
make_firmwares.sh
|
||||
|
||||
@@ -352,18 +352,21 @@ check_Environment() {
|
||||
fi
|
||||
fi
|
||||
if [ ! -d "xtensa-esp32-elf" ]; then
|
||||
if [ "${machine}" == "Linux" ]; then
|
||||
if [ "${linplatform}" == "i686" ]; then
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf (32bit)"
|
||||
tar -xf ${machine}/xtensa-esp32-elf_32bit.tar.xz > /dev/null 2>&1
|
||||
else
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf"
|
||||
tar -xf ${machine}/xtensa-esp32-elf.tar.xz > /dev/null 2>&1
|
||||
fi
|
||||
else
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf"
|
||||
tar -xf ${machine}/xtensa-esp32-elf.tar.xz > /dev/null 2>&1
|
||||
fi
|
||||
if [ "${machine}" == "Linux" ]; then
|
||||
if [ "${linplatform}" == "i686" ]; then
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf (32bit)"
|
||||
tar -xf ${machine}/xtensa-esp32-elf_32bit.tar.xz > /dev/null 2>&1
|
||||
elif [ "${linplatform}" == "armv7l" ]; then
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf (arm)"
|
||||
tar -xf ${machine}/xtensa-esp32-elf_arm.tar.xz > /dev/null 2>&1
|
||||
else
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf"
|
||||
tar -xf ${machine}/xtensa-esp32-elf.tar.xz > /dev/null 2>&1
|
||||
fi
|
||||
else
|
||||
echo "unpacking ${machine}/xtensa-esp32-elf"
|
||||
tar -xf ${machine}/xtensa-esp32-elf.tar.xz > /dev/null 2>&1
|
||||
fi
|
||||
if [ $? -ne 0 ]; then
|
||||
echo "unpacking 'xtensa-esp32-elf' FAILED"
|
||||
return 1
|
||||
|
||||
@@ -90,8 +90,6 @@ machine_rtc_config_t machine_rtc_config = { 0, -1, 0, 0, 0 };
|
||||
static TaskHandle_t sntp_handle = NULL;
|
||||
xSemaphoreHandle sntp_mutex = NULL;
|
||||
|
||||
static bool mach_rtc_isinit = false;
|
||||
|
||||
#define DEFAULT_SNTP_SERVER "pool.ntp.org"
|
||||
|
||||
//------------------------------
|
||||
@@ -185,14 +183,10 @@ STATIC mp_obj_t mach_rtc_make_new(const mp_obj_type_t *type, size_t n_args, size
|
||||
// check arguments
|
||||
mp_arg_check_num(n_args, n_kw, 0, 0, false);
|
||||
|
||||
if (mach_rtc_isinit) {
|
||||
mp_raise_msg(&mp_type_OSError, "RTC instance already created, only one can be used.");
|
||||
}
|
||||
// setup the object
|
||||
mach_rtc_obj_t *self = &mach_rtc_obj;
|
||||
self->base.type = &mach_rtc_type;
|
||||
|
||||
mach_rtc_isinit = true;
|
||||
// return constant object
|
||||
return (mp_obj_t)&mach_rtc_obj;
|
||||
}
|
||||
|
||||
@@ -1,8 +1,8 @@
|
||||
// MicroPython version info
|
||||
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.10"
|
||||
#define MICROPY_GIT_TAG "ESP32_LoBo_v3.1.11"
|
||||
#define MICROPY_GIT_HASH "g2ddee729"
|
||||
#define MICROPY_BUILD_DATE "2017-01-22"
|
||||
#define MICROPY_BUILD_DATE "2017-01-24"
|
||||
#define MICROPY_VERSION_MAJOR (3)
|
||||
#define MICROPY_VERSION_MINOR (1)
|
||||
#define MICROPY_VERSION_MICRO (10)
|
||||
#define MICROPY_VERSION_STRING "3.1.10"
|
||||
#define MICROPY_VERSION_MICRO (11)
|
||||
#define MICROPY_VERSION_STRING "3.1.11"
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user