Electronics/Stairs
Electronics/Stairs
1
0
Fork 0
Code Issues 6 Pull Requests Releases Activity

Removed the GitVersion Sha as it was impossible to commit

Browse Source
This commit is contained in:
Mark van Renswoude 2018-01-04 22:56:12 +01:00
parent 42647f0db7
commit fea7b1dbb5
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
gulpfile.js
View File

@ -210,7 +210,6 @@ gulp.task('embedVersion', function(cb)
headerFile += "const uint8_t VersionMetadata = " + version.BuildMetaData + ";\r\n"; headerFile += "const uint8_t VersionMetadata = " + version.BuildMetaData + ";\r\n";
headerFile += "const char VersionBranch[] = \"" + version.BranchName + "\";\r\n"; headerFile += "const char VersionBranch[] = \"" + version.BranchName + "\";\r\n";
headerFile += "const char VersionSha[] = \"" + version.Sha + "\";\r\n";
headerFile += "const char VersionSemVer[] = \"" + version.SemVer + "\";\r\n"; headerFile += "const char VersionSemVer[] = \"" + version.SemVer + "\";\r\n";
headerFile += "const char VersionFullSemVer[] = \"" + version.FullSemVer + "\";\r\n"; headerFile += "const char VersionFullSemVer[] = \"" + version.FullSemVer + "\";\r\n";

5
src/assets/version.h
View File

@ -4,11 +4,10 @@
const uint8_t VersionMajor = 2; const uint8_t VersionMajor = 2;
const uint8_t VersionMinor = 0; const uint8_t VersionMinor = 0;
const uint8_t VersionPatch = 0; const uint8_t VersionPatch = 0;
const uint8_t VersionMetadata = 4; const uint8_t VersionMetadata = 5;
const char VersionBranch[] = "release/2.0"; const char VersionBranch[] = "release/2.0";
const char VersionSha[] = "176fa2a7bae0e9604a70c69da27b68819b479b73";
const char VersionSemVer[] = "2.0.0-beta.1"; const char VersionSemVer[] = "2.0.0-beta.1";
const char VersionFullSemVer[] = "2.0.0-beta.1+4"; const char VersionFullSemVer[] = "2.0.0-beta.1+5";
const char VersionCommitDate[] = "2018-01-04"; const char VersionCommitDate[] = "2018-01-04";
#endif #endif

2
src/server/settings.cpp
View File

@ -23,7 +23,7 @@ void handleVersion(AsyncWebServerRequest *request)
JsonObject& root = jsonBuffer.createObject(); JsonObject& root = jsonBuffer.createObject();
root["systemID"] = String(ESP.getChipId(), HEX); root["systemID"] = String(ESP.getChipId(), HEX);
root["version"] = String(VersionFullSemVer) + " sha." + String(VersionSha); root["version"] = String(VersionFullSemVer);
AsyncResponseStream *response = request->beginResponseStream("application/json"); AsyncResponseStream *response = request->beginResponseStream("application/json");
root.printTo(*response); root.printTo(*response);