Implemented all commands! Issues with uploading due to progmem size though
This commit is contained in:
parent
ed99a4c916
commit
b740f4a32d
|
|
@ -150,11 +150,13 @@ unsigned long keypadTime = 0; // Timeout counte
|
||||||
unsigned long keypadValue=0;
|
unsigned long keypadValue=0;
|
||||||
|
|
||||||
|
|
||||||
// Serial terminal buffer (needs to be global)
|
|
||||||
char inString[40]={0}; // Size of command buffer (<=128 for Arduino)
|
|
||||||
byte inCount=0;
|
|
||||||
boolean privmodeEnabled = false; // Switch for enabling "priveleged" commands
|
boolean privmodeEnabled = false; // Switch for enabling "priveleged" commands
|
||||||
|
|
||||||
|
// Log buffer
|
||||||
|
char logKeys[20]={0};
|
||||||
|
int logData[20]={0};
|
||||||
|
int logCursor=0;
|
||||||
|
|
||||||
|
|
||||||
// Enter a MAC address and IP address for your controller below.
|
// Enter a MAC address and IP address for your controller below.
|
||||||
// The IP address will be dependent on your local network:
|
// The IP address will be dependent on your local network:
|
||||||
|
|
@ -177,34 +179,13 @@ PCATTACH pcattach; // Software interrupt library
|
||||||
* RAM for something else.
|
* RAM for something else.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
const prog_uchar rebootMessage[] PROGMEM = {"AccessControlSystemRebooted"};
|
|
||||||
|
|
||||||
const prog_uchar doorChimeMessage[] PROGMEM = {"FrontDoorOpened"};
|
|
||||||
const prog_uchar doorsunlockedMessage[] PROGMEM = {"AllDoorsUnlocked"};
|
|
||||||
const prog_uchar doorslockedMessage[] PROGMEM = {"AllDoorsRelocked"};
|
|
||||||
const prog_uchar alarmtrainMessage[] PROGMEM = {"AlarmTrainingPerformed."};
|
|
||||||
const prog_uchar privsdeniedMessage[] PROGMEM = {"AccessDeniedPrivelegedModeIsNotEnabled"};
|
|
||||||
const prog_uchar privsenabledMessage[] PROGMEM = {"PrivelegedModeEnabled"};
|
|
||||||
const prog_uchar privsdisabledMessage[] PROGMEM = {"PrivelegedModeDisabled"};
|
|
||||||
const prog_uchar privsAttemptsMessage[] PROGMEM = {"TooManyFailedAttemptsTryAgainLater"};
|
|
||||||
|
|
||||||
const prog_uchar consolehelpMessage1[] PROGMEM = {"ValidCommandsAre"};
|
|
||||||
const prog_uchar consolehelpMessage2[] PROGMEM = {"Date-ShowUser-ModifyUser_num_usermask_tagnumber"};
|
|
||||||
const prog_uchar consolehelpMessage3[] PROGMEM = {"AllUserDump-RemoveUser_num-OpenDoor_num"};
|
|
||||||
const prog_uchar consolehelpMessage4[] PROGMEM = {"UnlockAllDoors-LockAllDoors"};
|
|
||||||
const prog_uchar consolehelpMessage5[] PROGMEM = {"1_DisarmAlarm-2_ArmAlarm-3_TrainAlarm-9_ShowStatus"};
|
|
||||||
const prog_uchar consolehelpMessage6[] PROGMEM = {"Enable_password"};
|
|
||||||
const prog_uchar consoledefaultMessage[] PROGMEM = {"InvalidCommandPressQuestionMarkForHelp"};
|
|
||||||
|
|
||||||
const prog_uchar statusMessage1[] PROGMEM = {"AlarmArmedState_1_Armed"};
|
|
||||||
const prog_uchar statusMessage2[] PROGMEM = {"AlarmSirenState_1_Activated"};
|
|
||||||
const prog_uchar statusMessage3[] PROGMEM = {"FrontDoorOpenState_0_Closed"};
|
|
||||||
const prog_uchar statusMessage4[] PROGMEM = {"RearUpDoorOpenState_0_Closed"};
|
|
||||||
const prog_uchar statusMessage5[] PROGMEM = {"Door1UnlockedState_1_Locked"};
|
|
||||||
const prog_uchar statusMessage6[] PROGMEM = {"Door2UnlockedState_1_Locked"};
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
const prog_uchar httpheaderok[] PROGMEM = {"HTTP/1.1 200 OK\r\nCache-Control: no-store\r\nContent-Type: text/html\r\n\r\n"};
|
||||||
|
const prog_uchar httpheadernoauth[] PROGMEM = {"HTTP/1.1 403 Forbidden\r\nCache-Control: no-store\r\nContent-Type: text/html\r\n\r\n<a href='/'>Not logged in.</a>"};
|
||||||
|
//const prog_uchar httpheaderbadquery[] PROGMEM = {"HTTP/1.1 400 Bad Request\r\nCache-Control: no-store\r\nContent-Type: text/html\r\n\r\n"};
|
||||||
|
const prog_uchar title[] PROGMEM = {"<h2>HSL OAC</h2>"};
|
||||||
|
//const prog_uchar help[] PROGMEM = {"<hr/><pre>Numbers must be zero-padded.\n\n?e=0000 - enable\n?s000 - show user\n?m000&p000&t00000000 - modify user permission tag\n?a - list all users\n?r000 - remove user\n?o1 ?o2 - open door 1/2\n?u - unlock all\n?l - lock all?1 - arm\n?2 - disarm\n?3 - train\n?9 - status</pre>"};
|
||||||
|
const prog_uchar help[] PROGMEM = {"<hr/><pre>Numbers must be zero-padded.\n\n?e=0000 - enable\n</pre>"};
|
||||||
|
|
||||||
void setup(){ // Runs once at Arduino boot-up
|
void setup(){ // Runs once at Arduino boot-up
|
||||||
|
|
||||||
|
|
@ -248,7 +229,7 @@ void setup(){ // Runs once at Arduino boot-up
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Serial.begin(57600); // Set up Serial output at 8,N,1,57600bps
|
// Serial.begin(57600); // Set up Serial output at 8,N,1,57600bps
|
||||||
|
|
||||||
|
|
||||||
logReboot();
|
logReboot();
|
||||||
|
|
@ -284,81 +265,223 @@ void loop() // Main branch, runs over and ov
|
||||||
// character) and the line is blank, the http request has ended,
|
// character) and the line is blank, the http request has ended,
|
||||||
// so you can send a reply
|
// so you can send a reply
|
||||||
if (c == '\n' && currentLineIsBlank) {
|
if (c == '\n' && currentLineIsBlank) {
|
||||||
// send a standard http response header
|
|
||||||
client.println("HTTP/1.1 200 OK");
|
|
||||||
client.println("Cache-Control: no-store\r\nContent-Type: text/html");
|
|
||||||
client.println();
|
|
||||||
|
|
||||||
if(readString.indexOf("?hi") > 0) {
|
if(readString.indexOf("?hi") > 0) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
client.println("hi");
|
client.println("hi");
|
||||||
}
|
}
|
||||||
if(readString.indexOf("?s") > 0) { // list user
|
if(readString.indexOf("?s") > 0) { // show user
|
||||||
int offset = readString.indexOf("?s");
|
int offset = readString.indexOf("?s");
|
||||||
char usernum[4] = {readString[offset+2],readString[offset+3],readString[offset+4],'\0'};
|
char usernum[4] = {readString[offset+2],readString[offset+3],readString[offset+4],'\0'};
|
||||||
|
|
||||||
client.print("s");
|
if(privmodeEnabled==true) {
|
||||||
client.println(usernum);
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
client.println("<pre>");
|
||||||
|
client.print("UserNum:");
|
||||||
|
client.print(" ");
|
||||||
|
client.print("Usermask:");
|
||||||
|
client.print(" ");
|
||||||
|
client.println("TagNum:");
|
||||||
|
dumpUser(client, atoi(usernum));
|
||||||
|
client.println("</pre>");
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(readString.indexOf("?m") > 0) {
|
if(readString.indexOf("?m") > 0) { // modify user #, permission #, tag # (?m000&p000&t00000000 must be zero-padded)
|
||||||
client.println("m"); // modify user <num> <usermask> <tagnumber>
|
int offset = readString.indexOf("?m"); // user, 3 chars
|
||||||
}
|
int initialoffset = offset; // save for comparison
|
||||||
if(readString.indexOf("?a") > 0) {
|
char usernum[4] = {readString[offset+2],readString[offset+3],readString[offset+4],'\0'};
|
||||||
client.println("a"); // all users
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?r") > 0) {
|
|
||||||
client.println("r"); // remove user <num>
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?o") > 0) {
|
|
||||||
client.println("o"); // open <door#>
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?u") > 0) {
|
|
||||||
unlockall();
|
|
||||||
client.println("u");
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?l") > 0) {
|
|
||||||
lockall();
|
|
||||||
chirpAlarm(1);
|
|
||||||
client.println("l");
|
|
||||||
}
|
|
||||||
/*
|
|
||||||
if(readString.indexOf("?1") > 0) {
|
|
||||||
client.println("1"); // disarm
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?2") > 0) {
|
|
||||||
client.println("2"); // arm
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?3") > 0) {
|
|
||||||
client.println("3"); // train
|
|
||||||
}
|
|
||||||
*/
|
|
||||||
if(readString.indexOf("?9") > 0) {
|
|
||||||
client.println("<pre>");
|
|
||||||
client.print("Alarm armed:");
|
|
||||||
client.println(alarmArmed,DEC);
|
|
||||||
client.print("Alarm activated:");
|
|
||||||
client.println(alarmActivated,DEC);
|
|
||||||
client.print("Alarm 3:");
|
|
||||||
client.println(pollAlarm(3),DEC);
|
|
||||||
client.print("Alarm 2:");
|
|
||||||
client.println(pollAlarm(2),DEC);
|
|
||||||
client.print("Door 1 locked:");
|
|
||||||
client.println(door1Locked);
|
|
||||||
client.print("Door 2 locked:");
|
|
||||||
client.println(door2Locked);
|
|
||||||
client.println("</pre>");
|
|
||||||
}
|
|
||||||
if(readString.indexOf("?e") > 0) {
|
|
||||||
int offset = readString.indexOf("?e");
|
|
||||||
char pass[5] = {readString[offset+2],readString[offset+3],readString[offset+4],readString[offset+5],'\0'};
|
|
||||||
|
|
||||||
login(strtoul(pass,NULL,16));
|
offset = readString.indexOf("&p"); // permissions mask, 3 chars
|
||||||
if(privmodeEnabled) {
|
char usermask[4] = {readString[offset+2],readString[offset+3],readString[offset+4],'\0'};
|
||||||
client.println("ok");
|
|
||||||
|
offset = readString.indexOf("&t"); // tag, 8 chars
|
||||||
|
char usertag[9] = {readString[offset+2],readString[offset+3],readString[offset+4],readString[offset+5],
|
||||||
|
readString[offset+6],readString[offset+7],readString[offset+8],readString[offset+9],'\0'};
|
||||||
|
|
||||||
|
if(offset-initialoffset == 10){
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
client.println("<pre>");
|
||||||
|
client.println("prev:");
|
||||||
|
dumpUser(client, atoi(usernum));
|
||||||
|
addUser(atoi(usernum), atoi(usermask), strtoul(usertag,NULL,16));
|
||||||
|
client.println("cur:");
|
||||||
|
dumpUser(client, atoi(usernum));
|
||||||
|
client.println("</pre>");
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
client.println("fail");
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
client.println("err:badquery");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
if(readString.indexOf("?a") > 0) { //list all users
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
logDate();
|
||||||
|
client.println("<pre>");
|
||||||
|
client.print("UserNum:");
|
||||||
|
client.print(" ");
|
||||||
|
client.print("Usermask:");
|
||||||
|
client.print(" ");
|
||||||
|
client.println("TagNum:");
|
||||||
|
for(int i=0; i<(NUMUSERS); i++){
|
||||||
|
dumpUser(client,i);
|
||||||
|
}
|
||||||
|
client.println("</pre>");
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?r") > 0) { //remove user (?r000)
|
||||||
|
int offset = readString.indexOf("?r");
|
||||||
|
char usernum[4] = {readString[offset+2],readString[offset+3],readString[offset+4],'\0'};
|
||||||
|
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
client.println("r");
|
||||||
|
client.println("<pre>");
|
||||||
|
client.println("prev:");
|
||||||
|
dumpUser(client,atoi(usernum));
|
||||||
|
deleteUser(atoi(usernum));
|
||||||
|
client.println("cur:");
|
||||||
|
dumpUser(client,atoi(usernum));
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?o") > 0) { // open door ?o1 or ?o2
|
||||||
|
int offset = readString.indexOf("?o");
|
||||||
|
char doornum[2] = {readString[offset+2],'\0'};
|
||||||
|
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
if(atoi(doornum) == 1){
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
alarmState(0); // Set to door chime only/open doors
|
||||||
|
armAlarm(4);
|
||||||
|
doorUnlock(1); // Open the door specified
|
||||||
|
door1locktimer=millis();
|
||||||
|
client.println("o1");
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
if(atoi(doornum) == 2){
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
alarmState(0); // Set to door chime only/open doors
|
||||||
|
armAlarm(4);
|
||||||
|
doorUnlock(2);
|
||||||
|
door2locktimer=millis();
|
||||||
|
client.println("o2");
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
client.println("err:baddoor#");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?u") > 0) { //unlock
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
unlockall();
|
||||||
|
printStatus(client);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?l") > 0) { //lock
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
lockall();
|
||||||
|
chirpAlarm(1);
|
||||||
|
printStatus(client);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?1") > 0) { // disarm
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
armAlarm(0);
|
||||||
|
alarmState(0);
|
||||||
|
chirpAlarm(1);
|
||||||
|
printStatus(client);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?2") > 0) { // arm
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
chirpAlarm(20); // 200 chirps = ~30 seconds delay
|
||||||
|
armAlarm(1);
|
||||||
|
printStatus(client);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?3") > 0) { // train
|
||||||
|
if(privmodeEnabled==true) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
trainAlarm();
|
||||||
|
printStatus(client);
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
logprivFail();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?9") > 0) { // status
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
PROGMEMprintln(client,title);
|
||||||
|
printStatus(client);
|
||||||
|
PROGMEMprintln(client,help);
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?e=") > 0) {
|
||||||
|
int offset = readString.indexOf("?e=");
|
||||||
|
char pass[5] = {readString[offset+3],readString[offset+4],readString[offset+5],readString[offset+6],'\0'};
|
||||||
|
|
||||||
|
if(login(strtoul(pass,NULL,16))) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
PROGMEMprintln(client,title);
|
||||||
|
client.println("authok");
|
||||||
|
PROGMEMprintln(client,help);
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
PROGMEMprintln(client,httpheadernoauth);
|
||||||
|
PROGMEMprintln(client,title);
|
||||||
|
client.println("authfail");
|
||||||
|
PROGMEMprintln(client,help);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if(readString.indexOf("?") < 1) {
|
||||||
|
PROGMEMprintln(client,httpheaderok);
|
||||||
|
PROGMEMprintln(client,title);
|
||||||
|
PROGMEMprintln(client,help);
|
||||||
|
}
|
||||||
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
@ -418,14 +541,9 @@ void loop() // Main branch, runs over and ov
|
||||||
if(hour==23 && minute==59 && door1Locked==false){
|
if(hour==23 && minute==59 && door1Locked==false){
|
||||||
doorLock(1);
|
doorLock(1);
|
||||||
door1Locked==true;
|
door1Locked==true;
|
||||||
Serial.println("Door 1 locked for 2359 bed time.");
|
addToLog('L',2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// Notes: RFID polling is interrupt driven, just test for the reader1Count value to climb to the bit length of the key
|
// Notes: RFID polling is interrupt driven, just test for the reader1Count value to climb to the bit length of the key
|
||||||
// change reader1Count & reader1 et. al. to arrays for loop handling of multiple reader output events
|
// change reader1Count & reader1 et. al. to arrays for loop handling of multiple reader output events
|
||||||
|
|
@ -474,9 +592,7 @@ void loop() // Main branch, runs over and ov
|
||||||
|
|
||||||
case 255: // Locked out user
|
case 255: // Locked out user
|
||||||
{
|
{
|
||||||
Serial.print("User ");
|
addToLog('F',userMask1);
|
||||||
Serial.print(userMask1,DEC);
|
|
||||||
Serial.println(" locked out.");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -553,9 +669,7 @@ void loop() // Main branch, runs over and ov
|
||||||
|
|
||||||
case 255: // Locked out
|
case 255: // Locked out
|
||||||
{
|
{
|
||||||
Serial.print("User ");
|
addToLog('F',userMask2);
|
||||||
Serial.print(userMask2,DEC);
|
|
||||||
Serial.println(" locked out.");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -953,17 +1067,13 @@ void trainAlarm(){ // Train the system about the default s
|
||||||
delay(50); // Give the readings time to settle
|
delay(50); // Give the readings time to settle
|
||||||
}
|
}
|
||||||
avg=((temp[0]+temp[1]+temp[2]+temp[3]+temp[4])/20); // Average the results to get best values
|
avg=((temp[0]+temp[1]+temp[2]+temp[3]+temp[4])/20); // Average the results to get best values
|
||||||
Serial.print("Sensor ");
|
addToLog('t',avg);
|
||||||
Serial.print(i);
|
|
||||||
Serial.print(" ");
|
|
||||||
Serial.print("value:");
|
|
||||||
Serial.println(avg);
|
|
||||||
EEPROM.write((EEPROM_ALARMZONES+i),byte(avg)); //Save results to EEPROM
|
EEPROM.write((EEPROM_ALARMZONES+i),byte(avg)); //Save results to EEPROM
|
||||||
avg=0;
|
avg=0;
|
||||||
}
|
}
|
||||||
|
|
||||||
logDate();
|
logDate();
|
||||||
PROGMEMprintln(alarmtrainMessage);
|
//PROGMEMprintln(alarmtrainMessage);
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -992,14 +1102,11 @@ int found=-1;
|
||||||
for(int i=0; i<=numUsers; i++){
|
for(int i=0; i<=numUsers; i++){
|
||||||
if(input == superUserList[i]){
|
if(input == superUserList[i]){
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("Superuser ");
|
addToLog('S',i);
|
||||||
Serial.print(i,DEC);
|
|
||||||
Serial.println(" found.");
|
|
||||||
found=i;
|
found=i;
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return found; //If no, return -1
|
return found; //If no, return -1
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1011,9 +1118,7 @@ byte dp=1;
|
||||||
else(dp=DOORPIN2);
|
else(dp=DOORPIN2);
|
||||||
|
|
||||||
digitalWrite(dp, HIGH);
|
digitalWrite(dp, HIGH);
|
||||||
Serial.print("Door ");
|
//addToLog('U',input);
|
||||||
Serial.print(input,DEC);
|
|
||||||
Serial.println(" unlocked");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1024,9 +1129,7 @@ byte dp=1;
|
||||||
else(dp=DOORPIN2);
|
else(dp=DOORPIN2);
|
||||||
|
|
||||||
digitalWrite(dp, LOW);
|
digitalWrite(dp, LOW);
|
||||||
Serial.print("Door ");
|
//addToLog('L',input);
|
||||||
Serial.print(input,DEC);
|
|
||||||
Serial.println(" locked");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
void unlockall() {
|
void unlockall() {
|
||||||
|
|
@ -1037,7 +1140,8 @@ void unlockall() {
|
||||||
door1Locked=false;
|
door1Locked=false;
|
||||||
door2Locked=false;
|
door2Locked=false;
|
||||||
chirpAlarm(3);
|
chirpAlarm(3);
|
||||||
PROGMEMprintln(doorsunlockedMessage);
|
|
||||||
|
//PROGMEMprintln(doorsunlockedMessage);
|
||||||
}
|
}
|
||||||
void lockall() { //Lock down all doors. Can also be run periodically to safeguard system.
|
void lockall() { //Lock down all doors. Can also be run periodically to safeguard system.
|
||||||
|
|
||||||
|
|
@ -1045,147 +1149,46 @@ void lockall() { //Lock down all doors. Can also be run per
|
||||||
digitalWrite(DOORPIN2,LOW);
|
digitalWrite(DOORPIN2,LOW);
|
||||||
door1Locked=true;
|
door1Locked=true;
|
||||||
door2Locked=true;
|
door2Locked=true;
|
||||||
PROGMEMprintln(doorslockedMessage);
|
//PROGMEMprintln(doorslockedMessage);
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Logging Functions - Modify these as needed for your application.
|
|
||||||
Logging may be serial to USB or via Ethernet (to be added later)
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
void PROGMEMprintln(const prog_uchar str[]) // Function to retrieve logging strings from program memory
|
|
||||||
{ // Prints newline after each string
|
|
||||||
char c;
|
|
||||||
if(!str) return;
|
|
||||||
|
|
||||||
//if(client.connect(server, 80) > 0) {
|
|
||||||
// client.print("GET /~access/log/?device=door&data=");
|
|
||||||
while((c = pgm_read_byte(str++))){
|
|
||||||
Serial.write(c);
|
|
||||||
// client.write(c);
|
|
||||||
}
|
|
||||||
//client.println(" HTTP/1.0");
|
|
||||||
//client.println();
|
|
||||||
//client.stop();
|
|
||||||
// reset values coming from http
|
|
||||||
// httpresponse = "";
|
|
||||||
//}
|
|
||||||
Serial.println();
|
|
||||||
}
|
|
||||||
|
|
||||||
void PROGMEMprint(const prog_uchar str[]) // Function to retrieve logging strings from program memory
|
|
||||||
{ // Does not print newlines
|
|
||||||
|
|
||||||
char c;
|
|
||||||
if(!str) return;
|
|
||||||
//if(client.connect(server, 80) > 0) {
|
|
||||||
// client.print("GET /~access/log/?device=door&data=");
|
|
||||||
while((c = pgm_read_byte(str++))){
|
|
||||||
Serial.write(c);
|
|
||||||
// client.write(c);
|
|
||||||
}
|
|
||||||
// client.println(" HTTP/1.0");
|
|
||||||
// client.println();
|
|
||||||
// client.stop();
|
|
||||||
// reset values coming from http
|
|
||||||
// httpresponse = "";
|
|
||||||
//}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void logDate()
|
void logDate()
|
||||||
{
|
{
|
||||||
ds1307.getDateDs1307(&second, &minute, &hour, &dayOfWeek, &dayOfMonth, &month, &year);
|
ds1307.getDateDs1307(&second, &minute, &hour, &dayOfWeek, &dayOfMonth, &month, &year);
|
||||||
Serial.print(hour, DEC);
|
addToLog('H',hour);
|
||||||
Serial.print(":");
|
addToLog('M',minute);
|
||||||
Serial.print(minute, DEC);
|
|
||||||
Serial.print(":");
|
|
||||||
Serial.print(second, DEC);
|
|
||||||
Serial.print(" ");
|
|
||||||
Serial.print(month, DEC);
|
|
||||||
Serial.print("/");
|
|
||||||
Serial.print(dayOfMonth, DEC);
|
|
||||||
Serial.print("/");
|
|
||||||
Serial.print(year, DEC);
|
|
||||||
Serial.print(' ');
|
|
||||||
|
|
||||||
switch(dayOfWeek){
|
|
||||||
|
|
||||||
case 1:{
|
|
||||||
Serial.print("SUN");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 2:{
|
|
||||||
Serial.print("MON");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 3:{
|
|
||||||
Serial.print("TUE");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 4:{
|
|
||||||
Serial.print("WED");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 5:{
|
|
||||||
Serial.print("THU");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 6:{
|
|
||||||
Serial.print("FRI");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
case 7:{
|
|
||||||
Serial.print("SAT");
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Serial.print(" ");
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logReboot() { //Log system startup
|
void logReboot() { //Log system startup
|
||||||
logDate();
|
logDate();
|
||||||
PROGMEMprintln(rebootMessage);
|
//PROGMEMprintln(rebootMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void logChime() {
|
void logChime() {
|
||||||
logDate();
|
logDate();
|
||||||
PROGMEMprintln(doorChimeMessage);
|
//PROGMEMprintln(doorChimeMessage);
|
||||||
}
|
}
|
||||||
|
|
||||||
void logTagPresent (long user, byte reader) { //Log Tag Presented events
|
void logTagPresent (long user, byte reader) { //Log Tag Presented events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("User ");
|
addToLog('R',user); // fix this, user is long instead of int
|
||||||
if(DEBUG==2){ Serial.print(user,HEX);}
|
|
||||||
Serial.print(" presented tag at reader ");
|
|
||||||
Serial.println(reader,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logAccessGranted(long user, byte reader) { //Log Access events
|
void logAccessGranted(long user, byte reader) { //Log Access events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("User ");
|
addToLog('G',user); // fix this, user is long instead of int
|
||||||
if(DEBUG==2){Serial.print(user,HEX);}
|
|
||||||
Serial.print(" granted access at reader ");
|
|
||||||
Serial.println(reader,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logAccessDenied(long user, byte reader) { //Log Access denied events
|
void logAccessDenied(long user, byte reader) { //Log Access denied events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("User ");
|
addToLog('D',user); // fix this, user is long instead of int
|
||||||
if(DEBUG==1){Serial.print(user,HEX);}
|
|
||||||
Serial.print(" denied access at reader ");
|
|
||||||
Serial.println(reader,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logkeypadCommand(byte reader, long command){
|
void logkeypadCommand(byte reader, long command){
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("Command ");
|
addToLog('C',command); // fix this, user is long instead of int
|
||||||
Serial.print(command,HEX);
|
|
||||||
Serial.print(" entered at reader ");
|
|
||||||
Serial.println(reader,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1193,41 +1196,32 @@ void logkeypadCommand(byte reader, long command){
|
||||||
|
|
||||||
void logalarmSensor(byte zone) { //Log Alarm zone events
|
void logalarmSensor(byte zone) { //Log Alarm zone events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("Zone ");
|
addToLog('S',zone);
|
||||||
Serial.print(zone,DEC);
|
|
||||||
Serial.println(" sensor activated");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logalarmTriggered() {
|
void logalarmTriggered() {
|
||||||
logDate();
|
logDate();
|
||||||
Serial.println("Alarm triggered!"); // This phrase can be scanned for by alerting scripts.
|
addToLog('T',0);
|
||||||
}
|
}
|
||||||
|
|
||||||
void logunLock(long user, byte door) { //Log unlock events
|
void logunLock(long user, byte door) { //Log unlock events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("User ");
|
addToLog('U',user); // fix this, user is long instead of int
|
||||||
Serial.print(user,DEC);
|
|
||||||
Serial.print(" unlocked door ");
|
|
||||||
Serial.println(door,DEC);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logalarmState(byte level) { //Log unlock events
|
void logalarmState(byte level) { //Log unlock events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("Alarm level changed to ");
|
addToLog('M',level);
|
||||||
Serial.println(level,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logalarmArmed(byte level) { //Log unlock events
|
void logalarmArmed(byte level) { //Log unlock events
|
||||||
logDate();
|
logDate();
|
||||||
Serial.print("Alarm armed level changed to ");
|
addToLog('A',level);
|
||||||
Serial.println(level,DEC);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void logprivFail() {
|
void logprivFail() {
|
||||||
// Serial.println("Priv mode disabled");
|
addToLog('F',2);
|
||||||
PROGMEMprintln(privsdeniedMessage);
|
}
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
void hardwareTest(long iterations)
|
void hardwareTest(long iterations)
|
||||||
|
|
@ -1251,6 +1245,7 @@ void hardwareTest(long iterations)
|
||||||
|
|
||||||
for(long counter=1; counter<=iterations; counter++) { // Do this number of times specified
|
for(long counter=1; counter<=iterations; counter++) { // Do this number of times specified
|
||||||
logDate();
|
logDate();
|
||||||
|
/*
|
||||||
Serial.print("\n");
|
Serial.print("\n");
|
||||||
Serial.println("Pass: ");
|
Serial.println("Pass: ");
|
||||||
Serial.println(counter);
|
Serial.println(counter);
|
||||||
|
|
@ -1270,19 +1265,20 @@ void hardwareTest(long iterations)
|
||||||
Serial.println(analogRead(2));
|
Serial.println(analogRead(2));
|
||||||
Serial.print("Input A3:");
|
Serial.print("Input A3:");
|
||||||
Serial.println(analogRead(3));
|
Serial.println(analogRead(3));
|
||||||
|
*/
|
||||||
delay(5000);
|
delay(5000);
|
||||||
|
|
||||||
digitalWrite(6,HIGH); // Relay exercise routine
|
digitalWrite(6,HIGH); // Relay exercise routine
|
||||||
digitalWrite(7,HIGH);
|
digitalWrite(7,HIGH);
|
||||||
digitalWrite(8,HIGH);
|
digitalWrite(8,HIGH);
|
||||||
digitalWrite(9,HIGH);
|
digitalWrite(9,HIGH);
|
||||||
Serial.println("Relays 0..3 on");
|
//Serial.println("Relays 0..3 on");
|
||||||
delay(2000);
|
delay(2000);
|
||||||
digitalWrite(6,LOW);
|
digitalWrite(6,LOW);
|
||||||
digitalWrite(7,LOW);
|
digitalWrite(7,LOW);
|
||||||
digitalWrite(8,LOW);
|
digitalWrite(8,LOW);
|
||||||
digitalWrite(9,LOW);
|
digitalWrite(9,LOW);
|
||||||
Serial.println("Relays 0..3 off");
|
//Serial.println("Relays 0..3 off");
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1292,7 +1288,7 @@ void clearUsers() //Erases all users from EEPROM
|
||||||
for(int i=EEPROM_FIRSTUSER; i<=EEPROM_LASTUSER; i++){
|
for(int i=EEPROM_FIRSTUSER; i<=EEPROM_LASTUSER; i++){
|
||||||
EEPROM.write(i,0);
|
EEPROM.write(i,0);
|
||||||
logDate();
|
logDate();
|
||||||
Serial.println("User database erased.");
|
addToLog('Z',0);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -1304,32 +1300,21 @@ void addUser(int userNum, byte userMask, unsigned long tagNumber) // Modif
|
||||||
logDate();
|
logDate();
|
||||||
|
|
||||||
if((userNum <0) || (userNum > NUMUSERS)) { // Do not write to invalid EEPROM addresses.
|
if((userNum <0) || (userNum > NUMUSERS)) { // Do not write to invalid EEPROM addresses.
|
||||||
|
addToLog('i',userNum);
|
||||||
Serial.print("Invalid user modify attempted.");
|
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
EEPROM_buffer[0] = byte(tagNumber & 0xFFF); // Fill the buffer with the values to write to bytes 0..4
|
EEPROM_buffer[0] = byte(tagNumber & 0xFFF); // Fill the buffer with the values to write to bytes 0..4
|
||||||
EEPROM_buffer[1] = byte(tagNumber >> 8);
|
EEPROM_buffer[1] = byte(tagNumber >> 8);
|
||||||
EEPROM_buffer[2] = byte(tagNumber >> 16);
|
EEPROM_buffer[2] = byte(tagNumber >> 16);
|
||||||
EEPROM_buffer[3] = byte(tagNumber >> 24);
|
EEPROM_buffer[3] = byte(tagNumber >> 24);
|
||||||
EEPROM_buffer[4] = byte(userMask);
|
EEPROM_buffer[4] = byte(userMask);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for(int i=0; i<5; i++){
|
for(int i=0; i<5; i++){
|
||||||
EEPROM.write((offset+i), (EEPROM_buffer[i])); // Store the resulting value in 5 bytes of EEPROM.
|
EEPROM.write((offset+i), (EEPROM_buffer[i])); // Store the resulting value in 5 bytes of EEPROM.
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Serial.print("User ");
|
addToLog('M',userNum);
|
||||||
Serial.print(userNum,DEC);
|
|
||||||
Serial.println(" successfully modified");
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
@ -1342,24 +1327,15 @@ void deleteUser(int userNum) // Delet
|
||||||
|
|
||||||
if((userNum <0) || (userNum > NUMUSERS)) { // Do not write to invalid EEPROM addresses.
|
if((userNum <0) || (userNum > NUMUSERS)) { // Do not write to invalid EEPROM addresses.
|
||||||
|
|
||||||
Serial.print("Invalid user delete attempted.");
|
addToLog('I',userNum);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
for(int i=0; i<5; i++){
|
for(int i=0; i<5; i++){
|
||||||
EEPROM.write((offset+i), 0xFF); // Store the resulting value in 5 bytes of EEPROM.
|
EEPROM.write((offset+i), 0xFF); // Store the resulting value in 5 bytes of EEPROM.
|
||||||
// Starting at offset.
|
// Starting at offset.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
addToLog('D',userNum);
|
||||||
Serial.print("User deleted at position ");
|
|
||||||
Serial.println(userNum);
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
@ -1390,24 +1366,19 @@ int checkUser(unsigned long tagNumber) // Check
|
||||||
|
|
||||||
|
|
||||||
if((EEPROM_buffer == tagNumber) && (tagNumber !=0xFFFFFFFF) && (tagNumber !=0x0)) { // Return a not found on blank (0xFFFFFFFF) entries
|
if((EEPROM_buffer == tagNumber) && (tagNumber !=0xFFFFFFFF) && (tagNumber !=0x0)) { // Return a not found on blank (0xFFFFFFFF) entries
|
||||||
Serial.print("User ");
|
addToLog('C',((i-EEPROM_FIRSTUSER)/5));
|
||||||
Serial.print(((i-EEPROM_FIRSTUSER)/5),DEC);
|
|
||||||
Serial.println(" authenticated.");
|
|
||||||
found = EEPROM.read(i+4);
|
found = EEPROM.read(i+4);
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
Serial.println("User not found");
|
addToLog('c',0);
|
||||||
delay(1000); // Delay to prevent brute-force attacks on reader
|
delay(1000); // Delay to prevent brute-force attacks on reader
|
||||||
return found;
|
return found;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void dumpUser(EthernetClient client, byte usernum) // Return information ona particular entry in the local DB
|
||||||
|
|
||||||
|
|
||||||
void dumpUser(byte usernum) // Return information ona particular entry in the local DB
|
|
||||||
{ // Users number 0..NUMUSERS
|
{ // Users number 0..NUMUSERS
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -1427,66 +1398,94 @@ void dumpUser(byte usernum) // Return
|
||||||
EEPROM_buffer= EEPROM_buffer<<8;
|
EEPROM_buffer= EEPROM_buffer<<8;
|
||||||
EEPROM_buffer=(EEPROM_buffer ^ EEPROM.read(i));
|
EEPROM_buffer=(EEPROM_buffer ^ EEPROM.read(i));
|
||||||
|
|
||||||
|
client.print(((i-EEPROM_FIRSTUSER)/5),DEC);
|
||||||
|
client.print("\t");
|
||||||
Serial.print(((i-EEPROM_FIRSTUSER)/5),DEC);
|
client.print(EEPROM.read(i+4),DEC);
|
||||||
Serial.print("\t");
|
client.print("\t");
|
||||||
Serial.print(EEPROM.read(i+4),DEC);
|
|
||||||
Serial.print("\t");
|
|
||||||
|
|
||||||
if(DEBUG==2){
|
if(DEBUG==2){
|
||||||
Serial.println(EEPROM_buffer,HEX);
|
client.println(EEPROM_buffer,HEX);
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if(EEPROM_buffer != 0xFFFFFFFF) {
|
if(EEPROM_buffer != 0xFFFFFFFF) {
|
||||||
Serial.println("********");
|
client.println("********");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
else Serial.println("Bad user number!");
|
else client.println("Bad user number!");
|
||||||
}
|
}
|
||||||
|
|
||||||
void login(long input) {
|
boolean login(long input) {
|
||||||
logDate();
|
logDate();
|
||||||
if((consoleFail>=5) && (millis()-consolefailTimer<300000)) // Do not allow priv mode if more than 5 failed logins in 5 minute
|
if((consoleFail>=5) && (millis()-consolefailTimer<300000)) // Do not allow priv mode if more than 5 failed logins in 5 minute
|
||||||
{
|
{
|
||||||
PROGMEMprintln(privsAttemptsMessage);
|
addToLog('F',1);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
if (input == PRIVPASSWORD)
|
if (input == PRIVPASSWORD)
|
||||||
{
|
{
|
||||||
consoleFail=0;
|
consoleFail=0;
|
||||||
PROGMEMprintln(privsenabledMessage);
|
addToLog('S',0);
|
||||||
privmodeEnabled=true;
|
privmodeEnabled=true;
|
||||||
|
return true;
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
PROGMEMprintln(privsdisabledMessage);
|
addToLog('F',0);
|
||||||
privmodeEnabled=false;
|
privmodeEnabled=false;
|
||||||
if(consoleFail==0) { // Set the timeout for failed logins
|
if(consoleFail==0) { // Set the timeout for failed logins
|
||||||
consolefailTimer=millis();
|
consolefailTimer=millis();
|
||||||
}
|
}
|
||||||
consoleFail++; // Increment the login failure counter
|
consoleFail++; // Increment the login failure counter
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void showUser(char* input) {
|
void printStatus(EthernetClient client) {
|
||||||
|
client.println("<pre>");
|
||||||
if(privmodeEnabled==true) {
|
client.print("Alarm armed:");
|
||||||
Serial.print("UserNum:");
|
client.println(alarmArmed,DEC);
|
||||||
Serial.print(" ");
|
client.print("Alarm activated:");
|
||||||
Serial.print("Usermask:");
|
client.println(alarmActivated,DEC);
|
||||||
Serial.print(" ");
|
client.print("Alarm 3:");
|
||||||
Serial.println("TagNum:");
|
client.println(pollAlarm(3),DEC);
|
||||||
dumpUser(atoi(input));
|
client.print("Alarm 2:");
|
||||||
//Serial.println(); // commented out due to dumpUser always printing a line -WB 7-7-2011
|
client.println(pollAlarm(2),DEC);
|
||||||
}
|
client.print("Door 1 locked:");
|
||||||
else{logprivFail();}
|
client.println(door1Locked);
|
||||||
|
client.print("Door 2 locked:");
|
||||||
|
client.println(door2Locked);
|
||||||
|
client.println("</pre>");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void addToLog(char type, int data) {
|
||||||
|
logKeys[logCursor] = type;
|
||||||
|
logData[logCursor] = data;
|
||||||
|
|
||||||
|
logCursor += 1;
|
||||||
|
if(logCursor > 20) {
|
||||||
|
logCursor = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void readFromLog(int index, char &type, int &data) {
|
||||||
|
logKeys[index] = type;
|
||||||
|
logData[index] = data;
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
void PROGMEMprintln(EthernetClient client, const prog_uchar str[]) // Function to retrieve strings from program memory
|
||||||
|
{
|
||||||
|
char c;
|
||||||
|
if(!str) return;
|
||||||
|
while((c = pgm_read_byte(str++))){
|
||||||
|
client.print(c);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/* Wrapper functions for interrupt attachment
|
/* Wrapper functions for interrupt attachment
|
||||||
Could be cleaned up in library?
|
Could be cleaned up in library?
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user