show branchname in header in case of manual uploading firmware

Author: tobiasfaust

.gitignore

@@ -1,6 +1,3 @@
 .pio
-.vscode/.browse.c_cpp.db*
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/ipch
+.vscode
 data/web/esp

data/web/Javascript.js

@@ -219,11 +219,18 @@ function CreateSelectionListFromInputField(querySelector, jsonLists, blacklist)
     for ( k = 0; k < jsonLists.length; k += 1 ) {  
       for ( i = 0; i < jsonLists[k].length; i += 1 ) {
           _option = document.createElement( 'option' );
-          _option.value = jsonLists[k][i].port; 
-          _option.text  = jsonLists[k][i].name;
-          if(objects[j].value == jsonLists[k][i].port) { _option.selected = true;}
-          if(blacklist && blacklist.indexOf(jsonLists[k][i].port)>=0) {
-          	_option.disabled = true;
+          var p,v;
+          if (jsonLists[k][i] instanceof Object) {
+          	p = jsonLists[k][i].port;
+            v = jsonLists[k][i].name;
+          } else {
+          	p = v = jsonLists[k][i];
+          }
+          _option.value = p; 
+          _option.text  = v;
+          if(objects[j].value == p) { _option.selected = true;}
+          if(blacklist && blacklist.indexOf(p)>=0) {
+            _option.disabled = true;
           }
           _select.add( _option ); 
       }

src/updater.cpp

@@ -43,6 +43,13 @@ String updater::Stage2String(stage_t s) {
   return "UNDEF";
 }
 
+stage_t updater::Branch2Stage() {
+  if (GIT_BRANCH == "master") return (stage_t)PROD;
+  if (GIT_BRANCH == "prelive") return (stage_t)PRE;
+  if (GIT_BRANCH == "development") return (stage_t)DEV;
+  return (stage_t)UNDEF;
+}
+
 String updater::GetUpdateErrorString() {
   return httpUpdate->getLastErrorString() + "(" + httpUpdate->getLastError() + ")";
 }
@@ -201,8 +208,9 @@ void updater::LoadJsonConfig() {
     r.version = Release;
     r.subversion = 0;
     r.number = 0;
-    r.stage = (stage_t)PROD;
+    r.stage = Branch2Stage();
     r.downloadURL = "";
+
     this->currentRelease = r;
     loadDefaultConfig = false; //set back
   }

src/updater.h

@@ -74,6 +74,7 @@ class updater {
     String      GetUpdateErrorString();
     stage_t     String2Stage(String s);
     String      Stage2String(stage_t s);
+    stage_t     Branch2Stage();
     void        SetDebugLevel(uint8_t value);
 };