Merge branch 'master' into ethernet_compat_layer

Author: P-R-O-C-H-Y

.github/workflows/lib.yml

@@ -125,7 +125,7 @@ jobs:
   #Upload PR number as artifact
   upload-pr-number:
     name: Upload PR number
-    if: github.event_name == 'pull_request'
+    if: (github.event_name == 'pull_request' && contains(github.event.pull_request.labels.*.name, 'lib_test'))
     runs-on: ubuntu-latest
     steps:
       - name: Save the PR number in an artifact

.github/workflows/pre-commit-status.yml

@@ -1,41 +1,64 @@
+# This needs to be in a separate workflow because it requires higher permissions than the calling workflow
 name: Report Pre-commit Check Status
 
 on:
-  pull_request_target:
-    types: [opened, reopened, synchronize, labeled, unlabeled]
+  workflow_run:
+    workflows: [Pre-commit hooks]
+    types:
+      - completed
 
 permissions:
   statuses: write
 
 jobs:
-  report-run:
-    name: Check if the PR has run the pre-commit checks
+  report-success:
+    name: Report pre-commit success
+    if: github.event.workflow_run.conclusion == 'success'
     runs-on: ubuntu-latest
     steps:
-      - name: Report pending
-        uses: conda/actions/set-commit-status@v24.2.0
-        with:
-          context: "Pre-commit checks"
-          state: pending
-          description: The pre-commit checks need to be successful before merging
-
-      - name: Wait for pre-commit checks to complete
-        uses: lucasssvaz/wait-on-workflow@v1
-        if: |
-          contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge')
-        id: wait-on-workflow
+      - name: Report success
+        uses: actions/github-script@v7
         with:
-          timeout: 10
-          interval: 30
-          workflow: pre-commit.yml
-          sha: ${{ github.event.pull_request.head.sha || github.sha }}
+          script: |
+            const owner = '${{ github.repository_owner }}';
+            const repo = '${{ github.repository }}'.split('/')[1];
+            const sha = '${{ github.event.workflow_run.head_sha }}';
+            core.debug(`owner: ${owner}`);
+            core.debug(`repo: ${repo}`);
+            core.debug(`sha: ${sha}`);
+            const { context: name, state } = (await github.rest.repos.createCommitStatus({
+              context: 'Pre-commit checks',
+              description: 'Pre-commit checks successful',
+              owner: owner,
+              repo: repo,
+              sha: sha,
+              state: 'success',
+              target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}'
+            })).data;
+            core.info(`${name} is ${state}`);
 
-      - name: Report success
-        uses: conda/actions/set-commit-status@v24.2.0
-        if: |
-          contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge') &&
-          steps.wait-on-workflow.outputs.conclusion == 'success'
+  report-pending:
+    name: Report pre-commit pending
+    if: github.event.workflow_run.conclusion != 'success'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Report pending
+        uses: actions/github-script@v7
         with:
-          context: "Pre-commit checks"
-          state: success
-          description: All pre-commit checks passed
+          script: |
+            const owner = '${{ github.repository_owner }}';
+            const repo = '${{ github.repository }}'.split('/')[1];
+            const sha = '${{ github.event.workflow_run.head_sha }}';
+            core.debug(`owner: ${owner}`);
+            core.debug(`repo: ${repo}`);
+            core.debug(`sha: ${sha}`);
+            const { context: name, state } = (await github.rest.repos.createCommitStatus({
+              context: 'Pre-commit checks',
+              description: 'The pre-commit checks need to be successful before merging',
+              owner: owner,
+              repo: repo,
+              sha: sha,
+              state: 'pending',
+              target_url: 'https://github.com/${{ github.repository }}/actions/runs/${{ github.event.workflow_run.id }}'
+            })).data;
+            core.info(`${name} is ${state}`);

.github/workflows/pre-commit.yml

@@ -1,13 +1,22 @@
 name: Pre-commit hooks
 
 on:
+  workflow_dispatch:
+  push:
+    branches:
+      - master
   pull_request:
     types: [opened, reopened, synchronize, labeled, unlabeled]
 
+concurrency:
+  group: pre-commit-${{github.event.pull_request.number || github.ref}}
+  cancel-in-progress: true
+
 jobs:
   lint:
     if: |
-      contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge')
+      contains(github.event.pull_request.labels.*.name, 'Status: Pending Merge') ||
+      github.event_name != 'pull_request'
     name: Check if fixes are needed
     runs-on: ubuntu-latest
     steps:
@@ -57,6 +66,7 @@ jobs:
 
       - name: Push changes using pre-commit-ci-lite
         uses: pre-commit-ci/lite-action@v1.0.2
-        if: always()
+        # Only push changes in PRs
+        if: ${{ always() && github.event_name == 'pull_request' }}
         with:
           msg: "ci(pre-commit): Apply automatic fixes"

CMakeLists.txt

@@ -95,6 +95,7 @@ set(ARDUINO_ALL_LIBRARIES
   LittleFS
   NetBIOS
   Network
+  PPP
   Preferences
   RainMaker
   SD_MMC
@@ -159,6 +160,10 @@ set(ARDUINO_LIBRARY_LittleFS_SRCS libraries/LittleFS/src/LittleFS.cpp)
 
 set(ARDUINO_LIBRARY_NetBIOS_SRCS libraries/NetBIOS/src/NetBIOS.cpp)
 
+set(ARDUINO_LIBRARY_PPP_SRCS
+  libraries/PPP/src/PPP.cpp
+  libraries/PPP/src/ppp.c)
+
 set(ARDUINO_LIBRARY_Preferences_SRCS libraries/Preferences/src/Preferences.cpp)
 
 set(ARDUINO_LIBRARY_RainMaker_SRCS

Kconfig.projbuild

@@ -321,6 +321,16 @@ config ARDUINO_SELECTIVE_Networking
     depends on ARDUINO_SELECTIVE_COMPILATION
     default y
 
+config ARDUINO_SELECTIVE_Ethernet
+    bool "Enable Ethernet"
+    depends on ARDUINO_SELECTIVE_COMPILATION
+    default y
+
+config ARDUINO_SELECTIVE_PPP
+    bool "Enable PPP"
+    depends on ARDUINO_SELECTIVE_COMPILATION
+    default y
+
 config ARDUINO_SELECTIVE_ArduinoOTA
     bool "Enable ArduinoOTA"
     depends on ARDUINO_SELECTIVE_COMPILATION && ARDUINO_SELECTIVE_Networking

cores/esp32/esp32-hal-adc.c

@@ -360,7 +360,7 @@ static uint8_t __adcContinuousAtten = ADC_11db;
 static uint8_t __adcContinuousWidth = SOC_ADC_DIGI_MAX_BITWIDTH;
 
 static uint8_t used_adc_channels = 0;
-adc_continuos_data_t *adc_result = NULL;
+adc_continuous_data_t *adc_result = NULL;
 
 static bool adcContinuousDetachBus(void *adc_unit_number) {
   adc_unit_t adc_unit = (adc_unit_t)adc_unit_number - 1;
@@ -537,7 +537,7 @@ bool analogContinuous(uint8_t pins[], size_t pins_count, uint32_t conversions_pe
   }
 
   //Allocate and prepare result structure for adc readings
-  adc_result = malloc(pins_count * sizeof(adc_continuos_data_t));
+  adc_result = malloc(pins_count * sizeof(adc_continuous_data_t));
   for (int k = 0; k < pins_count; k++) {
     adc_result[k].pin = pins[k];
     adc_result[k].channel = channel[k];
@@ -578,7 +578,7 @@ bool analogContinuous(uint8_t pins[], size_t pins_count, uint32_t conversions_pe
   return true;
 }
 
-bool analogContinuousRead(adc_continuos_data_t **buffer, uint32_t timeout_ms) {
+bool analogContinuousRead(adc_continuous_data_t **buffer, uint32_t timeout_ms) {
   if (adc_handle[ADC_UNIT_1].adc_continuous_handle != NULL) {
     uint32_t bytes_read = 0;
     uint32_t read_raw[used_adc_channels];

cores/esp32/esp32-hal-adc.h

@@ -86,7 +86,7 @@ extern "C" {
     uint8_t channel;     /*!<ADC channel */
     int avg_read_raw;    /*!<ADC average raw data */
     int avg_read_mvolts; /*!<ADC average voltage in mV */
-  } adc_continuos_data_t;
+  } adc_continuous_data_t;
 
   /*
  * Setup ADC continuous peripheral
@@ -96,7 +96,7 @@ extern "C" {
   /*
  * Read ADC continuous conversion data
  * */
-  bool analogContinuousRead(adc_continuos_data_t** buffer, uint32_t timeout_ms);
+  bool analogContinuousRead(adc_continuous_data_t** buffer, uint32_t timeout_ms);
 
   /*
  * Start ADC continuous conversions

cores/esp32/esp32-hal-periman.c

@@ -104,6 +104,12 @@ const char* perimanGetTypeName(peripheral_bus_type_t type) {
     case ESP32_BUS_TYPE_ETHERNET_MCD: return "ETHERNET_MCD";
     case ESP32_BUS_TYPE_ETHERNET_MDIO: return "ETHERNET_MDIO";
     case ESP32_BUS_TYPE_ETHERNET_PWR: return "ETHERNET_PWR";
+#endif
+#if CONFIG_LWIP_PPP_SUPPORT
+    case ESP32_BUS_TYPE_PPP_TX: return "PPP_MODEM_TX";
+    case ESP32_BUS_TYPE_PPP_RX: return "PPP_MODEM_RX";
+    case ESP32_BUS_TYPE_PPP_RTS: return "PPP_MODEM_RTS";
+    case ESP32_BUS_TYPE_PPP_CTS: return "PPP_MODEM_CTS";
 #endif
     default: return "UNKNOWN";
   }

cores/esp32/esp32-hal-periman.h

@@ -102,6 +102,12 @@ extern "C" {
     ESP32_BUS_TYPE_ETHERNET_MCD,   // IO is used as ETHERNET MCD pin
     ESP32_BUS_TYPE_ETHERNET_MDIO,  // IO is used as ETHERNET MDIO pin
     ESP32_BUS_TYPE_ETHERNET_PWR,   // IO is used as ETHERNET PWR pin
+#endif
+#if CONFIG_LWIP_PPP_SUPPORT
+    ESP32_BUS_TYPE_PPP_TX,   // IO is used as PPP Modem TX pin
+    ESP32_BUS_TYPE_PPP_RX,   // IO is used as PPP Modem RX pin
+    ESP32_BUS_TYPE_PPP_RTS,  // IO is used as PPP Modem RTS pin
+    ESP32_BUS_TYPE_PPP_CTS,  // IO is used as PPP Modem CTS pin
 #endif
     ESP32_BUS_TYPE_MAX
   } peripheral_bus_type_t;

docs/en/api/adc.rst

@@ -184,7 +184,7 @@ If ``false`` is returned, error occurs and ADC continuous was not configured.
 analogContinuousRead
 ^^^^^^^^^^^^^^^^^^^^
 
-This function is used to read ADC continuous data to the result buffer. The result buffer is an array of ``adc_continuos_data_t``.
+This function is used to read ADC continuous data to the result buffer. The result buffer is an array of ``adc_continuous_data_t``.
 
 .. code-block:: arduino
 
@@ -193,13 +193,13 @@ This function is used to read ADC continuous data to the result buffer. The resu
         uint8_t channel;       /*!<ADC channel */
         int avg_read_raw;      /*!<ADC average raw data */
         int avg_read_mvolts;   /*!<ADC average voltage in mV */
-    } adc_continuos_data_t;
+    } adc_continuous_data_t;
 
 .. code-block:: arduino
 
-    bool analogContinuousRead(adc_continuos_data_t ** buffer, uint32_t timeout_ms);
+    bool analogContinuousRead(adc_continuous_data_t ** buffer, uint32_t timeout_ms);
 
-* ``buffer`` conversion result buffer to read from ADC in adc_continuos_data_t format.
+* ``buffer`` conversion result buffer to read from ADC in adc_continuous_data_t format.
 * ``timeout_ms`` time to wait for data in milliseconds.
 
 This function will return ``true`` if reading is successful and ``buffer`` is filled with data.

idf_component.yml

@@ -45,6 +45,7 @@ dependencies:
   idf: ">=5.1"
   # mdns 1.2.1 is necessary to build H2 with no WiFi
   mdns: "^1.2.3"
+  espressif/esp_modem: "^1.1.0"
   chmorgan/esp-libhelix-mp3:
     version: "1.0.3"
     require: public

libraries/ESP32/examples/AnalogReadContinuous/AnalogReadContinuous.ino

@@ -16,7 +16,7 @@ uint8_t adc_pins_count = sizeof(adc_pins) / sizeof(uint8_t);
 volatile bool adc_coversion_done = false;
 
 // Result structure for ADC Continuous reading
-adc_continuos_data_t* result = NULL;
+adc_continuous_data_t* result = NULL;
 
 // ISR Function that will be triggered when ADC conversion is done
 void ARDUINO_ISR_ATTR adcComplete() {

libraries/Network/src/NetworkEvents.cpp

@@ -319,16 +319,14 @@ const char *NetworkEvents::eventName(arduino_event_id_t id) {
     case ARDUINO_EVENT_ETH_DISCONNECTED: return "ETH_DISCONNECTED";
     case ARDUINO_EVENT_ETH_GOT_IP: return "ETH_GOT_IP";
     case ARDUINO_EVENT_ETH_LOST_IP: return "ETH_LOST_IP";
-    case ARDUINO_EVENT_ETH_GOT_IP6:
-      return "ETH_GOT_IP6";
-
-      // case ARDUINO_EVENT_PPP_START: return "PPP_START";
-      // case ARDUINO_EVENT_PPP_STOP: return "PPP_STOP";
-      // case ARDUINO_EVENT_PPP_CONNECTED: return "PPP_CONNECTED";
-      // case ARDUINO_EVENT_PPP_DISCONNECTED: return "PPP_DISCONNECTED";
-      // case ARDUINO_EVENT_PPP_GOT_IP: return "PPP_GOT_IP";
-      // case ARDUINO_EVENT_PPP_LOST_IP: return "PPP_LOST_IP";
-      // case ARDUINO_EVENT_PPP_GOT_IP6: return "PPP_GOT_IP6";
+    case ARDUINO_EVENT_ETH_GOT_IP6: return "ETH_GOT_IP6";
+    case ARDUINO_EVENT_PPP_START: return "PPP_START";
+    case ARDUINO_EVENT_PPP_STOP: return "PPP_STOP";
+    case ARDUINO_EVENT_PPP_CONNECTED: return "PPP_CONNECTED";
+    case ARDUINO_EVENT_PPP_DISCONNECTED: return "PPP_DISCONNECTED";
+    case ARDUINO_EVENT_PPP_GOT_IP: return "PPP_GOT_IP";
+    case ARDUINO_EVENT_PPP_LOST_IP: return "PPP_LOST_IP";
+    case ARDUINO_EVENT_PPP_GOT_IP6: return "PPP_GOT_IP6";
 #if SOC_WIFI_SUPPORTED
     case ARDUINO_EVENT_WIFI_OFF: return "WIFI_OFF";
     case ARDUINO_EVENT_WIFI_READY: return "WIFI_READY";

libraries/Network/src/NetworkEvents.h

@@ -78,13 +78,13 @@ typedef enum {
   ARDUINO_EVENT_PROV_CRED_FAIL,
   ARDUINO_EVENT_PROV_CRED_SUCCESS,
 #endif
-  // ARDUINO_EVENT_PPP_START,
-  // ARDUINO_EVENT_PPP_STOP,
-  // ARDUINO_EVENT_PPP_CONNECTED,
-  // ARDUINO_EVENT_PPP_DISCONNECTED,
-  // ARDUINO_EVENT_PPP_GOT_IP,
-  // ARDUINO_EVENT_PPP_LOST_IP,
-  // ARDUINO_EVENT_PPP_GOT_IP6,
+  ARDUINO_EVENT_PPP_START,
+  ARDUINO_EVENT_PPP_STOP,
+  ARDUINO_EVENT_PPP_CONNECTED,
+  ARDUINO_EVENT_PPP_DISCONNECTED,
+  ARDUINO_EVENT_PPP_GOT_IP,
+  ARDUINO_EVENT_PPP_LOST_IP,
+  ARDUINO_EVENT_PPP_GOT_IP6,
   ARDUINO_EVENT_MAX
 } arduino_event_id_t;
 
@@ -146,6 +146,7 @@ class NetworkEvents {
 
   friend class ESP_NetworkInterface;
   friend class ETHClass;
+  friend class PPPClass;
 #if SOC_WIFI_SUPPORTED
   friend class STAClass;
   friend class APClass;