Skip to content

Commit 925b8ee

Browse files
authored
Simple versioning system (#71)
1 parent 9045e43 commit 925b8ee

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

app_httpd.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ extern void setLamp(int newVal);
3333
// External variables declared in the main .ino
3434
extern char myName[];
3535
extern char myVer[];
36+
extern char baseVersion[];
3637
extern IPAddress ip;
3738
extern IPAddress net;
3839
extern IPAddress gw;
@@ -715,8 +716,8 @@ static esp_err_t dump_handler(httpd_req_t *req){
715716
// Module
716717
d+= sprintf(d,"Name: %s<br>\n", myName);
717718
Serial.printf("Name: %s\n", myName);
718-
d+= sprintf(d,"Firmware: %s<br>\n", myVer);
719-
Serial.printf("Firmware: %s\n", myVer);
719+
d+= sprintf(d,"Firmware: %s (base: %s)<br>\n", myVer, baseVersion);
720+
Serial.printf("Firmware: %s (base: %s)\n", myVer, baseVersion);
720721
float sketchPct = 100 * sketchSize / sketchSpace;
721722
d+= sprintf(d,"Sketch Size: %i (total: %i, %.1f%% used)<br>\n", sketchSize, sketchSpace, sketchPct);
722723
Serial.printf("Sketch Size: %i (total: %i, %.1f%% used)\n", sketchSize, sketchSpace, sketchPct);

esp32-cam-webserver.ino

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,9 @@
3939
stationList[] = {{"ESP32-CAM-CONNECT","InsecurePassword", true}};
4040
#endif
4141

42+
// Version string
43+
#include "src/version.h"
44+
4245
// Pin Mappings
4346
#include "camera_pins.h"
4447

@@ -366,6 +369,8 @@ void setup() {
366369
Serial.println(myName);
367370
Serial.print("Code Built: ");
368371
Serial.println(myVer);
372+
Serial.print("Base Release: ");
373+
Serial.println(baseVersion);
369374

370375
if (stationCount == 0) {
371376
Serial.println("\nFatal Error; Halting");

src/version.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
/* Version of upstream code */
2+
3+
char baseVersion[] = "3.0-RC1";

0 commit comments

Comments
 (0)