Skip to content

Commit b45fe64

Browse files
tobozotobozo
committed
Updated examples / test-suite
1 parent 316f3eb commit b45fe64

File tree

8 files changed

+68
-21
lines changed

8 files changed

+68
-21
lines changed

‎examples/anyFS/anyFS.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@
1313
#include <LittleFS.h>
1414
//#include <PSRamFS.h>
1515

16-
#include <flashz.hpp> // optional esp32-flashz for gzipped firmwares
17-
16+
//#include <flashz.hpp> // optional esp32-flashz for zlib compressed firmwares
17+
//#include <ESP32-targz.h> // optional ESP32-targz for gzip compressed firmwares
1818
#include <esp32fota.h> // fota pulls WiFi library
1919

2020

‎examples/anyFS/test/1.1.nosecurity/1.1.nosecurity.ino

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
1313
*/
1414

15-
//#include <flashz.hpp> // optional esp32-flashz for zlib compressed firmwares
1615
#include <ESP32-targz.h> // optional ESP32-targz for gzip compressed firmwares
1716
#include <esp32FOTA.hpp>
1817

@@ -32,7 +31,7 @@ const char* description = "Basic example with no security and no filesystem"
3231

3332
const char* fota_debug_fmt = R"DBG_FMT(
3433
35-
***************** STAGE %i *****************
34+
***************** STAGE %s *****************
3635
3736
Description : %s
3837
Firmware type : %s
@@ -78,7 +77,7 @@ void setup()
7877
Serial.begin(115200);
7978

8079
Serial.printf( fota_debug_fmt,
81-
firmware_version_major,
80+
"1.1",
8281
description,
8382
firmware_name,
8483
firmware_version_major,

‎examples/anyFS/test/1.2.nosecurity.gz/1.2.nosecurity.gz.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ const char* description = "Basic *gzipped* example with no security and no f
3131

3232
const char* fota_debug_fmt = R"DBG_FMT(
3333
34-
***************** STAGE %i *****************
34+
***************** STAGE %s *****************
3535
3636
Description : %s
3737
Firmware type : %s
@@ -77,7 +77,7 @@ void setup()
7777
Serial.begin(115200);
7878

7979
Serial.printf( fota_debug_fmt,
80-
firmware_version_major,
80+
"1.2",
8181
description,
8282
firmware_name,
8383
firmware_version_major,

‎examples/anyFS/test/1.3.nosecurity.zz/1.3.nosecurity.zz.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ const char* description = "Basic *gzipped* example with no security and no f
3030

3131
const char* fota_debug_fmt = R"DBG_FMT(
3232
33-
***************** STAGE %i *****************
33+
***************** STAGE %s *****************
3434
3535
Description : %s
3636
Firmware type : %s
@@ -76,7 +76,7 @@ void setup()
7676
Serial.begin(115200);
7777

7878
Serial.printf( fota_debug_fmt,
79-
firmware_version_major,
79+
"1.3",
8080
description,
8181
firmware_name,
8282
firmware_version_major,

‎examples/anyFS/test/2.cert-in-spiffs/2.cert-in-spiffs.ino

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ const char* description = "SPIFFS example with security";
2525

2626
const char* fota_debug_fmt = R"DBG_FMT(
2727
28-
***************** STAGE %i *****************
28+
***************** STAGE %s *****************
2929
3030
Description : %s
3131
Firmware type : %s
32-
Firmware version : %i
32+
Firmware version : %i.%i.%i
3333
Signature check : %s
3434
TLS Cert check : %s
35+
Compression : %s
3536
3637
********************************************
3738
@@ -74,7 +75,18 @@ void setup_wifi()
7475
void setup()
7576
{
7677
Serial.begin(115200);
77-
Serial.printf( fota_debug_fmt, firmware_version_major, description, firmware_name, firmware_version_major, check_signature?"Enabled":"Disabled", disable_security?"Disabled":"Enabled" );
78+
79+
Serial.printf( fota_debug_fmt,
80+
"2",
81+
description,
82+
firmware_name,
83+
firmware_version_major,
84+
firmware_version_minor,
85+
firmware_version_patch,
86+
check_signature ?"Enabled":"Disabled",
87+
disable_security ?"Disabled":"Enabled",
88+
FOTA.zlibSupported() ?"Enabled":"Disabled"
89+
);
7890

7991
// Provide filesystem with root_ca.pem to validate server certificate
8092
if( ! SPIFFS.begin( false ) ) {

‎examples/anyFS/test/3.cert-in-progmem/3.cert-in-progmem.ino

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,14 @@ const char* description = "PROGMEM example with security";
2727

2828
const char* fota_debug_fmt = R"DBG_FMT(
2929
30-
***************** STAGE %i *****************
30+
***************** STAGE %s *****************
3131
3232
Description : %s
3333
Firmware type : %s
34-
Firmware version : %i
34+
Firmware version : %i.%i.%i
3535
Signature check : %s
3636
TLS Cert check : %s
37+
Compression : %s
3738
3839
********************************************
3940
@@ -78,7 +79,18 @@ void setup_wifi()
7879
void setup()
7980
{
8081
Serial.begin(115200);
81-
Serial.printf( fota_debug_fmt, firmware_version_major, description, firmware_name, firmware_version_major, check_signature?"Enabled":"Disabled", disable_security?"Disabled":"Enabled" );
82+
83+
Serial.printf( fota_debug_fmt,
84+
"3",
85+
description,
86+
firmware_name,
87+
firmware_version_major,
88+
firmware_version_minor,
89+
firmware_version_patch,
90+
check_signature ?"Enabled":"Disabled",
91+
disable_security ?"Disabled":"Enabled",
92+
FOTA.zlibSupported() ?"Enabled":"Disabled"
93+
);
8294

8395
{
8496
auto cfg = FOTA.getConfig();

‎examples/anyFS/test/4.cert-in-littlefs/4.cert-in-littlefs.ino

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,14 @@ const char* description = "LittleFS example with enforced security";
2525

2626
const char* fota_debug_fmt = R"DBG_FMT(
2727
28-
***************** STAGE %i *****************
28+
***************** STAGE %s *****************
2929
3030
Description : %s
3131
Firmware type : %s
32-
Firmware version : %i
32+
Firmware version : %i.%i.%i
3333
Signature check : %s
3434
TLS Cert check : %s
35+
Compression : %s
3536
3637
********************************************
3738
@@ -75,7 +76,18 @@ void setup_wifi()
7576
void setup()
7677
{
7778
Serial.begin(115200);
78-
Serial.printf( fota_debug_fmt, firmware_version_major, description, firmware_name, firmware_version_major, check_signature?"Enabled":"Disabled", disable_security?"Disabled":"Enabled" );
79+
80+
Serial.printf( fota_debug_fmt,
81+
"4",
82+
description,
83+
firmware_name,
84+
firmware_version_major,
85+
firmware_version_minor,
86+
firmware_version_patch,
87+
check_signature ?"Enabled":"Disabled",
88+
disable_security ?"Disabled":"Enabled",
89+
FOTA.zlibSupported() ?"Enabled":"Disabled"
90+
);
7991
// Provide filesystem with root_ca.pem to validate server certificate
8092
if( ! LittleFS.begin( false ) ) {
8193
Serial.println("LittleFS Mounting failed, aborting!");

‎examples/anyFS/test/5.sig-in-progmem/5.sig-in-progmem.ino

Lines changed: 15 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,13 +28,14 @@ const char* description = "PROGMEM example with enforced security";
2828

2929
const char* fota_debug_fmt = R"DBG_FMT(
3030
31-
***************** STAGE %i *****************
31+
***************** STAGE %s *****************
3232
3333
Description : %s
3434
Firmware type : %s
35-
Firmware version : %i
35+
Firmware version : %i.%i.%i
3636
Signature check : %s
3737
TLS Cert check : %s
38+
Compression : %s
3839
3940
********************************************
4041
@@ -76,7 +77,18 @@ void setup_wifi()
7677
void setup()
7778
{
7879
Serial.begin(115200);
79-
Serial.printf( fota_debug_fmt, firmware_version_major, description, firmware_name, firmware_version_major, check_signature?"Enabled":"Disabled", disable_security?"Disabled":"Enabled" );
80+
81+
Serial.printf( fota_debug_fmt,
82+
"5",
83+
description,
84+
firmware_name,
85+
firmware_version_major,
86+
firmware_version_minor,
87+
firmware_version_patch,
88+
check_signature ?"Enabled":"Disabled",
89+
disable_security ?"Disabled":"Enabled",
90+
FOTA.zlibSupported() ?"Enabled":"Disabled"
91+
);
8092

8193
{
8294
auto cfg = FOTA.getConfig();

0 commit comments

Comments
 (0)