Cleanup

diff --git a/Device.h b/Device.h
index 304e6761d294ef083a4c108a3bdc4a608912f2d2..e09ba55ca547159554d4af525d9af063438a3a1f 100644 (file)
--- a/Device.h
+++ b/Device.h
@@ -259,14 +259,12 @@ void device_validate_partitions() {
   // todo, add bootloader, partition table, or softdevice?
   calculate_region_hash(APPLICATION_START, USER_DATA_START, dev_firmware_hash);
   #endif
-  #if VALIDATE_FIRMWARE
     for (uint8_t i = 0; i < DEV_HASH_LEN; i++) {
       if (dev_firmware_hash_target[i] != dev_firmware_hash[i]) {
         fw_signature_validated = false;
         break;
       }
     }
-  #endif
 }
 
 bool device_firmware_ok() {
@@ -324,7 +322,8 @@ bool device_init() {
   } else {
     return false;
   }
-  #else //if VALIDATE_FIRMWARE is false
+  #else
+  // Skip hash comparison and checking BT
   return true;
   #endif
 }

diff --git a/Radio.cpp b/Radio.cpp
index 0686b0b72b82bccd72d116abdb57a6d231b49eb7..fe45ceb888c1c2dc85a4bd0cc262fe8b1f64a302 100644 (file)
--- a/Radio.cpp
+++ b/Radio.cpp
@@ -2562,7 +2562,7 @@ void sx128x::disableCrc()
     setPacketParams(_preambleLength, _implicitHeaderMode, _payloadLength, _crcMode);
 }
 
-byte sx128x::random()
+uint8_t sx128x::random()
 {
     // todo: implement
     return 0x4; //chosen  by fair die roll

diff --git a/Utilities.h b/Utilities.h
index 84057362abcfceece9e466955d540130541f1e8f..0424984e2ee148a815b0b1d7518865973c383856 100644 (file)
--- a/Utilities.h
+++ b/Utilities.h
@@ -1341,7 +1341,7 @@ bool eeprom_product_valid() {
        #if PLATFORM == PLATFORM_ESP32
        if (rval == PRODUCT_RNODE || rval == BOARD_RNODE_NG_20 || rval == BOARD_RNODE_NG_21 || rval == PRODUCT_HMBRW || rval == PRODUCT_TBEAM || rval == PRODUCT_T32_10 || rval == PRODUCT_T32_20 || rval == PRODUCT_T32_21 || rval == PRODUCT_H32_V2 || rval == PRODUCT_H32_V3) {
        #elif PLATFORM == PLATFORM_NRF52
-       if (rval == PRODUCT_TECHO || rval == MODEL_16 || rval == MODEL_17 || rval == PRODUCT_RAK4631 || rval == PRODUCT_HMBRW || rval == PRODUCT_FREENODE) {
+       if (rval == PRODUCT_TECHO || rval == PRODUCT_RAK4631 || rval == PRODUCT_HMBRW || rval == PRODUCT_FREENODE) {
        #else
        if (false) {
        #endif