Project

General

Profile

Statistics
| Branch: | Revision:

root @ 975af07c

# Date Author Comment
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://roboclub.org/home/svn/tooltron

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://roboclub.org/home/svn/tooltron

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://roboclub.org/home/svn/tooltron

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://roboclub.org/home/svn/tooltron

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 models.py. 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
www.jeffknupp.com/blog/2012/02/09/starting-a-django-project-the-right-way/

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://roboclub.org/home/svn/tooltron

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

e53aa5c5 11/15/2012 12:38 AM Thomas Mullins

Made some changes to the tool state machine

12ea39cc 11/14/2012 09:50 PM Thomas Mullins

Added actual control of tool

3811693d 11/14/2012 08:22 PM Thomas Mullins

Renamed tool_get_user to tool_read_user

208a6fb2 11/13/2012 08:23 PM Thomas Mullins

Added capability to read/write coils to toolbox

7bdb98c5 11/13/2012 06:35 PM Thomas Mullins

Initial commit of mainbox code.

ec0eab37 11/12/2012 04:45 PM Thomas Mullins

Added script to read from rfid reader

ae250f1a 11/12/2012 01:51 PM Thomas Mullins

Moved toolbox code into its own directory

ab2834f1 11/10/2012 05:39 PM Thomas Mullins

Added ATtiny1634 write to UCSRC in portserial.c

e5548bbd 11/10/2012 05:04 PM Thomas Mullins

Got rid of annoying warning about usTimerOCRBDelta

04b8cd51 11/10/2012 04:35 PM Thomas Mullins

Added ability to read input registers

9b2b6d91 11/10/2012 04:14 PM Thomas Mullins

Moved rfid functions into their own file

20e5429c 11/10/2012 03:39 PM Thomas Mullins

Initial commit of freemodbus and code by Anson and me