Fix compiler warnings
parent
02ba077658
commit
3da9c5d7ee
|
|
@ -5,7 +5,7 @@
|
|||
//
|
||||
// Construct node version
|
||||
//
|
||||
void Node::setVersion(byte* rType, byte rFlag, byte* rVersion, char* rCode)
|
||||
void Node::setVersion(byte* rType, byte rFlag, byte* rVersion, const char* rCode)
|
||||
{
|
||||
char compileDate[0x10] = __DATE__;
|
||||
char compileTime[0x10] = __TIME__;
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ public:
|
|||
virtual void init();
|
||||
|
||||
const char* getVersion();
|
||||
void setVersion(byte* rType, byte rFlag, byte* rVersion, char* rCode);
|
||||
void setVersion(byte* rType, byte rFlag, byte* rVersion, const char* rCode);
|
||||
|
||||
virtual short processRequest(byte* request, byte* sendBuff);
|
||||
virtual void update(); //update things like keypadstate and rfid
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ Reader::Reader()
|
|||
}
|
||||
|
||||
//cmd61 is used to specify behaviour on command 0x61
|
||||
void Reader::setrCode(char* rCode, byte cmd61_s)
|
||||
void Reader::setrCode(const char* rCode, byte cmd61_s)
|
||||
{
|
||||
byte rType[] = {0x03, 0x00, 0x00, 0x00};
|
||||
byte rVersion[] = {0x01, 0x06, 0x00};
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@ class Reader : public Node
|
|||
{
|
||||
public:
|
||||
Reader(); //contructor
|
||||
void setrCode(char* rCode, byte cmd61 = 0);
|
||||
void setrCode(const char* rCode, byte cmd61 = 0);
|
||||
void init();
|
||||
void update(); //update things like keypadstate and rfid
|
||||
|
||||
|
|
|
|||
|
|
@ -54,7 +54,7 @@
|
|||
|
||||
|
||||
//pins for card reader 1 keypad (colls ABC, rows 1234)
|
||||
/*
|
||||
/*
|
||||
### Keypad 3x4 Matrix ###
|
||||
|
||||
(7)---(8)---(9)---> ROW 4
|
||||
|
|
@ -79,7 +79,7 @@ COL C COL B COL A
|
|||
|
||||
|
||||
//pins for card reader 1 RFID Module
|
||||
#define R1_DET 20
|
||||
#define R1_DET 20
|
||||
#define R1_SER Serial1
|
||||
|
||||
//pins for card reader 2 keypad (colls ABC, rows 1234)
|
||||
|
|
@ -97,3 +97,4 @@ COL C COL B COL A
|
|||
#define R2_SER Serial2
|
||||
|
||||
#endif
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue