steven-y-e
/
ac-real-io
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

supports different rfid module for reader 2

main
Nadeflore 2013-09-07 19:24:10 +02:00
parent 156bfef8a2
commit 56770f4be0
2 changed files with 20 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
acrealio/acrealio.ino
View File

@ -49,7 +49,7 @@ void setup()
Reader* read1 = new Reader(); Reader* read1 = new Reader();
//rfid module, 2 modules model are supported, configure the module to use //rfid module, 2 modules model are supported, configure the module to use
switch(RFID_MODULE) switch(RFID_MODULE1)
{ {
case 1: case 1:
{ {
@ -101,10 +101,23 @@ void setup()
read2->setrCode("ICCA",true); read2->setrCode("ICCA",true);
read2->setkeypadpins(K2_A,K2_B,K2_C,K2_1,K2_2,K2_3,K2_4);//3cols,4rows read2->setkeypadpins(K2_A,K2_B,K2_C,K2_1,K2_2,K2_3,K2_4);//3cols,4rows
//rfid module //rfid module
SL015M* mod2 = new SL015M(); switch(RFID_MODULE2)
mod2->setPins(R2_DET,&R2_SER); {
read2->setRfidModule(mod2); case 1:
nodes[1] = read2; {
SL015M* mod2 = new SL015M();
mod2->setPins(R2_DET,&R2_SER);
read2->setRfidModule(mod2);
break;
}
case 2:
{
RR10* mod2 = new RR10();
mod2->setPins(&R2_SER);
read2->setRfidModule(mod2);
break;
}
}
} }
case 1: //1 Reader game, set reader 1 as node 1 case 1: //1 Reader game, set reader 1 as node 1

3
acrealio/pinoutconfig.h
View File

@ -5,7 +5,8 @@
#define RFID_BAUD 115200 //Baud rate for RFID Module #define RFID_BAUD 115200 //Baud rate for RFID Module
#define RFID_MODULE 1 //Rfid module used for reader1, 1:SL015M 2:RR10 #define RFID_MODULE1 2 //Rfid module used for reader1, 1:SL015M 2:RR10
#define RFID_MODULE2 2 //Rfid module used for reader1, 1:SL015M 2:RR10
#define SDVX_VOL_SENS 7 //Sensitivity for SDVX Volume buttons #define SDVX_VOL_SENS 7 //Sensitivity for SDVX Volume buttons