configurable homekey color

Author: rednblkx

data/misc.html

@@ -23,7 +23,27 @@ <h2 style="text-align: center;">Device Configuration</h2>
   <label for="hk-always-lock">Always Lock on HK Auth</label>
   <input type='hidden' name='hk-always-lock' value='0'>
   <input type="checkbox" name="hk-always-lock" id="hk-always-lock" value="1">
-  
+
+  <fieldset>
+    <legend>HomeKey Card Finish:</legend>
+    <div>
+      <label for="hk-tan">Tan</label>
+      <input type="radio" id="hk-finish-0" name="hk-hwfinish" value="0" />
+    </div>
+    <div>
+      <label for="hk-gold">Gold</label>
+      <input type="radio" id="hk-finish-1" name="hk-hwfinish" value="1" />
+    </div>
+    <div>
+      <label for="hk-silver">Silver</label>
+      <input type="radio" id="hk-finish-2" name="hk-hwfinish" value="2" />
+    </div>
+    <div>
+      <label for="hk-black">Black</label>
+      <input type="radio" id="hk-finish-3" name="hk-hwfinish" value="3" />
+    </div>
+  </fieldset>
+
   <p><b>- HomeKey Events</b></p>
 
   <label for="nfc-s-pin">Auth Success/Failure GPIO Pin (NeoPixel)</label>
@@ -79,6 +99,8 @@ <h2 style="text-align: center;">Device Configuration</h2>
   let gpioActionEn = "%GPIOAEN%" == true;
   let gpioActionLock = "%GPIOALOCK%" == true;
   let gpioActionUnlock = "%GPIOAUNLOCK%" == true;
+  let hwfinish = "%HWFINISH%";
+  document.getElementById(`hk-finish-${hwfinish}`).setAttribute("checked", "");
   if (nfcSuccessHL) {
     document.getElementById("nfc-s-hl").setAttribute("checked", "");
   }

src/main.cpp

@@ -67,7 +67,7 @@ namespace espConfig
   {
     std::string deviceName = DEVICE_NAME;
     std::string otaPasswd = OTA_PWD;
-    std::string hk_key_color = hk_color_vals[HOMEKEY_COLOR];
+    uint8_t hk_key_color = HOMEKEY_COLOR;
     std::string setupCode = SETUP_CODE;
     bool lockAlwaysUnlock = HOMEKEY_ALWAYS_UNLOCK;
     bool lockAlwaysLock = HOMEKEY_ALWAYS_LOCK;
@@ -672,6 +672,9 @@ String miscHtmlProcess(const String& var) {
   else if (var == "GPIOAUNLOCK") {
     return String(espConfig::miscConfig.gpioActionUnlockState);
   }
+  else if (var == "HWFINISH") {
+    return String(espConfig::miscConfig.hk_key_color);
+  }
   return String();
 }
 
@@ -946,6 +949,9 @@ void setupWeb() {
       else if (!strcmp(p->name().c_str(), "gpio-a-unlock")) {
         espConfig::miscConfig.gpioActionUnlockState = p->value().toInt();
       }
+      else if (!strcmp(p->name().c_str(), "hk-hwfinish")) {
+        espConfig::miscConfig.hk_key_color = p->value().toInt();
+      }
     }
     try {
       std::string strNvs;
@@ -1292,7 +1298,7 @@ void setup() {
   serialNumber.append(macStr);
   new Characteristic::SerialNumber(serialNumber.c_str());
   new Characteristic::FirmwareRevision(app_version.c_str());
-  std::vector<uint8_t> decB64 = utils::decodeB64(espConfig::miscConfig.hk_key_color.c_str());
+  std::vector<uint8_t> decB64 = utils::decodeB64(hk_color_vals[HK_COLOR(espConfig::miscConfig.hk_key_color)]);
   TLV8 hwfinish(NULL, 0);
   hwfinish.unpack(decB64.data(), decB64.size());
   new Characteristic::HardwareFinish(hwfinish);
@@ -1304,7 +1310,7 @@ void setup() {
   new Characteristic::Version();
   homeSpan.setControllerCallback(pairCallback);
   homeSpan.setWifiCallback(wifiCallback);
-  
+
   if (espConfig::miscConfig.nfcNeopixelPin && espConfig::miscConfig.nfcNeopixelPin != 255) {
     pixels.setPin(espConfig::miscConfig.nfcNeopixelPin);
     pixels.begin();