| Branch: | Revision:

root @ master

# Date Author Comment
e2a3c71f 10/18/2014 03:27 PM Thomas Mullins

Added shutoff when current is sensed when enabling tool

Also made a number of fixes to current sensing, which was quite broken.

2dde134c 04/25/2014 03:00 PM Thomas Mullins

Shorted modbus timeout

9e26460d 04/20/2014 02:47 AM root

Fixed a few issues setting up tooltron on Marvin

911e4e11 04/20/2014 02:28 AM Thomas Mullins

Adding init script for mainbox installation

8f66553c 04/13/2014 08:22 PM root

Fixed problems with previous fix

e4313fa2 04/13/2014 07:37 PM Thomas Mullins

Fixed exception in event add page

2f795968 02/13/2014 03:39 PM Thomas Mullins

Fixed card removal detection

Also switched from using seek command to select command with the reader.
Select returns a result immediately, rather than seek which first
returns an "in progress" error then later returns the card (as far as I
can tell).

0ed3db9d 02/12/2014 10:56 PM Thomas Mullins

Removed pid file necessity

Still uses it if running as root, but otherwise doesn't bother. Should
be a bit easier for local testing.

3411817b 02/12/2014 10:40 PM Thomas Mullins

Added clarifying comment for code that confused me

TODO document all this lol

90bb5fa7 02/12/2014 10:40 PM Thomas Mullins

Fixed event queue bug

6fbe093f 02/12/2014 10:39 PM Thomas Mullins

Implemented code for new RFID readers

It's not fully working yet. When the checksum is enabled, it ignores all
responses. Also, it no longer recognizes a missing card.

88570136 10/06/2013 03:20 PM Thomas Mullins

Added LRU eviction to cache. Not tested yet.

e247ef4d 10/06/2013 03:19 PM Thomas Mullins

Fixed build warnings from last commit

ea46eeca 10/05/2013 09:41 PM Thomas Mullins

Simplified read_file

4d22fe8e 09/19/2013 03:49 PM Thomas Mullins

Added automatic subscription to roboclub-gb on user creation

ddd50354 06/08/2013 11:41 PM Thomas Mullins

Minor typo

13fd9e7e 06/08/2013 11:34 PM Thomas Mullins

Added stop command and fixed pid file deletion

4f824e14 05/13/2013 03:19 PM Thomas Mullins

Added new view roboauthall

It returns bitmask of all tool permissions for a given user

cc7646f9 05/13/2013 03:18 PM Thomas Mullins

Major changes to mainbox code.

-Added local cache for RFID -> tool permissions
-Queries new page /crm/roboauth/%08x, which gives bitmask of all tool
permissions instead of just one
-Added pid file at /var/run/
-Now must be run as "tooltron run" and also has "tooltron refresh" and...

5e03b78d 05/05/2013 04:36 PM Thomas Mullins

Added new logging functions which inject timestamps

5e8f735d 05/05/2013 02:20 PM Thomas Mullins

Changed URLs to match actual server

f3599378 04/14/2013 06:16 PM Thomas Mullins

Adding rfid-web

The javascript will query the rfid reader (using main.c, set up on with CGI) and insert it into a form.

3e2fcd4e 04/01/2013 07:36 PM Thomas Mullins

Removed some of the fields on the add user admin page

36f3b65f 03/24/2013 04:18 PM Thomas Mullins

Removed rfid_restart flag

This way the AVR will always repoll the rfid reader after the timeout,
so hopefully it will never hang. Who knows?

5305e5e7 03/24/2013 04:17 PM Thomas Mullins

query.c has optional debug output for /add_card_event

06dedf83 03/24/2013 04:16 PM Thomas Mullins

Fixed missing import in

f15d9227 03/24/2013 03:29 PM Thomas Mullins

Adding program_tool script so we remember how to set tool id

0f87b24c 03/23/2013 12:57 AM Thomas Mullins

Added environment setup to for usage with apache

51fc4957 03/23/2013 12:03 AM Thomas Mullins

Removed migrations from repo

049ebb6e 03/23/2013 12:02 AM Thomas Mullins

Fixed Add User page error

e0657267 03/22/2013 09:45 PM Thomas Mullins

Added add_card_event view and made some minor changes to models

38df0012 03/22/2013 09:42 PM Thomas Mullins

Event submissions from ./tooltron tested and working

15928a3d 03/20/2013 02:02 PM Thomas Mullins

Added username/password to add_event query

880dc54f 03/20/2013 01:24 PM Thomas Mullins

Fixed curl SSL queries failing and queue bug

75cef49f 03/11/2013 09:42 PM Thomas Mullins

Added query_add_event to mainbox code

e680f143 03/08/2013 06:45 PM Thomas Mullins

Removed a bunch of .pyc files

8c30fb1a 03/08/2013 06:44 PM Thomas Mullins

Added some scripts for working with virtualenv and running the server

c12b6be5 03/08/2013 06:05 PM Thomas Mullins

Removed virtualenv and added requirements.txt in its place

Now each developer can have their own virtual environment built from
requirements.txt, without the annoying path problems that come from the
environment being under source control

e8960789 02/28/2013 09:32 PM Thomas Mullins

Fixed another overflow bug and removed isqrt

db11713d 02/27/2013 08:38 PM Thomas Mullins

Fixed timing in current sensing

The ADC interrupt didn't clear the TIFR timer interrupt flag, which
means the ADC wasn't triggered again on the next compare match.

975af07c 02/18/2013 12:05 AM Thomas Mullins

Fixed overflow in current calculation

f4df665c 02/10/2013 03:20 PM Thomas Mullins

Switch ADC to timer 1 because timer 0 was taken. Oops.

cbda92cc 02/09/2013 10:40 PM Thomas Mullins

Untested current RMS calculation

It's not actually RMS, it's variance. Same general idea.

036b4f9a 02/03/2013 04:25 PM Thomas Mullins

Fixed annoying warnings about avr/signal.h

cce97007 01/30/2013 05:15 PM Thomas Mullins

mainbox now prints error on 404 or 500 from server

a96c5547 01/27/2013 09:10 PM Thomas Mullins

Moved tool address to Makefile

15fa09f7 01/27/2013 07:02 PM Thomas Mullins

Made errors less noisy

If it can't connect to a tool, it will print an error once, and then
print another message when it is able to reconnect.

7bca325d 01/27/2013 04:58 PM Julian Binder

Merge branch 'master' of ssh://

63244bd1 01/27/2013 04:57 PM Julian Binder

jeff made changes to model and added migrations

72419919 01/27/2013 11:08 AM Julian Binder

Merge branch 'master' of ssh://

09daf466 01/27/2013 11:08 AM Julian Binder

updated boards to include holes.

828c5d29 01/21/2013 05:50 PM Thomas Mullins

Merge branch 'master' of ssh://

8f961e44 01/21/2013 05:47 PM Thomas Mullins

Added getopt for inputting serial device and CRM server

c40e056c 01/21/2013 05:01 PM Julian Binder

updated urls page.

66cc3ee3 01/21/2013 04:48 PM Julian Binder

added tool authentication system. It works!

7cc67b05 01/20/2013 04:37 PM Julian Binder

working on urls. views not working right

75228955 01/20/2013 01:26 PM Julian Binder

changed model to allow for hex rfid cards

314bdec9 01/20/2013 08:16 AM Julian Binder

added first attempt to do machine authentication

9e764ac9 01/18/2013 07:55 PM Thomas Mullins

Added query.c for queries from database web interface

95250ecf 01/12/2013 12:50 PM Julian Binder

customizing user admin

7976b167 01/05/2013 11:31 PM Julian Binder

preformed database migrations to fix null issues

7646a522 01/05/2013 07:07 PM Julian Binder

added admin interface.

663aed55 01/05/2013 03:16 PM Julian Binder

still trying to fix null

db843879 01/05/2013 03:10 PM Julian Binder

fixed not allowing null for db for dates

1094874a 01/05/2013 03:07 PM Julian Binder

Merge branch 'master' of ssh://

a048cd77 01/05/2013 03:07 PM Julian Binder

fixed issue with models for form validation. Allowed fields to be blank
that should be able to be blank.

bb0c65c6 01/05/2013 09:39 AM Julian Binder

added unicode functions to models

b2863bff 01/03/2013 07:18 PM Julian Binder

fixed a couple errors in the Then preformed a migration.

03f9c52d 01/03/2013 11:00 AM Julian Binder

Finished defining models. Also added function to create RoboUser
instances. Also modified settings to look for RoboUser as the default
user class.

cd771306 12/31/2012 05:36 PM Julian Binder

Updated user model

988e217a 12/27/2012 07:22 PM Julian Binder

created new app roboclub crm. I will be working on user authentication and
the user model

d1a4905f 12/27/2012 04:09 PM officers

added south for database migration

1a305335 12/27/2012 01:51 PM officers

initial commit of virtual python enviornment and django project. this should
create a fully reproduceable devolopment enviornment. for info see

bbf2f5ad 12/13/2012 04:04 PM Thomas Mullins

Added flushing before write to rfid reader

And other various fixes and changes, which I don't remember. Changed
rfid reading to read every tick, but only try writing if enough ticks
have passed.

8c95bbef 12/13/2012 03:59 PM Thomas Mullins

Changed read util to flush input and wait for reads to complete

d47be08d 12/12/2012 07:30 PM Thomas Mullins

Merge branch 'master' of ssh://

94548bf4 12/12/2012 07:29 PM Thomas Mullins

Moved timing to time.c, and increased period of rfid polling

2f4e4add 12/12/2012 01:24 AM Julian Binder

initial commit of tooltron boards

10936c07 12/11/2012 03:39 PM Thomas Mullins

Added current sensing to toolbox

4b7d087b 12/03/2012 04:18 PM Thomas Mullins

Tool stops waiting for access response if id is removed

420df25b 12/03/2012 03:50 PM Thomas Mullins

Added c program for reading from rfid reader on computer

f5d1f56a 12/03/2012 12:08 AM Thomas Mullins

Added tool state TS_DENY, with red LED until card is removed

215b2fa6 12/03/2012 12:02 AM Thomas Mullins

Fixed timer error correction

1085ef77 12/02/2012 05:11 PM Thomas Mullins

Made rfid.c more robust against false negatives

Also changed LED code to be more generally usable, and changed mainbox
to grant access to a particular user id instead of randomly choosing

1b054655 12/01/2012 05:59 PM Thomas Mullins

Fixes. It tooltrons at a basic level now.

dc472500 11/28/2012 09:31 PM Thomas Mullins

Added LED blinking, and other fixes

e1d61b43 11/28/2012 04:19 PM Thomas Mullins

Fixed compile errors; finished converting char -> uint8_t

f602b25b 11/27/2012 06:01 PM Thomas Mullins

Revert "Removed superfluous printf in rfid read script"

This reverts commit e66d0e5c23eaaf3db53409d05beb0e1fcdbe1610.

6ca98a3f 11/27/2012 05:59 PM Thomas Mullins

Eradicated use of signed chars in serial d'oh

92a430bc 11/21/2012 01:52 AM Thomas Mullins

Changed F_CPU to 8MHz instead of 1MHz

532ba0bd 11/21/2012 01:52 AM Thomas Mullins

Added LED header, and some rfid debugging

89915eeb 11/18/2012 07:35 PM Thomas Mullins

Added serial_flush

14688426 11/17/2012 09:54 PM Thomas Mullins

Added printing the response timeout, and other fixes

- Fixed using SLAVE_ADDR instead of tool->address
- Replaced read_registers with read_input_registers

76915f20 11/17/2012 09:52 PM Thomas Mullins

Various fixes to tool main.c

- Input register callback no longer copies current_user to reg_buf
prematurely, and then write the uninitialized serno into reg_buf (?!)
- tool_disable was missing a ~
- Updated coil read/write to use new 1 indexed addresses

e80ba701 11/17/2012 09:50 PM Thomas Mullins

Added RTS_ENABLE to Makefile

Also added UL to end of F_CPU

a7a56246 11/17/2012 09:50 PM Thomas Mullins

Fixed U2X1 being set in the wrong control register

b22d9e2f 11/17/2012 09:49 PM Thomas Mullins

Changed register/coil addresses to be 1 indexed

e66d0e5c 11/17/2012 08:50 PM Thomas Mullins

Removed superfluous printf in rfid read script

4e6334de 11/17/2012 08:49 PM Thomas Mullins

Deleted accidently commited vim swap file

07718da3 11/17/2012 08:48 PM Thomas Mullins

Fixed problem with high error in serial clock