From 5add388fbcc431d8310f09d686c581c0c86d9a0f Mon Sep 17 00:00:00 2001
From: DigiH <17110652+DigiH@users.noreply.github.com>
Date: Wed, 13 Aug 2025 14:34:00 +0200
Subject: [PATCH] [BT] Typo fix to actually have Victron devices decrypted
 (#2226)

---
 main/config_WebContent.h | 2 +-
 main/gatewayBT.cpp       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/main/config_WebContent.h b/main/config_WebContent.h
index eccf82f..5d1daf8 100644
--- a/main/config_WebContent.h
+++ b/main/config_WebContent.h
@@ -226,7 +226,7 @@ const char config_lora_body[] = body_header
 #ifdef BLEDecryptor
 const char config_ble_body[] = body_header "<fieldset class=\"set1\"><legend><span><b>Configure BLE</b></span></legend><form method='post' action='bl'><p><b>BLE AES Default Key (32 char hex)</b></p><input id='bk' name='bk' minlength='32' maxlength='32' placeholder=" BLE_AES " value='%s' oninput='bkv()'><p id='bke' style='color:red;'></p><hr><p><b>BLE Key Pairs</b></p><p>MacAddress:AESKey with space separator</p><p><textarea id='kp' name='kp' placeholder='A4C138012345:00112233445566778899001122334455' rows='3' cols='46' oninput='kpv()'>%s</textarea></p><p id='kpe' style='color:red;'></p><br><button id='s' name='save' type='submit' class='button bgrn'>Save</button></form></fieldset>" body_footer_config_menu;
 
-// Client side javascript validation of the Default AES Key is hex, and the custom keys are in the correct format. This pushes the theengs-bridge-v11 way of the file size, so reudcing it now and leaving it commented out
+// Client side javascript validation of the Default AES Key is hex, and the custom keys are in the correct format. This pushes the theengs-bridge-v11 way of the file size, so reducing it now and leaving it commented out
 //const char ble_script[] = "function bkv(){let e=document.getElementById('bk'),t=document.getElementById('bke'),l=e.value.trim();0===l.length||/^[A-Fa-f0-9]{32}$/.test(l)?(t.textContent='',e.style.color=''):(t.textContent='Invalid key',e.style.color='red')}function kpv(){let e=document.getElementById('kp'),t=document.getElementById('kpe'),l=e.value.split(/ /),n=/^[A-Fa-f0-9]{12}:[A-Fa-f0-9]{32}$/,o=l.map((e,t)=>({line:e,index:t})).filter(e=>!n.test(e.line));if(0===e.value.trim().length||0===o.length)t.textContent='',e.style.color='';else{let i=o.map(e=>e.index+1).join(', ');t.textContent=`Invalid format on line(s): ${i}`,e.style.color='red'}}";
 
 const char ble_script[] = "";
diff --git a/main/gatewayBT.cpp b/main/gatewayBT.cpp
index 8f676c4..832428a 100644
--- a/main/gatewayBT.cpp
+++ b/main/gatewayBT.cpp
@@ -1203,7 +1203,7 @@ void process_bledata(JsonObject& BLEdata) {
   int mac_type = BLEdata["mac_type"].as<int>();
 
 # if BLEDecryptor
-  if (BLEdata["encr"] && (BLEdata["encr"].as<int>() >0 && BLEdata["encr"].as<int>() <=2)) {
+  if (BLEdata["encr"] && (BLEdata["encr"].as<int>() > 0 && BLEdata["encr"].as<int>() <= 3)) {
     // Decrypting Encrypted BLE Data PVVX, BTHome or Victron
     Log.trace(F("[BLEDecryptor] Decrypt ENCR:%d ModelID:%s Payload:%s" CR), BLEdata["encr"].as<int>(), BLEdata["model_id"].as<const char*>(), BLEdata["cipher"].as<const char*>());