Updating to IDF 5.4.

Author: kdschlosser

builder/__init__.py

@@ -10,7 +10,7 @@
 
 _windows_env = None
 
-
+MICROPY_LVGL_VER = "1.0.0"
 DO_NOT_SCRUB_BUILD_FOLDER = False
 
 
@@ -34,7 +34,7 @@ def revert_files(port):
     if port in ('raspberry_pi', 'macOS'):
         port = 'unix'
 
-    dst_path = f'lib/micropython/ports/{port}'
+    dst_path = f'lib/micropython'
 
     if not os.path.exists(src_path) or not os.listdir(src_path):
         return
@@ -63,7 +63,7 @@ def copy_micropy_updates(port):
         port = 'unix'
         src_path = f'micropy_updates/{port}'
 
-    dst_path = f'lib/micropython/ports/{port}'
+    dst_path = f'lib/micropython'
 
     def iter_files(s_path, d_path, o_path):
         for file in os.listdir(s_path):
@@ -99,7 +99,7 @@ def read_file(port, file):
 
     head, tail = os.path.split(filepath)
     save_path = []
-    while tail != port:
+    while tail != 'micropython':
         save_path.insert(0, tail)
         head, tail = os.path.split(head)
 

builder/esp32.py

@@ -13,10 +13,11 @@
     write_file,
     copy_micropy_updates,
     revert_files,
-    scrub_build_folder
+    scrub_build_folder,
+    MICROPY_LVGL_VER
 )
 
-IDF_VER = '5.2.0'
+IDF_VER = '5.4.0'
 
 
 def get_partition_file_name(otp):
@@ -477,7 +478,6 @@ def esp32_s3_args(extra_args):
         dest='oct_flash',
         action='store_true'
     )
-
     esp_argParser.add_argument(
         '--enable_fb_test',
         dest='optimum_fb_size',
@@ -997,50 +997,13 @@ def find_esp32_ports(chip):
 
 SDKCONFIG_PATH = f'build/sdkconfig.board'
 
-MPTHREADPORT_PATH = 'lib/micropython/ports/esp32/mpthreadport.c'
 MPCONFIGPORT_PATH = 'lib/micropython/ports/esp32/mpconfigport.h'
-PANICHANDLER_PATH = 'lib/micropython/ports/esp32/panichandler.c'
 MPHALPORT_PATH = 'lib/micropython/ports/esp32/mphalport.c'
-MAIN_PATH = 'lib/micropython/ports/esp32/main.c'
-
 
 if not os.path.exists('micropy_updates/originals/esp32'):
     os.makedirs('micropy_updates/originals/esp32')
 
 
-def update_mpthreadport():
-    data = read_file('esp32', MPTHREADPORT_PATH)
-
-    if '_CORE_ID' not in data:
-        data = data.replace('MP_TASK_COREID', '_CORE_ID')
-
-        new_data = [
-            '#if MICROPY_PY_THREAD',
-            '',
-            '#if (MP_USE_DUAL_CORE && !CONFIG_FREERTOS_UNICORE)',
-            '    #define _CORE_ID    tskNO_AFFINITY',
-            '#else',
-            '    #define _CORE_ID    MP_TASK_COREID',
-            '#endif',
-            ''
-        ]
-
-        data = data.replace('#if MICROPY_PY_THREAD', '\n'.join(new_data), 1)
-
-        write_file(MPTHREADPORT_PATH, data)
-
-
-def update_panic_handler():
-    data = read_file('esp32', PANICHANDLER_PATH)
-
-    if '"MPY version : "' in data:
-        beg, end = data.split('"MPY version : "', 1)
-        end = end.split('"\\r\\n"', 1)[1]
-        data = f'{beg}"LVGL MicroPython \\r\\n"{end}'
-
-        write_file(PANICHANDLER_PATH, data)
-
-
 def update_mpconfigboard():
     if custom_board_path is not None:
         return
@@ -1068,10 +1031,6 @@ def update_mpconfigport():
 
     if custom_board_path is None:
         repl_data = [
-            '#ifndef USB_SERIAL_JTAG_PACKET_SZ_BYTES',
-            '#define USB_SERIAL_JTAG_PACKET_SZ_BYTES (64)',
-            '#endif',
-            '',
             '#ifdef MICROPY_HW_UART_REPL_BAUD',
             '#undef MICROPY_HW_UART_REPL_BAUD',
             '#endif',
@@ -1114,127 +1073,40 @@ def update_mpconfigport():
             1
         )
 
-    pattern = (
-        '#if !(CONFIG_IDF_TARGET_ESP32 && CONFIG_SPIRAM && '
-        'CONFIG_SPIRAM_CACHE_WORKAROUND)\n'
-        '#define MICROPY_WRAP_MP_BINARY_OP(f) IRAM_ATTR f\n'
-        '#endif'
+    data = data.replace(
+        f'#define MP_USE_DUAL_CORE                    (1)',
+        f'#define MP_USE_DUAL_CORE                    ({int(dual_core_threads)})'
     )
 
-    if pattern in data:
-        pattern = (
-            '#if !(CONFIG_IDF_TARGET_ESP32 && CONFIG_SPIRAM '
-            '&& CONFIG_SPIRAM_CACHE_WORKAROUND)\n'
-        )
-        data = data.replace(
-            '#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f\n',
-            ''
-        )
-        data = data.replace(
-            '#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) '
-            'IRAM_ATTR f\n',
-            ''
-        )
-        data = data.replace(
-            pattern,
-            pattern + '#define MICROPY_WRAP_MP_SCHED_EXCEPTION(f) IRAM_ATTR f\n'
-        )
+    data = data.replace(
+        f'#define MP_USE_DUAL_CORE                    (0)',
+        f'#define MP_USE_DUAL_CORE                    ({int(dual_core_threads)})'
+    )
 
-        data = data.replace(
-            pattern,
-            pattern + '#define MICROPY_WRAP_MP_SCHED_KEYBOARD_INTERRUPT(f) '
-                      'IRAM_ATTR f\n'
-        )
+    data = data.replace(
+        '#define MICROPY_PY_THREAD_GIL               (1)',
+        f'#define MICROPY_PY_THREAD_GIL               ({int(not dual_core_threads)})'
+    )
 
-    has_dual_core = 'MP_USE_DUAL_CORE' in data
+    data = data.replace(
+        '#define MICROPY_PY_THREAD_GIL               (0)',
+        f'#define MICROPY_PY_THREAD_GIL               ({int(not dual_core_threads)})'
+    )
 
-    data = data.split('\n')
+    data = data.splitlines(keepends=False)
 
     for i, line in enumerate(data):
-        if has_dual_core and line.startswith('#define MP_USE_DUAL_CORE'):
-            data[i] = (
-                '#define MP_USE_DUAL_CORE                    '
-                f'({int(dual_core_threads)})'
-            )
-            continue
-
-        if line.startswith('#define MICROPY_PY_THREAD_GIL'):
-            data[i] = (
-                f'#define MICROPY_PY_THREAD_GIL               '
-                f'({int(not dual_core_threads)})'
-            )
-            if not has_dual_core:
-                data[i] += (
-                    '\n#define MP_USE_DUAL_CORE                    '
-                    f'({int(dual_core_threads)})'
-                )
-            continue
-
         if line.startswith('#define MICROPY_TASK_STACK_SIZE'):
             data[i] = (
                 f'#define MICROPY_TASK_STACK_SIZE           ({task_stack_size})'
             )
-            continue
+            break
 
     data = '\n'.join(data)
 
     write_file(MPCONFIGPORT_PATH, data)
 
 
-def update_main():
-    data = read_file('esp32', MAIN_PATH)
-
-    rep_data = [
-        '#if SOC_LCD_I80_SUPPORTED',
-        '#include "../../../../ext_mod/lcd_bus/esp32_include/i80_bus.h"',
-        '#endif',
-        '',
-        '#if SOC_LCD_RGB_SUPPORTED',
-        '#include "../../../../ext_mod/lcd_bus/esp32_include/rgb_bus.h"',
-        '#endif',
-        '',
-        '#include "../../../../ext_mod/lcd_bus/esp32_include/spi_bus.h"',
-        '#include "../../../../ext_mod/lcd_bus/esp32_include/i2c_bus.h"',
-        '#include "../../../../ext_mod/spi3wire/include/spi3wire.h"',
-        '#include "../../../../micropy_updates/common/mp_spi_common.h"',
-        '',
-        '#if MICROPY_BLUETOOTH_NIMBLE'
-    ]
-
-    data = data.replace(
-        '#if MICROPY_BLUETOOTH_NIMBLE',
-        '\n'.join(rep_data),
-        1
-    )
-
-    rep_data = [
-        'soft_reset_exit:',
-        ' ',
-        '#if SOC_LCD_I80_SUPPORTED',
-        '    mp_lcd_i80_bus_deinit_all();',
-        '#endif',
-        '    ',
-        '#if SOC_LCD_RGB_SUPPORTED',
-        '   mp_lcd_rgb_bus_deinit_all();',
-        '#endif',
-        '    ',
-        '    mp_lcd_spi_bus_deinit_all();',
-        '    ',
-        '    mp_lcd_i2c_bus_deinit_all();',
-        '    ',
-        '    mp_spi3wire_deinit_all();',
-        '    ',
-        '    mp_machine_hw_spi_bus_deinit_all();'
-    ]
-
-    data = data.replace(
-        'soft_reset_exit:',
-        '\n'.join(rep_data)
-    )
-
-    write_file(MAIN_PATH, data)
-
-
 def build_sdkconfig(*args):
     if custom_board_path is not None:
         return
@@ -1367,14 +1239,10 @@ def compile(*args):  # NOQA
         partition = Partition(p_size)
         partition.save()
 
-    update_main()
-    update_mpthreadport()
-    update_panic_handler()
+    copy_micropy_updates('esp32')
     update_mpconfigboard()
     update_mpconfigport()
 
-    copy_micropy_updates('esp32')
-
     try:
         cmd_ = compile_cmd[:]
         cmd_.extend(list(args))

micropy_updates/esp32/ports/esp32/adc.c

@@ -0,0 +1,87 @@
+/*
+ * This file is part of the MicroPython project, http://micropython.org/
+ *
+ * The MIT License (MIT)
+ *
+ * Copyright (c) 2017 Nick Moore
+ * Copyright (c) 2021 Jonathan Hogg
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
+ */
+
+#include "py/mphal.h"
+#include "adc.h"
+#include "esp_adc/adc_oneshot.h"
+#include "esp_adc/adc_cali_scheme.h"
+
+static esp_err_t ensure_adc_calibration(machine_adc_block_obj_t *self, adc_atten_t atten);
+
+esp_err_t apply_self_adc_channel_atten(const machine_adc_obj_t *self, uint8_t atten) {
+    adc_oneshot_chan_cfg_t config = {
+        .atten = atten,
+        .bitwidth = self->block->bitwidth,
+    };
+    esp_err_t ret = adc_oneshot_config_channel(self->block->handle, self->channel_id, &config);
+    return ret;
+}
+
+mp_int_t madcblock_read_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id) {
+    int reading = 0;
+    adc_oneshot_read(self->handle, channel_id, &reading);
+    return reading;
+}
+
+/*
+During testing, it turned out that the function `adc_cali_raw_to_voltage` does not account for the lower resolution,
+instead it expects the full resolution value as an argument, hence the scaling applied here
+*/
+mp_int_t madcblock_read_uv_helper(machine_adc_block_obj_t *self, adc_channel_t channel_id, adc_atten_t atten) {
+    int raw = madcblock_read_helper(self, channel_id);
+    int uv = 0;
+
+    check_esp_err(ensure_adc_calibration(self, atten));
+    check_esp_err(adc_cali_raw_to_voltage(self->calib[atten], (raw << (ADC_WIDTH_MAX - self->bitwidth)), &uv));
+    return (mp_int_t)uv * 1000;
+}
+
+static esp_err_t ensure_adc_calibration(machine_adc_block_obj_t *self, adc_atten_t atten) {
+    if (self->calib[atten] != NULL) {
+        return ESP_OK;
+    }
+
+    esp_err_t ret = ESP_OK;
+
+    #if ADC_CALI_SCHEME_CURVE_FITTING_SUPPORTED
+    adc_cali_curve_fitting_config_t cali_config = {
+        .unit_id = self->unit_id,
+        .atten = atten,
+        .bitwidth = self->bitwidth,
+    };
+    ret = adc_cali_create_scheme_curve_fitting(&cali_config, &self->calib[atten]);
+    #else
+    adc_cali_line_fitting_config_t cali_config = {
+        .unit_id = self->unit_id,
+        .atten = atten,
+        .bitwidth = self->bitwidth,
+    };
+    ret = adc_cali_create_scheme_line_fitting(&cali_config, &self->calib[atten]);
+    #endif
+
+    return ret;
+}