From 8e3cdf0ee7da580ded71d804412186ee0e1f57a8 Mon Sep 17 00:00:00 2001 From: Jason2866 Date: Wed, 23 Jul 2025 18:02:58 +0200 Subject: [PATCH] more merge error fixes --- examples/arduino-NimBLE-ext_client/README.md | 6 +- .../arduino-NimBLE-ext_client/platformio.ini | 13 +- .../src/NimBLE_extended_client.ino | 150 -------------- examples/arduino-blink/.gitignore | 1 - examples/arduino-matter-light/src/.gitignore | 5 - examples/arduino-rmt-blink/platformio.ini | 7 + examples/arduino-usb-keyboard/.gitignore | 1 - examples/arduino-wifiscan/.gitignore | 1 - .../espidf-arduino-C6-ULP-blink/.gitignore | 5 - examples/espidf-arduino-blink/.gitignore | 1 - examples/espidf-arduino-littlefs/.gitignore | 2 - examples/espidf-arduino-wifiscan/.gitignore | 1 - examples/espidf-blink/.gitignore | 1 - examples/espidf-coap-server/.gitignore | 1 - .../.github/ISSUE_TEMPLATE/bug_report.md | 112 ---------- .../libcoap/.github/ISSUE_TEMPLATE/config.yml | 14 -- .../.github/ISSUE_TEMPLATE/feature_request.md | 26 --- .../libcoap/.github/workflows/main.yml | 196 ------------------ .../components/libcoap/.gitignore | 116 ----------- .../components/libcoap/.gitmodules | 4 - .../components/libcoap/.travis.yml | 70 ------- .../libcoap/build-env/.dockerignore | 5 - .../libcoap/examples/contiki/.gitignore | 7 - .../libcoap/examples/lwip/.gitignore | 7 - examples/espidf-exceptions/.gitignore | 1 - examples/espidf-hello-world/.gitignore | 1 - examples/espidf-http-request/.gitignore | 1 - examples/espidf-peripherals-uart/.gitignore | 1 - examples/espidf-peripherals-usb/.gitignore | 1 - examples/espidf-storage-sdcard/.gitignore | 1 - 30 files changed, 10 insertions(+), 748 deletions(-) delete mode 100644 examples/arduino-NimBLE-ext_client/src/NimBLE_extended_client.ino delete mode 100644 examples/arduino-blink/.gitignore delete mode 100644 examples/arduino-matter-light/src/.gitignore delete mode 100644 examples/arduino-usb-keyboard/.gitignore delete mode 100644 examples/arduino-wifiscan/.gitignore delete mode 100644 examples/espidf-arduino-C6-ULP-blink/.gitignore delete mode 100644 examples/espidf-arduino-blink/.gitignore delete mode 100644 examples/espidf-arduino-littlefs/.gitignore delete mode 100644 examples/espidf-arduino-wifiscan/.gitignore delete mode 100644 examples/espidf-blink/.gitignore delete mode 100644 examples/espidf-coap-server/.gitignore delete mode 100644 examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/bug_report.md delete mode 100644 examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/config.yml delete mode 100644 examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/feature_request.md delete mode 100644 examples/espidf-coap-server/components/libcoap/.github/workflows/main.yml delete mode 100644 examples/espidf-coap-server/components/libcoap/.gitignore delete mode 100644 examples/espidf-coap-server/components/libcoap/.gitmodules delete mode 100644 examples/espidf-coap-server/components/libcoap/.travis.yml delete mode 100644 examples/espidf-coap-server/components/libcoap/build-env/.dockerignore delete mode 100644 examples/espidf-coap-server/components/libcoap/examples/contiki/.gitignore delete mode 100644 examples/espidf-coap-server/components/libcoap/examples/lwip/.gitignore delete mode 100644 examples/espidf-exceptions/.gitignore delete mode 100644 examples/espidf-hello-world/.gitignore delete mode 100644 examples/espidf-http-request/.gitignore delete mode 100644 examples/espidf-peripherals-uart/.gitignore delete mode 100644 examples/espidf-peripherals-usb/.gitignore delete mode 100644 examples/espidf-storage-sdcard/.gitignore diff --git a/examples/arduino-NimBLE-ext_client/README.md b/examples/arduino-NimBLE-ext_client/README.md index be15da9..1935cd3 100644 --- a/examples/arduino-NimBLE-ext_client/README.md +++ b/examples/arduino-NimBLE-ext_client/README.md @@ -1,5 +1 @@ -# NimBLE_extended_client example using h2zero Arduino NimBLE stack - -BLE 5 client example, using the great [h2zero NimBLE](https://github.com/h2zero/NimBLE-Arduino) implementation. - -Thx @h2zero for the great BLE library. +# NimBLE Sample Scan example diff --git a/examples/arduino-NimBLE-ext_client/platformio.ini b/examples/arduino-NimBLE-ext_client/platformio.ini index 0991425..75f8004 100644 --- a/examples/arduino-NimBLE-ext_client/platformio.ini +++ b/examples/arduino-NimBLE-ext_client/platformio.ini @@ -12,15 +12,6 @@ platform = espressif32 framework = arduino monitor_speed = 115200 -build_flags = - '-DCONFIG_BT_NIMBLE_EXT_ADV=1' -lib_deps = - https://github.com/h2zero/NimBLE-Arduino -lib_ignore = - BLE - BluetoothSerial - SimpleBLE - WiFiProv custom_component_remove = espressif/esp_hosted espressif/esp_wifi_remote @@ -40,8 +31,8 @@ custom_component_remove = [env:esp32s3] board = esp32-s3-devkitc-1 -[env:esp32c2] -board = esp32-c2-devkitm-1 +;[env:esp32c2] +;board = esp32-c2-devkitm-1 [env:esp32c3] board = esp32-c3-devkitm-1 diff --git a/examples/arduino-NimBLE-ext_client/src/NimBLE_extended_client.ino b/examples/arduino-NimBLE-ext_client/src/NimBLE_extended_client.ino deleted file mode 100644 index 5062d40..0000000 --- a/examples/arduino-NimBLE-ext_client/src/NimBLE_extended_client.ino +++ /dev/null @@ -1,150 +0,0 @@ - -/** NimBLE Extended Client Demo: - * - * Demonstrates the Bluetooth 5.x client capabilities. - * - * Created: on April 2 2022 - * Author: H2zero - * - */ - -#include -#include -#if !CONFIG_BT_NIMBLE_EXT_ADV -# error Must enable extended advertising, see nimconfig.h file. -#endif - -#define SERVICE_UUID "ABCD" -#define CHARACTERISTIC_UUID "1234" - -static const NimBLEAdvertisedDevice* advDevice; -static bool doConnect = false; -static uint32_t scanTime = 10 * 1000; // In milliseconds, 0 = scan forever - -/** Define the PHY's to use when connecting to peer devices, can be 1, 2, or all 3 (default).*/ -static uint8_t connectPhys = BLE_GAP_LE_PHY_CODED_MASK | BLE_GAP_LE_PHY_1M_MASK /*| BLE_GAP_LE_PHY_2M_MASK */; - -/** Define a class to handle the callbacks for client connection events */ -class ClientCallbacks : public NimBLEClientCallbacks { - void onConnect(NimBLEClient* pClient) override { Serial.printf("Connected\n"); }; - - void onDisconnect(NimBLEClient* pClient, int reason) override { - Serial.printf("%s Disconnected, reason = %d - Starting scan\n", pClient->getPeerAddress().toString().c_str(), reason); - NimBLEDevice::getScan()->start(scanTime); - } -} clientCallbacks; - -/** Define a class to handle the callbacks when advertisements are received */ -class scanCallbacks : public NimBLEScanCallbacks { - void onResult(const NimBLEAdvertisedDevice* advertisedDevice) override { - Serial.printf("Advertised Device found: %s\n", advertisedDevice->toString().c_str()); - if (advertisedDevice->isAdvertisingService(NimBLEUUID("ABCD"))) { - Serial.printf("Found Our Service\n"); - doConnect = true; - /** Save the device reference in a global for the client to use*/ - advDevice = advertisedDevice; - /** stop scan before connecting */ - NimBLEDevice::getScan()->stop(); - } - } - - /** Callback to process the results of the completed scan or restart it */ - void onScanEnd(const NimBLEScanResults& results, int rc) override { Serial.printf("Scan Ended\n"); } -} scanCallbacks; - -/** Handles the provisioning of clients and connects / interfaces with the server */ -bool connectToServer() { - NimBLEClient* pClient = nullptr; - - pClient = NimBLEDevice::createClient(); - pClient->setClientCallbacks(&clientCallbacks, false); - - /** - * Set the PHY's to use for this connection. This is a bitmask that represents the PHY's: - * * 0x01 BLE_GAP_LE_PHY_1M_MASK - * * 0x02 BLE_GAP_LE_PHY_2M_MASK - * * 0x04 BLE_GAP_LE_PHY_CODED_MASK - * Combine these with OR ("|"), eg BLE_GAP_LE_PHY_1M_MASK | BLE_GAP_LE_PHY_2M_MASK | BLE_GAP_LE_PHY_CODED_MASK; - */ - pClient->setConnectPhy(connectPhys); - - /** Set how long we are willing to wait for the connection to complete (milliseconds), default is 30000. */ - pClient->setConnectTimeout(10 * 1000); - - if (!pClient->connect(advDevice)) { - /** Created a client but failed to connect, don't need to keep it as it has no data */ - NimBLEDevice::deleteClient(pClient); - Serial.printf("Failed to connect, deleted client\n"); - return false; - } - - Serial.printf("Connected to: %s RSSI: %d\n", pClient->getPeerAddress().toString().c_str(), pClient->getRssi()); - - /** Now we can read/write/subscribe the characteristics of the services we are interested in */ - NimBLERemoteService* pSvc = nullptr; - NimBLERemoteCharacteristic* pChr = nullptr; - - pSvc = pClient->getService(SERVICE_UUID); - if (pSvc) { - pChr = pSvc->getCharacteristic(CHARACTERISTIC_UUID); - if (pChr) { - if (pChr->canRead()) { - std::string value = pChr->readValue(); - Serial.printf("Characteristic value: %s\n", value.c_str()); - } - } - - } else { - Serial.printf("ABCD service not found.\n"); - } - - NimBLEDevice::deleteClient(pClient); - Serial.printf("Done with this device!\n"); - return true; -} - -void setup() { - Serial.begin(115200); - Serial.printf("Starting NimBLE Client\n"); - - /** Initialize NimBLE and set the device name */ - NimBLEDevice::init("NimBLE Extended Client"); - - /** Create aNimBLE Scan instance and set the callbacks for scan events */ - NimBLEScan* pScan = NimBLEDevice::getScan(); - pScan->setScanCallbacks(&scanCallbacks); - - /** Set scan interval (how often) and window (how long) in milliseconds */ - pScan->setInterval(97); - pScan->setWindow(67); - - /** - * Active scan will gather scan response data from advertisers - * but will use more energy from both devices - */ - pScan->setActiveScan(true); - - /** - * Start scanning for advertisers for the scan time specified (in milliseconds) 0 = forever - * Optional callback for when scanning stops. - */ - pScan->start(scanTime); - - Serial.printf("Scanning for peripherals\n"); -} - -void loop() { - /** Loop here until we find a device we want to connect to */ - if (doConnect) { - if (connectToServer()) { - Serial.printf("Success!, scanning for more!\n"); - } else { - Serial.printf("Failed to connect, starting scan\n"); - } - - doConnect = false; - NimBLEDevice::getScan()->start(scanTime); - } - - delay(10); -} diff --git a/examples/arduino-blink/.gitignore b/examples/arduino-blink/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/arduino-blink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/arduino-matter-light/src/.gitignore b/examples/arduino-matter-light/src/.gitignore deleted file mode 100644 index 89cc49c..0000000 --- a/examples/arduino-matter-light/src/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.pio -.vscode/.browse.c_cpp.db* -.vscode/c_cpp_properties.json -.vscode/launch.json -.vscode/ipch diff --git a/examples/arduino-rmt-blink/platformio.ini b/examples/arduino-rmt-blink/platformio.ini index c40a21b..699eef9 100644 --- a/examples/arduino-rmt-blink/platformio.ini +++ b/examples/arduino-rmt-blink/platformio.ini @@ -28,6 +28,13 @@ lib_ignore = wifi build_flags = -DBUILTIN_RGBLED_PIN=8 -DNR_OF_LEDS=1 +[env:esp32-c5] +platform = espressif32 +framework = arduino +board = esp32-c5-devkitc-1 +build_flags = -DBUILTIN_RGBLED_PIN=27 + -DNR_OF_LEDS=1 + [env:esp32-c6] platform = espressif32 framework = arduino diff --git a/examples/arduino-usb-keyboard/.gitignore b/examples/arduino-usb-keyboard/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/arduino-usb-keyboard/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/arduino-wifiscan/.gitignore b/examples/arduino-wifiscan/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/arduino-wifiscan/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-arduino-C6-ULP-blink/.gitignore b/examples/espidf-arduino-C6-ULP-blink/.gitignore deleted file mode 100644 index 6bdd733..0000000 --- a/examples/espidf-arduino-C6-ULP-blink/.gitignore +++ /dev/null @@ -1,5 +0,0 @@ -.pio -.vscode -.dependencies.lock -sdkconfig.esp32c6 -managed_components diff --git a/examples/espidf-arduino-blink/.gitignore b/examples/espidf-arduino-blink/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-arduino-blink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-arduino-littlefs/.gitignore b/examples/espidf-arduino-littlefs/.gitignore deleted file mode 100644 index b9f3806..0000000 --- a/examples/espidf-arduino-littlefs/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.pio -.vscode diff --git a/examples/espidf-arduino-wifiscan/.gitignore b/examples/espidf-arduino-wifiscan/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-arduino-wifiscan/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-blink/.gitignore b/examples/espidf-blink/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-blink/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-coap-server/.gitignore b/examples/espidf-coap-server/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-coap-server/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/bug_report.md b/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/bug_report.md deleted file mode 100644 index 7e8447a..0000000 --- a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/bug_report.md +++ /dev/null @@ -1,112 +0,0 @@ ---- -name: Bug report -about: libcoap crashes, produces incorrect output, or has incorrect behavior -title: '' -labels: '' -assignees: '' - ---- - ------------------------------ Delete Below ----------------------------- - -INSTRUCTIONS -============ - -Before submitting a new issue, please follow the checklist and try to find the -answer. - -- [ ] I have read the documentation [libcoap Modules Documentation](https://libcoap.net/doc/reference/develop/modules.html) -and the issue is not addressed there. -- [ ] I have read the documentation [libcoap Manual Pages](https://libcoap.net/doc/reference/develop/manpage.html) -and the issue is not addressed there. -- [ ] I have updated my libcoap branch (develop) to the latest version and -checked that the issue is present there. -- [ ] I have searched the [Issue Tracker](https://github.com/obgm/libcoap/issues) -(both open and closed - overwrite `is:issue is:open`) for a similar issue and -not found a similar issue. -- [ ] I have checked the [Wiki](https://github.com/obgm/libcoap/wiki) to see if -the issue is reported there. -- [ ] I have read the HOWTOs provided with the source. -- [ ] I have read the [BUILDING](https://raw.githubusercontent.com/obgm/libcoap/develop/BUILDING) -on how to build from source. - -If the issue cannot be solved after checking through the steps above, please -follow these instructions so we can get the needed information to help you in a -quick and effective fashion. - -1. Fill in all the fields under **Environment** marked with [ ] by picking the -correct option for you in each case and deleting the others. -2. Describe your problem. -3. Include any debug logs (running the application with verbose logging). -4. Providing as much information as possible under **Other items if possible** -will help us locate and fix the problem. -5. Use [Markdown](https://guides.github.com/features/mastering-markdown/) (see -formatting buttons above) and the Preview tab to check what the issue will look -like. -6. Delete these instructions from the `Delete Below` to the `Delete Above` -marker lines before submitting this issue. - -**IMPORTANT: If you do not follow these instructions and provide the necessary -details, it may not be possible to resolve your issue.** - ------------------------------ Delete Above ----------------------------- - -## Environment - -- libcoap version (run ``git describe --tags`` to find it): - - // v4.3.0-rc3-41-g25fe796 -- Build System: [Make|CMake] -- Operating System: [Windows|Linux|macOS|FreeBSD|Cygwin|Solaris|RIOT|Other (which?)] -- Operating System Version: [ ] -- Hosted Environment: [None|Contiki|LwIP|ESP-IDF|Other (which?)] - -## Problem Description - -// Detailed problem description goes here. - -### Expected Behavior - -// Describe what you are expecting. - -### Actual Behavior - -// Describe what you are seeing. - -### Steps to reproduce - -1. step1 -2. ... - - -### Code to reproduce this issue - -```cpp -// the code should be wrapped in the ```cpp tag so that it will be displayed -better. -#include "coap3/coap.h" - -void main() -{ - -} - -``` -// If your code is longer than 30 lines, upload it as an attachment. Do not -include code that is proprietary or sensitive for your project. Try to reduce -your code as much as possible so that it only demonstrates the issue. - -## Debug Logs - -``` -Debug verbose logs go here. -Please copy the plain text here for us to search the error log. Or attach the -complete logs but leave the main part here if the log is *too* long. -``` - -## Other items if possible - -- [ ] Does what you are trying to do work under any configuration. Detail what -works. -- [ ] Network configuration that is not straightforward. Detail any networking -that may have NAT or firewalls that might affect what is going on. diff --git a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/config.yml b/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/config.yml deleted file mode 100644 index 94f905f..0000000 --- a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/config.yml +++ /dev/null @@ -1,14 +0,0 @@ -blank_issues_enabled: false -contact_links: - - name: General libcoap Information - url: https://libcoap.net/ - about: General information about libcoap - - name: General libcoap Documentation - url: https://libcoap.net/documentation.html - about: Documentation information for libcoap - - name: Latest libcoap API Documentation - url: https://libcoap.net/doc/reference/develop/modules.html - about: Latest API information for libcoap - - name: Latest libcoap Manual Pages - url: https://libcoap.net/doc/reference/develop/manpage.html - about: Latest Manual Pages and Examples for libcoap diff --git a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/feature_request.md b/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/feature_request.md deleted file mode 100644 index d96b521..0000000 --- a/examples/espidf-coap-server/components/libcoap/.github/ISSUE_TEMPLATE/feature_request.md +++ /dev/null @@ -1,26 +0,0 @@ ---- -name: Feature request -about: Suggest an idea for libcoap -title: '' -labels: 'Type: Feature Request' -assignees: '' - ---- - -**Is your feature request related to a problem? Please describe.** - -A clear and concise description of what the problem is. E.g. I'm always frustrated when [...] - -**Describe the solution you'd like** - -A clear and concise description of what you want to happen. - -**Describe alternatives you've considered** - -A clear and concise description of any alternative solutions or features you've considered. - -Please give as many details as you can. Include suggestions for useful APIs or interfaces if relevant. - -**Additional context** - -Add any other context or screenshots about the feature request here. diff --git a/examples/espidf-coap-server/components/libcoap/.github/workflows/main.yml b/examples/espidf-coap-server/components/libcoap/.github/workflows/main.yml deleted file mode 100644 index 0862f7c..0000000 --- a/examples/espidf-coap-server/components/libcoap/.github/workflows/main.yml +++ /dev/null @@ -1,196 +0,0 @@ -name: Build Tests - -on: - push: - branches: - - main - - develop - - release-* - - gh-workflows - pull_request: - branches: - - main - - develop - -env: - PLATFORM: posix - TESTS: yes - OPENSSL_INSTALL_PATH: C:\Program Files\OpenSSL-Win64\ - -jobs: - build-linux: - runs-on: ubuntu-latest - strategy: - matrix: - CC: ["gcc", "clang"] - TLS: ["no", "openssl", "gnutls", "mbedtls"] - steps: - - uses: actions/checkout@v2 - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libcunit1-dev libmbedtls-dev libgnutls28-dev libtool libtool-bin exuberant-ctags valgrind - ./autogen.sh - - name: configure no-TLS - if: matrix.TLS == 'no' - run: | - mkdir build-${{matrix.TLS}}-${{matrix.CC}} - cd build-${{matrix.TLS}}-${{matrix.CC}} - $GITHUB_WORKSPACE/configure --disable-silent-rules --disable-documentation --enable-examples --enable-tests --disable-dtls CC=${{matrix.CC}} - - name: configure TLS - if: matrix.TLS != 'no' - run: | - mkdir build-${{matrix.TLS}}-${{matrix.CC}} - cd build-${{matrix.TLS}}-${{matrix.CC}} - "$GITHUB_WORKSPACE/configure" --disable-silent-rules --disable-documentation --enable-examples --enable-tests --with-${{matrix.TLS}} CC=${{matrix.CC}} - - name: compile - run: | - cd build-${{matrix.TLS}}-${{matrix.CC}} - make EXTRA_CFLAGS=-Werror && make check EXTRA_CFLAGS=-Werror - - name: test - run: | - cd build-${{matrix.TLS}}-${{matrix.CC}} - libtool --mode=execute valgrind --track-origins=yes --leak-check=yes --show-reachable=yes --error-exitcode=123 --quiet --suppressions=$GITHUB_WORKSPACE/tests/valgrind_suppression tests/testdriver - tinydtls-build: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libcunit1-dev libtool libtool-bin exuberant-ctags valgrind - ./autogen.sh - - name: configure - run: | - $GITHUB_WORKSPACE/configure --disable-silent-rules --disable-documentation --enable-examples --enable-tests --with-tinydtls - - name: compile - run: | - make EXTRA_CFLAGS=-Werror && make check EXTRA_CFLAGS=-Werror - - name: test - run: | - LD_LIBRARY_PATH=ext/tinydtls libtool --mode=execute valgrind --track-origins=yes --leak-check=yes --show-reachable=yes --error-exitcode=123 --quiet --suppressions=$GITHUB_WORKSPACE/tests/valgrind_suppression tests/testdriver - cmake-build: - runs-on: ubuntu-latest - strategy: - matrix: - TLS: ["no", "openssl", "gnutls", "mbedtls", "tinydtls"] - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libcunit1-dev libmbedtls-dev libgnutls28-dev - cmake -E make_directory $GITHUB_WORKSPACE}/build-${{matrix.TLS}}-cmake - - name: configure no-TLS - if: matrix.TLS == 'no' - run: | - cd $GITHUB_WORKSPACE}/build-${{matrix.TLS}}-cmake - cmake $GITHUB_WORKSPACE -DENABLE_EXAMPLES=ON -DENABLE_TESTS=ON -DENABLE_DTLS=OFF -DENABLE_DOCS=OFF - - name: configure TLS - if: matrix.TLS != 'no' - run: | - cd $GITHUB_WORKSPACE}/build-${{matrix.TLS}}-cmake - cmake $GITHUB_WORKSPACE -DENABLE_EXAMPLES=ON -DENABLE_TESTS=ON -DENABLE_DTLS=ON -DENABLE_DOCS=OFF -DDTLS_BACKEND=${{matrix.TLS}} - - name: build - run: | - cd $GITHUB_WORKSPACE}/build-${{matrix.TLS}}-cmake - cmake --build . - other-build: - runs-on: ubuntu-latest - strategy: - matrix: - OS: ["contiki", "lwip"] - steps: - - uses: actions/checkout@v2 - - name: setup - run: | - ./autogen.sh - - name: configure - run: | - $GITHUB_WORKSPACE/configure --disable-documentation --disable-examples --disable-tests --disable-dtls - - name: compile - run: | - make -C examples/${{matrix.OS}} - ms-build: - runs-on: windows-latest - - steps: - - uses: actions/checkout@v2 - - - name: Add MSBuild to PATH - uses: microsoft/setup-msbuild@v1 - - - name: Install OpenSSL on Windows (choco) - run: | - choco install openssl - shell: cmd - - - name: Build sln - shell: cmd - run: call .\scripts\msbuild.sln.cmd - - additional-tests: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libgnutls28-dev libtool libtool-bin exuberant-ctags - ./autogen.sh - - name: configure - run: ./configure --disable-tests --disable-documentation - - name: build - run: | - make - make -C tests/oss-fuzz -f Makefile.ci check clean - documentation: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libtool libtool-bin exuberant-ctags graphviz doxygen libxml2-utils xsltproc docbook-xml docbook-xsl asciidoc - ./autogen.sh - - name: configure - run: ./configure --disable-tests --enable-documentation --prefix $GITHUB_WORKSPACE/test-install - - name: manuals check - run: | - make -C man - - name: manual page examples check - run: | - man/examples-code-check man - - name: doxygen check - run: | - make -C doc - - name: installation check - run: | - make install && ls -lR $GITHUB_WORKSPACE/test-install - distribution: - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v2 - with: - submodules: recursive - - name: setup - run: | - sudo apt-get update && sudo apt-get install -y libcunit1-dev libtool libtool-bin exuberant-ctags graphviz doxygen libxml2-utils xsltproc docbook-xml docbook-xsl asciidoc - ./autogen.sh - - name: configure - run: | - mkdir build-dist - cd build-dist - $GITHUB_WORKSPACE/configure --enable-silent-rules --enable-documentation --enable-examples --disable-dtls - - name: build distribution - run: | - cd build-dist - make dist - - name: check distribution build - run: | - cd build-dist - $GITHUB_WORKSPACE/scripts/github_dist.sh - shell: bash diff --git a/examples/espidf-coap-server/components/libcoap/.gitignore b/examples/espidf-coap-server/components/libcoap/.gitignore deleted file mode 100644 index 65dde4b..0000000 --- a/examples/espidf-coap-server/components/libcoap/.gitignore +++ /dev/null @@ -1,116 +0,0 @@ -# .gitignore for libcoap - -# autosave files -*~ -\#*# - -# ignoring autogenerated files and directories by autoreconf -INSTALL -Makefile -Makefile.in -aclocal.m4 -ar-lib -autom4te.cache/ -coap_config.h -coap_config.h.in -compile -config.* -!config.yml -configure -debian/ -depcomp -install-sh -libcoap-*.tar.bz2 -libtool -ltmain.sh -m4/libtool.m4 -m4/ltoptions.m4 -m4/ltsugar.m4 -m4/ltversion.m4 -m4/lt~obsolete.m4 -missing -stamp-h1 - -# ignoring more files generated by the configure script or the make actions -.libs/ -libcoap*.la -libcoap*.pc -src/**/.deps/ -src/**/.dirstamp -src/**/.libs/ -src/**/*.o -src/**/*.lo -src/*.lo -src/*.o -src/.deps/ -src/.dirstamp -src/.libs/ -build/ - -# the doc/ folder -doc/Doxyfile -doc/Makefile.in -doc/docbook-xsl.css -doc/doxyfile.stamp -doc/doxygen_sqlite3.db -doc/DoxygenLayout.xml -doc/upgrade_*.html -doc/html/ -doc/man_html/ -doc/man_tmp/ - -# the man/ folder -man/docbook-xsl.css -man/examples-code-check -man/examples-code-check.exe -man/examples-code-check.o -man/Makefile -man/Makefile.in -man/tmp -man/.deps/ -man/*.html -man/*.txt -man/*.xml -man/*.3 -man/*.5 -man/*.7 - -# the examples/ folder -examples/.deps/ -examples/*.o -examples/coap-client -examples/coap-client-* -examples/coap-etsi_iot_01 -examples/coap-rd -examples/coap-rd-* -examples/coap-server -examples/coap-server-* -examples/coap-tiny -examples/*.exe - -# the include/ folder -include/coap3/coap.h - -# the tests/ folder -tests/.deps -tests/oss-fuzz/Makefile.ci -tests/testdriver -tests/*.o -tests/test_common.h - -# ctags - Sublime plugin -tags -.tags* -TAGS - -# ignore gcov-generated files -**/*.gcda -**/*.gcno -**/*.gcov - -# IDE files -CMakeLists.txt.user -/.vs/ -/out/ -/.vscode/ -/_build/ diff --git a/examples/espidf-coap-server/components/libcoap/.gitmodules b/examples/espidf-coap-server/components/libcoap/.gitmodules deleted file mode 100644 index fb96bfd..0000000 --- a/examples/espidf-coap-server/components/libcoap/.gitmodules +++ /dev/null @@ -1,4 +0,0 @@ -[submodule "ext/tinydtls"] - path = ext/tinydtls - url = https://github.com/eclipse/tinydtls.git - ignore = dirty diff --git a/examples/espidf-coap-server/components/libcoap/.travis.yml b/examples/espidf-coap-server/components/libcoap/.travis.yml deleted file mode 100644 index ec9e71d..0000000 --- a/examples/espidf-coap-server/components/libcoap/.travis.yml +++ /dev/null @@ -1,70 +0,0 @@ -os: - - linux - -language: c - -compiler: - - gcc - - clang - -services: - - docker - -env: - - PLATFORM=posix TESTS=yes TLS=no - - PLATFORM=posix TESTS=yes TLS=gnutls SMALL_STACK=yes - - PLATFORM=posix TESTS=yes TLS=gnutls SMALL_STACK=no - - PLATFORM=posix TESTS=yes TLS=gnutls SMALL_STACK=yes EPOLL=no - - PLATFORM=posix TESTS=yes TLS=gnutls SMALL_STACK=no EPOLL=no - - PLATFORM=posix TESTS=yes TLS=openssl - - PLATFORM=posix TESTS=yes TLS=tinydtls - - PLATFORM=posix TESTS=yes TLS=mbedtls - -before_install: - - docker build -t obgm/libcoap:travis-env . - -branches: - only: - - main - - develop - - /^release-.*$/ - - travis-test - -stages: - - test - - other platforms - - dist - -jobs: - include: - - stage: other platforms - env: PLATFORM=contiki TLS=no - before_script: - script: - - docker run --privileged -e CC -e PLATFORM -e TLS obgm/libcoap:travis-env /bin/sh -c "scripts/build.sh" - - stage: other platforms - env: PLATFORM=lwip TLS=no - before_script: - script: - - docker run --privileged -e CC -e PLATFORM -e TLS obgm/libcoap:travis-env /bin/sh -c "scripts/build.sh" - - stage: dist - env: PLATFORM=posix TESTS=yes TLS=no DOCS=yes - before_script: - script: - - docker run --privileged -e CC -e PLATFORM -e TESTS -e DOCS -e TLS obgm/libcoap:travis-env /bin/sh -c "scripts/dist.sh" - -# Docker disables IPv6 in containers by default, so re-enable it. -before_script: - # `daemon.json` is normally missing, but let's log it in case that changes. - - sudo touch /etc/docker/daemon.json - - sudo cat /etc/docker/daemon.json - - sudo service docker stop - # This needs YAML quoting because of the curly braces. - - 'echo ''{"ipv6": true, "fixed-cidr-v6": "2001:db8:1::/64"}'' | sudo tee /etc/docker/daemon.json' - - sudo service docker start - # Fail early if docker failed on start -- add `- sudo dockerd` to debug. - - sudo docker info - # Paranoia log: what if our config got overwritten? - - sudo cat /etc/docker/daemon.json -script: - - docker run --privileged -e CC -e PLATFORM -e TESTS -e DOCS -e TLS -e EPOLL -e SMALL_STACK obgm/libcoap:travis-env /bin/sh -c "scripts/build.sh" diff --git a/examples/espidf-coap-server/components/libcoap/build-env/.dockerignore b/examples/espidf-coap-server/components/libcoap/build-env/.dockerignore deleted file mode 100644 index 73b67f9..0000000 --- a/examples/espidf-coap-server/components/libcoap/build-env/.dockerignore +++ /dev/null @@ -1,5 +0,0 @@ -imagename -build.sh -*~ -.*.swp -\#*# diff --git a/examples/espidf-coap-server/components/libcoap/examples/contiki/.gitignore b/examples/espidf-coap-server/components/libcoap/examples/contiki/.gitignore deleted file mode 100644 index 6eab539..0000000 --- a/examples/espidf-coap-server/components/libcoap/examples/contiki/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -contiki-minimal-net.a -contiki-minimal-net.map -contiki/ -obj_minimal-net/ -server.minimal-net -symbols.c -symbols.h diff --git a/examples/espidf-coap-server/components/libcoap/examples/lwip/.gitignore b/examples/espidf-coap-server/components/libcoap/examples/lwip/.gitignore deleted file mode 100644 index 7905765..0000000 --- a/examples/espidf-coap-server/components/libcoap/examples/lwip/.gitignore +++ /dev/null @@ -1,7 +0,0 @@ -# not going for submodules here to keep things easy -lwip -lwip-contrib - -# never objects, and not the resulting binary -*.o -server diff --git a/examples/espidf-exceptions/.gitignore b/examples/espidf-exceptions/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-exceptions/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-hello-world/.gitignore b/examples/espidf-hello-world/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-hello-world/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-http-request/.gitignore b/examples/espidf-http-request/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-http-request/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-peripherals-uart/.gitignore b/examples/espidf-peripherals-uart/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-peripherals-uart/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-peripherals-usb/.gitignore b/examples/espidf-peripherals-usb/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-peripherals-usb/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio diff --git a/examples/espidf-storage-sdcard/.gitignore b/examples/espidf-storage-sdcard/.gitignore deleted file mode 100644 index 03f4a3c..0000000 --- a/examples/espidf-storage-sdcard/.gitignore +++ /dev/null @@ -1 +0,0 @@ -.pio