Merge pull request #6666 from tannewt/fix_web_paste

Lots of web workflow, C3 and title bar fixes

Author: dhalbert

main.c

@@ -57,6 +57,7 @@
 #include "supervisor/shared/stack.h"
 #include "supervisor/shared/status_leds.h"
 #include "supervisor/shared/tick.h"
+#include "supervisor/shared/title_bar.h"
 #include "supervisor/shared/traceback.h"
 #include "supervisor/shared/translate/translate.h"
 #include "supervisor/shared/workflow.h"
@@ -822,7 +823,9 @@ STATIC int run_repl(bool first_run) {
     status_led_deinit();
     #endif
     if (pyexec_mode_kind == PYEXEC_MODE_RAW_REPL) {
+        supervisor_title_bar_suspend();
         exit_code = pyexec_raw_repl();
+        supervisor_title_bar_resume();
     } else {
         exit_code = pyexec_friendly_repl();
     }
@@ -914,6 +917,7 @@ int __attribute__((used)) main(void) {
     run_boot_py(safe_mode);
 
     supervisor_workflow_start();
+    supervisor_title_bar_start();
 
     // Boot script is finished, so now go into REPL or run code.py.
     int exit_code = PYEXEC_FORCED_EXIT;

ports/espressif/boards/adafruit_qtpy_esp32c3/sdkconfig

@@ -30,6 +30,14 @@ CONFIG_PARTITION_TABLE_FILENAME="esp-idf-config/partitions-4MB-no-uf2.csv"
 #
 # Component config
 #
+#
+
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # ESP System Settings
 #

ports/espressif/boards/beetle-esp32-c3/sdkconfig

@@ -1,3 +1,9 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # LWIP
 #

ports/espressif/boards/lolin_c3_mini/sdkconfig

@@ -1,3 +1,9 @@
+#
+# PHY
+#
+CONFIG_ESP_PHY_ENABLE_USB=y
+# end of PHY
+
 #
 # LWIP
 #

ports/espressif/common-hal/alarm/pin/PinAlarm.c

@@ -27,7 +27,7 @@
 
 #include "py/runtime.h"
 
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 #include "shared-bindings/alarm/pin/PinAlarm.h"
 #include "shared-bindings/microcontroller/Pin.h"
 #include "shared-bindings/microcontroller/__init__.h"
@@ -90,11 +90,7 @@ STATIC void gpio_interrupt(void *arg) {
             gpio_ll_intr_disable(&GPIO, 32 + i);
         }
     }
-    BaseType_t high_task_wakeup;
-    vTaskNotifyGiveFromISR(circuitpython_task, &high_task_wakeup);
-    if (high_task_wakeup) {
-        portYIELD_FROM_ISR();
-    }
+    port_wake_main_task_from_isr();
 }
 
 bool alarm_pin_pinalarm_woke_this_cycle(void) {

ports/espressif/common-hal/alarm/time/TimeAlarm.c

@@ -27,7 +27,7 @@
 #include "esp_sleep.h"
 
 #include "py/runtime.h"
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 
 #include "components/esp_timer/include/esp_timer.h"
 
@@ -66,7 +66,7 @@ STATIC bool woke_up = false;
 STATIC void timer_callback(void *arg) {
     (void)arg;
     woke_up = true;
-    xTaskNotifyGive(circuitpython_task);
+    port_wake_main_task();
 }
 
 bool alarm_time_timealarm_woke_this_cycle(void) {

ports/espressif/common-hal/alarm/touch/TouchAlarm.c

@@ -30,7 +30,7 @@
 
 #include "esp_sleep.h"
 #include "peripherals/touch.h"
-#include "supervisor/esp_port.h"
+#include "supervisor/port.h"
 
 static uint16_t touch_channel_mask;
 static volatile bool woke_up = false;
@@ -86,11 +86,7 @@ mp_obj_t alarm_touch_touchalarm_create_wakeup_alarm(void) {
 STATIC void touch_interrupt(void *arg) {
     (void)arg;
     woke_up = true;
-    BaseType_t task_wakeup;
-    vTaskNotifyGiveFromISR(circuitpython_task, &task_wakeup);
-    if (task_wakeup) {
-        portYIELD_FROM_ISR();
-    }
+    port_wake_main_task_from_isr();
 }
 
 void alarm_touch_touchalarm_set_alarm(const bool deep_sleep, const size_t n_alarms, const mp_obj_t *alarms) {

ports/espressif/common-hal/wifi/__init__.c

@@ -44,6 +44,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 #include "components/log/include/esp_log.h"
 
 #include "supervisor/port.h"
+#include "supervisor/shared/title_bar.h"
 #include "supervisor/workflow.h"
 
 #include "esp_ipc.h"
@@ -55,7 +56,7 @@ wifi_radio_obj_t common_hal_wifi_radio_obj;
 static const char *TAG = "CP wifi";
 
 STATIC void schedule_background_on_cp_core(void *arg) {
-    supervisor_workflow_request_background();
+    supervisor_title_bar_request_update(false);
 
     // CircuitPython's VM is run in a separate FreeRTOS task from wifi callbacks. So, we have to
     // notify the main task every time in case it's waiting for us.

ports/espressif/esp-idf

@@ -30,7 +30,6 @@
 #include "supervisor/board.h"
 #include "supervisor/port.h"
 #include "py/runtime.h"
-#include "supervisor/esp_port.h"
 
 #include "freertos/FreeRTOS.h"
 #include "freertos/task.h"
@@ -390,6 +389,14 @@ void port_wake_main_task() {
     xTaskNotifyGive(circuitpython_task);
 }
 
+void port_wake_main_task_from_isr() {
+    BaseType_t xHigherPriorityTaskWoken = pdFALSE;
+    vTaskNotifyGiveFromISR(circuitpython_task, &xHigherPriorityTaskWoken);
+    if (xHigherPriorityTaskWoken == pdTRUE) {
+        portYIELD_FROM_ISR();
+    }
+}
+
 void sleep_timer_cb(void *arg) {
     port_wake_main_task();
 }