Merge remote-tracking branch 'remotes/origin/master' into JCWebColorChangeBar

This commit is contained in:
rljonesau 2018-12-21 15:29:56 +11:00
commit 03500a2919

View file

@ -949,18 +949,6 @@ const char* getBlueWireStatStr()
const char* BlueWireStates[] = { "BTC,Htr", "BTC", "OEM,Htr", "OEM" };
return BlueWireStates[getBlueWireStat()];
/* if(bHasHtrData) {
if(bHasOEMController)
return "OEM,Htr";
else
return "BTC,Htr";
}
else {
if(bHasOEMController)
return "OEM";
else
return "BTC";
}*/
}
bool hasOEMcontroller()