Build with idf v5.1

This commit is contained in:
h2zero 2023-05-24 15:47:14 -06:00
parent d0eaf6c1e0
commit 3145319581
8 changed files with 74 additions and 74 deletions

View file

@ -12,7 +12,7 @@ jobs:
# See https://hub.docker.com/r/espressif/idf/tags and # See https://hub.docker.com/r/espressif/idf/tags and
# https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html # https://docs.espressif.com/projects/esp-idf/en/latest/esp32/api-guides/tools/idf-docker-image.html
# for details. # for details.
idf_ver: ["release-v4.4"] idf_ver: ["release-v4.4", "release-v5.1"]
idf_target: ["esp32", "esp32s3", "esp32c3"] idf_target: ["esp32", "esp32s3", "esp32c3"]
example: example:
- Advanced/NimBLE_Client - Advanced/NimBLE_Client
@ -36,7 +36,7 @@ jobs:
container: espressif/idf:${{ matrix.idf_ver }} container: espressif/idf:${{ matrix.idf_ver }}
steps: steps:
- name: Checkout - name: Checkout
uses: actions/checkout@v2 uses: actions/checkout@v3
with: with:
path: components/esp-nimble-cpp path: components/esp-nimble-cpp
- name: Build examples - name: Build examples
@ -51,8 +51,8 @@ jobs:
build_docs: build_docs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: actions/checkout@v2 - uses: actions/checkout@v3
- name: Doxygen Action - name: Doxygen Action
uses: mattnotmitt/doxygen-action@v1.9.1 uses: mattnotmitt/doxygen-action@v1.9.5
with: with:
working-directory: 'docs/' working-directory: 'docs/'

View file

@ -46,7 +46,7 @@ class ClientCallbacks : public NimBLEClientCallbacks {
} }
bool onConfirmPIN(uint32_t pass_key){ bool onConfirmPIN(uint32_t pass_key){
printf("The passkey YES/NO number: %d\n", pass_key); printf("The passkey YES/NO number: %" PRIu32"\n", pass_key);
/** Return false if passkeys don't match. */ /** Return false if passkeys don't match. */
return true; return true;
} }

View file

@ -53,7 +53,7 @@ class ServerCallbacks: public NimBLEServerCallbacks {
}; };
bool onConfirmPIN(uint32_t pass_key){ bool onConfirmPIN(uint32_t pass_key){
printf("The passkey YES/NO number: %d\n", pass_key); printf("The passkey YES/NO number: %" PRIu32"\n", pass_key);
/** Return false if passkeys don't match. */ /** Return false if passkeys don't match. */
return true; return true;
}; };

View file

@ -42,7 +42,7 @@ class ServerCallbacks: public NimBLEServerCallbacks {
}; };
void onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) { void onDisconnect(NimBLEServer* pServer, NimBLEConnInfo& connInfo, int reason) {
printf("Client disconnected - sleeping for %u seconds\n", sleepSeconds); printf("Client disconnected - sleeping for %" PRIu32" seconds\n", sleepSeconds);
esp_deep_sleep_start(); esp_deep_sleep_start();
}; };
}; };
@ -57,7 +57,7 @@ class advertisingCallbacks: public NimBLEExtAdvertisingCallbacks {
printf("Client connecting\n"); printf("Client connecting\n");
return; return;
case BLE_HS_ETIMEOUT: case BLE_HS_ETIMEOUT:
printf("Time expired - sleeping for %u seconds\n", sleepSeconds); printf("Time expired - sleeping for %" PRIu32" seconds\n", sleepSeconds);
break; break;
default: default:
break; break;

View file

@ -45,7 +45,7 @@ class ServerCallbacks: public NimBLEServerCallbacks {
printf("Client disconnected\n"); printf("Client disconnected\n");
// if still advertising we won't sleep yet. // if still advertising we won't sleep yet.
if (!pServer->getAdvertising()->isAdvertising()) { if (!pServer->getAdvertising()->isAdvertising()) {
printf("Sleeping for %u seconds\n", sleepTime); printf("Sleeping for %" PRIu32" seconds\n", sleepTime);
esp_deep_sleep_start(); esp_deep_sleep_start();
} }
}; };
@ -61,7 +61,7 @@ class advCallbacks: public NimBLEExtAdvertisingCallbacks {
printf(" client connecting\n"); printf(" client connecting\n");
return; return;
case BLE_HS_ETIMEOUT: case BLE_HS_ETIMEOUT:
printf("Time expired - sleeping for %u seconds\n", sleepTime); printf("Time expired - sleeping for %" PRIu32" seconds\n", sleepTime);
break; break;
default: default:
break; break;

View file

@ -56,7 +56,7 @@ class MyClientCallback : public BLEClientCallbacks {
return 123456; return 123456;
} }
bool onConfirmPIN(uint32_t pass_key){ bool onConfirmPIN(uint32_t pass_key){
printf("The passkey YES/NO number: %d\n", pass_key); printf("The passkey YES/NO number: %" PRIu32"\n", pass_key);
return true; return true;
} }

View file

@ -63,7 +63,7 @@ class MyServerCallbacks: public BLEServerCallbacks {
} }
bool onConfirmPIN(uint32_t pass_key){ bool onConfirmPIN(uint32_t pass_key){
printf("The passkey YES/NO number: %d\n", pass_key); printf("The passkey YES/NO number: %" PRIu32"\n", pass_key);
return true; return true;
} }

View file

@ -65,7 +65,7 @@ class MyServerCallbacks: public BLEServerCallbacks {
} }
bool onConfirmPIN(uint32_t pass_key){ bool onConfirmPIN(uint32_t pass_key){
printf("The passkey YES/NO number: %d\n", pass_key); printf("The passkey YES/NO number: %" PRIu32"\n", pass_key);
return true; return true;
} }