Merge branch 'espressif:master' into master

Author: DogushC

.github/scripts/sketch_utils.sh

@@ -117,26 +117,27 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
     #  3. Created at the sketch level as "buildX" where X is the number
     #     of configuration built in case of a multiconfiguration test.
 
+    sketchname=$(basename $sketchdir)
+    
     ARDUINO_CACHE_DIR="$HOME/.arduino/cache.tmp"
     if [ -n "$ARDUINO_BUILD_DIR" ]; then
         build_dir="$ARDUINO_BUILD_DIR"
     elif [ $len -eq 1 ]; then
         # build_dir="$sketchdir/build"
-        build_dir="$HOME/.arduino/build.tmp"
+        build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
     fi
 
     mkdir -p "$ARDUINO_CACHE_DIR"
     for i in `seq 0 $(($len - 1))`
     do
         if [ $len -ne 1 ]; then
           # build_dir="$sketchdir/build$i"
-          build_dir="$HOME/.arduino/build$i.tmp"
+          build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
         fi
         rm -rf $build_dir
         mkdir -p $build_dir
 
         currfqbn=`echo $fqbn | jq -r --argjson i $i '.[$i]'`
-        sketchname=$(basename $sketchdir)
 
         if [ -f "$ide_path/arduino-cli" ]; then
             echo "Building $sketchname with arduino-cli and FQBN=$currfqbn"
@@ -152,6 +153,7 @@ function build_sketch(){ # build_sketch <ide_path> <user_path> <path-to-ino> [ex
                 $xtra_opts "${sketchdir}"
         elif [ -f "$ide_path/arduino-builder" ]; then
             echo "Building $sketchname with arduino-builder and FQBN=$currfqbn"
+            echo "Build path = $build_dir"
 
             $ide_path/arduino-builder -compile -logger=human -core-api-version=10810 \
                 -fqbn=\"$currfqbn\" \

.github/scripts/tests_run.sh

@@ -15,7 +15,8 @@ function run_test() {
     fi
 
     if [ $len -eq 1 ]; then
-      build_dir="tests/$sketchname/build"
+      # build_dir="tests/$sketchname/build"
+      build_dir="$HOME/.arduino/tests/$sketchname/build.tmp"
       report_file="tests/$sketchname/$sketchname.xml"
     fi
 
@@ -27,7 +28,8 @@ function run_test() {
         fi
 
         if [ $len -ne 1 ]; then
-            build_dir="tests/$sketchname/build$i"
+            # build_dir="tests/$sketchname/build$i"
+            build_dir="$HOME/.arduino/tests/$sketchname/build$i.tmp"
             report_file="tests/$sketchname/$sketchname$i.xml"
         fi
 

.github/workflows/hil.yml

@@ -39,7 +39,7 @@ jobs:
           set -e
           rm sketches.txt
           CHUNKS=$(jq -c -n '$ARGS.positional' --args `seq 0 1 $((sketches - 1))`)
-          echo "::set-output name=chunks::${CHUNKS}"
+          echo "chunks=${CHUNKS}" >>$GITHUB_OUTPUT
 
   Build:
     needs: gen_chunks
@@ -49,21 +49,20 @@ jobs:
       matrix:
         chip: ['esp32', 'esp32s2', 'esp32s3', 'esp32c3']
         chunks: ${{fromJson(needs.gen_chunks.outputs.chunks)}}
-
     steps:
       - name: Checkout Repository
         uses: actions/checkout@v3
-
       - name: Build sketches
         run: |
           bash .github/scripts/tests_build.sh -c -t ${{matrix.chip}} -i ${{matrix.chunks}} -m ${{env.MAX_CHUNKS}}
       - name: Upload ${{matrix.chip}}-${{matrix.chunks}} artifacts
-        uses: actions/upload-artifact@v2
+        uses: actions/upload-artifact@v3
         with:
           name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
           path: |
-             tests/*/build*/*.bin
-             tests/*/build*/*.json
+             ~/.arduino/tests/*/build*.tmp/*.bin
+             ~/.arduino/tests/*/build*.tmp/*.json
+          if-no-files-found: error
   Test:
     needs: [gen_chunks, Build]
     name: ${{matrix.chip}}-Test#${{matrix.chunks}}
@@ -87,10 +86,10 @@ jobs:
          uses: actions/checkout@v3
 
        - name: Download ${{matrix.chip}}-${{matrix.chunks}} artifacts
-         uses: actions/download-artifact@v2
+         uses: actions/download-artifact@v3
          with:
            name: ${{matrix.chip}}-${{matrix.chunks}}.artifacts
-           path: tests/
+           path: ~/.arduino/tests/
 
        - name: Install dependencies
          run: |
@@ -103,7 +102,7 @@ jobs:
            bash .github/scripts/tests_run.sh -c -t ${{matrix.chip}} -i ${{matrix.chunks}} -m ${{env.MAX_CHUNKS}} -e
 
        - name: Upload test result artifacts
-         uses: actions/upload-artifact@v2
+         uses: actions/upload-artifact@v3
          if: always()
          with:
            name: test_results-${{matrix.chip}}-${{matrix.chunks}}
@@ -118,7 +117,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
        - name: Upload
-         uses: actions/upload-artifact@v2
+         uses: actions/upload-artifact@v3
          with:
            name: Event File
            path: ${{github.event_path}}

.github/workflows/lib.json

@@ -1,7 +1,6 @@
 [
     {
         "name": "Adafruit NeoPixel",
-        "version": "1.10.6",
         "exclude_targets": [],
         "sketch_path": [
             "~/Arduino/libraries/Adafruit_NeoPixel/examples/strandtest/strandtest.ino"

.github/workflows/lib.yml

@@ -72,23 +72,6 @@ jobs:
           name: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}
           path: ${{ env.SKETCHES_REPORTS_PATH }}
 
-  report-comment:
-    needs: compile-sketch  # Wait for the compile job to finish to get the data for the report
-    if: github.event_name == 'pull_request' # Only run the job when the workflow is triggered by a pull request
-    runs-on: ubuntu-latest
-    steps:
-      # This step is needed to get the size data produced by the compile jobs
-      - name: Download sketches reports artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ env.SKETCHES_REPORTS_ARTIFACT_NAME }}
-          path: ${{ env.SKETCHES_REPORTS_PATH }}
-
-      - name: Report results
-        uses: P-R-O-C-H-Y/report-size-deltas@main
-        with:
-          sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
-
   report-to-file:
     needs: compile-sketch  # Wait for the compile job to finish to get the data for the report
     if: github.event_name == 'schedule' # Only run the job when the workflow is triggered by a schedule
@@ -126,3 +109,16 @@ jobs:
           git add ${{ env.RESULT_LIBRARY_TEST_FILE }}
           git commit -m "Generated External Libraries Test Results"
           git push
+
+  event_file:
+    name: "Event File"
+    if: |
+      contains(github.event.pull_request.labels.*.name, 'lib_test')
+    needs: compile-sketch
+    runs-on: ubuntu-latest
+    steps:
+       - name: Upload
+         uses: actions/upload-artifact@v2
+         with:
+           name: Event File
+           path: ${{github.event_path}}

.github/workflows/publishlib.yml

@@ -0,0 +1,41 @@
+name: External Libraries Results
+
+on:
+  workflow_run:
+    workflows: [External Libraries Test]
+    types:
+      - completed
+
+  workflow_dispatch:
+env:
+  # It's convenient to set variables for values used multiple times in the workflow
+  SKETCHES_REPORTS_PATH: artifacts/libraries-report
+  GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}}
+  PR_EVENT_PATH: artifacts/Event File/event.json
+
+jobs:
+  lib-test-results:
+    name: External Libraries Test Results
+    runs-on: ubuntu-latest
+    if: |
+      github.event.workflow_run.event == 'pull_request' &&
+      github.event.workflow_run.conclusion == 'success'
+
+    steps:
+      - name: Download and Extract Artifacts
+        run: |
+          mkdir -p artifacts && cd artifacts
+          artifacts_url=${{ github.event.workflow_run.artifacts_url }}
+          gh api "$artifacts_url" -q '.artifacts[] | [.name, .archive_download_url] | @tsv' | while read artifact
+          do
+            IFS=$'\t' read name url <<< "$artifact"
+            gh api $url > "$name.zip"
+            unzip -d "$name" "$name.zip"
+          done
+    
+      - name: Report results
+        uses: P-R-O-C-H-Y/report-size-deltas@main
+        with:
+          sketches-reports-source: ${{ env.SKETCHES_REPORTS_PATH }}
+          github-token: ${{ env.GITHUB_TOKEN }}
+          pr-event-path: ${{ env.PR_EVENT_PATH }}

cores/esp32/Print.cpp

@@ -74,11 +74,6 @@ size_t Print::printf(const char *format, ...)
     return len;
 }
 
-size_t Print::print(const __FlashStringHelper *ifsh)
-{
-    return print(reinterpret_cast<const char *>(ifsh));
-}
-
 size_t Print::print(const String &s)
 {
     return write(s.c_str(), s.length());
@@ -152,13 +147,6 @@ size_t Print::print(double n, int digits)
     return printFloat(n, digits);
 }
 
-size_t Print::println(const __FlashStringHelper *ifsh)
-{
-    size_t n = print(ifsh);
-    n += println();
-    return n;
-}
-
 size_t Print::print(const Printable& x)
 {
     return x.printTo(*this);

cores/esp32/Print.h

@@ -78,7 +78,7 @@ class Print
     // default to zero, meaning "a single write may block"
     // should be overriden by subclasses with buffering
     virtual int availableForWrite() { return 0; }
-    size_t print(const __FlashStringHelper *);
+    size_t print(const __FlashStringHelper *ifsh) { return print(reinterpret_cast<const char *>(ifsh)); }
     size_t print(const String &);
     size_t print(const char[]);
     size_t print(char);
@@ -93,7 +93,7 @@ class Print
     size_t print(const Printable&);
     size_t print(struct tm * timeinfo, const char * format = NULL);
 
-    size_t println(const __FlashStringHelper *);
+    size_t println(const __FlashStringHelper *ifsh) { return println(reinterpret_cast<const char *>(ifsh)); }
     size_t println(const String &s);
     size_t println(const char[]);
     size_t println(char);

cores/esp32/WString.cpp

@@ -47,11 +47,6 @@ String::String(const String &value) {
     *this = value;
 }
 
-String::String(const __FlashStringHelper *pstr) {
-    init();
-    *this = pstr; // see operator =
-}
-
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 String::String(String &&rval) {
     init();
@@ -235,16 +230,6 @@ String & String::copy(const char *cstr, unsigned int length) {
     return *this;
 }
 
-String & String::copy(const __FlashStringHelper *pstr, unsigned int length) {
-    if (!reserve(length)) {
-        invalidate();
-        return *this;
-    }
-    memcpy_P(wbuffer(), (PGM_P)pstr, length + 1); // We know wbuffer() cannot ever be in PROGMEM, so memcpy safe here
-    setLen(length);
-    return *this;
-}
-
 #ifdef __GXX_EXPERIMENTAL_CXX0X__
 void String::move(String &rhs) {
     if(buffer()) {
@@ -308,15 +293,6 @@ String & String::operator =(const char *cstr) {
     return *this;
 }
 
-String & String::operator =(const __FlashStringHelper *pstr) {
-    if(pstr)
-        copy(pstr, strlen_P((PGM_P)pstr));
-    else
-        invalidate();
-
-    return *this;
-}
-
 /*********************************************/
 /*  concat                                   */
 /*********************************************/
@@ -424,20 +400,6 @@ bool String::concat(double num) {
     return concat(string, strlen(string));
 }
 
-bool String::concat(const __FlashStringHelper * str) {
-    if (!str)
-        return false;
-    int length = strlen_P((PGM_P)str);
-    if (length == 0)
-        return true;
-    unsigned int newlen = len() + length;
-    if (!reserve(newlen))
-        return false;
-    memcpy_P(wbuffer() + len(), (PGM_P)str, length + 1);
-    setLen(newlen);
-    return true;
-}
-
 /*********************************************/
 /*  Concatenate                              */
 /*********************************************/
@@ -526,14 +488,6 @@ StringSumHelper & operator +(const StringSumHelper &lhs, unsigned long long num)
     return a;
 }
 
-StringSumHelper & operator + (const StringSumHelper &lhs, const __FlashStringHelper *rhs)
-{
-    StringSumHelper &a = const_cast<StringSumHelper&>(lhs);
-    if (!a.concat(rhs))
-        a.invalidate();
-    return a;
-}
-
 /*********************************************/
 /*  Comparison                               */
 /*********************************************/