Seich
/
HomeSpan
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Addresses compiler warnings in Arduino-ESP32 2.0.0

This commit is contained in:
HomeSpan 2021-09-05 20:39:37 -05:00
parent 28356c327a
commit edf5522ca0
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/HAP.cpp
View File

@ -719,7 +719,7 @@ int HAPClient::postPairVerifyURL(){
memcpy(iosCurveKey,tlv8.buf(kTLVType_PublicKey),32); // save iosCurveKey (will persist until end of verification process) memcpy(iosCurveKey,tlv8.buf(kTLVType_PublicKey),32); // save iosCurveKey (will persist until end of verification process)
crypto_scalarmult_curve25519(sharedCurveKey,secretCurveKey,iosCurveKey); // generate (and persist) Pair Verify SharedSecret CurveKey from Accessory's Curve25519 secret key and Controller's Curve25519 public key (32 bytes) int _x = crypto_scalarmult_curve25519(sharedCurveKey,secretCurveKey,iosCurveKey); // generate (and persist) Pair Verify SharedSecret CurveKey from Accessory's Curve25519 secret key and Controller's Curve25519 public key (32 bytes)
uint8_t *accessoryPairingID = accessory.ID; // set accessoryPairingID uint8_t *accessoryPairingID = accessory.ID; // set accessoryPairingID
size_t accessoryPairingIDLen = 17; size_t accessoryPairingIDLen = 17;

9
src/HomeSpan.h
View File

@ -33,6 +33,7 @@
#include <Arduino.h> #include <Arduino.h>
#include <unordered_map> #include <unordered_map>
#include <vector>
#include <nvs.h> #include <nvs.h>
#include "Settings.h" #include "Settings.h"
@ -301,7 +302,8 @@ struct SpanCharacteristic{
sprintf(c,"\"%s\"",u.STRING); sprintf(c,"\"%s\"",u.STRING);
return(String(c)); return(String(c));
} // switch } // switch
} // str() return(String()); // included to prevent compiler warnings
}
void uvSet(UVal &u, const char *val){ void uvSet(UVal &u, const char *val){
u.STRING=val; u.STRING=val;
@ -331,7 +333,7 @@ struct SpanCharacteristic{
u.FLOAT=(double)val; u.FLOAT=(double)val;
break; break;
} // switch } // switch
} // set() }
template <class T> T uvGet(UVal &u){ template <class T> T uvGet(UVal &u){
@ -354,7 +356,8 @@ struct SpanCharacteristic{
Serial.print("\n*** WARNING: Can't use getVal() or getNewVal() with string Characteristics.\n\n"); Serial.print("\n*** WARNING: Can't use getVal() or getNewVal() with string Characteristics.\n\n");
return(0); return(0);
} }
} // get() return(0); // included to prevent compiler warnings
}
template <typename A, typename B, typename S=int> SpanCharacteristic *setRange(A min, B max, S step=0){ template <typename A, typename B, typename S=int> SpanCharacteristic *setRange(A min, B max, S step=0){