Compare commits

..

18 Commits

Author SHA1 Message Date
0c044c6e11 Adding reboot logging 2013-12-24 22:26:26 -07:00
006fb81b95 Merge branch 'master' of github.com:zyphlar/Open_Access_Control_Ethernet 2013-12-01 15:53:04 -07:00
0729c76f49 Updating to Arduino 1.0.3 and using JSON for door status API - v 0.06 2013-12-01 15:51:51 -07:00
c594eb4680 Merge branch 'master' of github.com:heatsynclabs/Open_Access_Control_Ethernet
Screw the heatsync branch, overwrite with the zyphlar changes!

Conflicts:
	Open_Access_Control_Ethernet.ino
2013-11-22 18:49:39 -07:00
52c51f49c5 Cleaning up various logging items 2013-11-22 18:33:56 -07:00
d3d432b129 Update README.txt 2013-11-22 14:02:05 -07:00
464a3f2e29 More precise logging of door opens 2013-03-21 09:00:28 -07:00
055754b484 Fixing issue #5 where door would remain unlocked when user presents a card. Also fixed #6 where F2 was logged unnecessarily. 2013-03-21 08:21:37 -07:00
8e989ce4a2 Updating version, fixing minor issues with URL commands and logging 2013-03-11 23:44:27 -07:00
d028054ad8 Centralized logging with loglevels, DRYing functions, refactoring for size, using case instead of ifs. Adding individual door locking, update the enable/disable functionality 2013-03-11 21:19:00 -07:00
39fbc94fc8 Updated documentation of commands 2013-02-09 02:13:01 -07:00
39435f191a Adding Short Tie credit and incrementing version 0.03 2013-02-09 01:30:31 -07:00
ac32edeac9 Short Tie adding realtime clock input/output functionality 2013-02-08 21:08:16 -07:00
1dd2d0e694 Update README.txt 2012-09-26 23:21:03 -07:00
3e09743532 Changed header 2012-08-30 04:11:33 -07:00
31698b5c64 Reduced logging amount 2012-08-30 03:12:51 -07:00
e76c51b360 Formula for extracting userid 2012-08-29 23:26:15 -07:00
9bc5c9e15c Got log working with two int widths 2012-08-29 23:12:18 -07:00
2 changed files with 602 additions and 565 deletions

File diff suppressed because it is too large Load Diff

View File

@ -15,19 +15,11 @@ https://github.com/zyphlar/Open_Access_Control_Ethernet
For the latest version of the UPSTREAM software, visit: For the latest version of the UPSTREAM software, visit:
http://code.google.com/p/open-access-control/ http://code.google.com/p/open-access-control/
Features in Ethernet branch v0.01:
-Extremely rudimentary logging via HTTP using Arduino Ethernet
New features in v1.32:
-Serial console password with bad attempts lockout
-Fixed minor bugs, remove some unused functions
Note: Unpack the libraries (WIEGAND26, DS1307, PCATTACH) into your arduino Note: Unpack the libraries (WIEGAND26, DS1307, PCATTACH) into your arduino
libraries directory. This is usually: libraries directory. This is usually:
~/arduino/hardware/libraries/ ~/arduino/hardware/libraries/
(restart the Arduino program afterwards to apply the changes.)
The hardware design for the Open Access Control for Hacker Spaces uses the Arduino The hardware design for the Open Access Control for Hacker Spaces uses the Arduino
board with Atmega 328. It has been tested with: board with Atmega 328. It has been tested with:
@ -45,6 +37,8 @@ The software has the following features:
-(4) Relay outputs -(4) Relay outputs
USAGE:
The following pin assignments are assumed by this software: The following pin assignments are assumed by this software:
-Pins 2,3 for Reader 1 -Pins 2,3 for Reader 1
@ -53,3 +47,7 @@ The following pin assignments are assumed by this software:
-Pins A0,A1,A2,A3 for alarm sensors -Pins A0,A1,A2,A3 for alarm sensors
-Pins A4,A5 for SDA,SCL (I2C) -Pins A4,A5 for SDA,SCL (I2C)
You'll need to adjust the IPAddress and the PRIVPASSWORD to fit your environment/preferences.
(g*32767+G-1)/2