Mike Beattie [Tue, 28 Aug 2012 10:07:39 +0000 (22:07 +1200)]
altosdroid: stop sending device name, just send config data
* Kinda complicated, but ultimately more sensible
* Just send the config data as an arg to MSG_CONNECTED
* keep retrying connection till we actually get config data
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 10:00:14 +0000 (22:00 +1200)]
altosdroid: whitespace
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:59:40 +0000 (21:59 +1200)]
altosdroid: override add_reply() to add android based debugging
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:59:15 +0000 (21:59 +1200)]
altosdroid: more logical name for connection_lost() method.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:58:47 +0000 (21:58 +1200)]
altosdroid: rework ConnectThread
* Start input_thread after connection, otherwise it's painful to kill
on connect failure.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:55:40 +0000 (21:55 +1200)]
altosdroid: fix a connection retry having a null pointer
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:54:05 +0000 (21:54 +1200)]
altosdroid: fix double call of stopAltosBluetooth()
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 09:53:01 +0000 (21:53 +1200)]
altosdroid: Miscellaneous comments/debug/etc cleanup
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 05:37:45 +0000 (17:37 +1200)]
altosdroid: miscellaneous cleanup
* Copyright info
* whitespace
* comments
* unused imports
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 05:36:41 +0000 (17:36 +1200)]
altosdroid: Add passing of Device Config at connect
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 05:35:11 +0000 (17:35 +1200)]
altosdroid: Add new "TelemetryReader" class to handle Telemetry
* Add MSG_TELEMETRY messages to both AltosDroid and TelemetryService
to handle passing of AltosState object all the way back to the UI.
* Remove linkedblockinglist from TelemetryService
* (MSG_TELEMETRY is a rename of MSG_INCOMING_TELEM in AltosDroid)
* commented code in case statement inside AltosDroind - won't work with
the objects it is currently passed.
* Add new "MSG_DEVCONFIG" message to AltosDroid - allows TelemetryService
to pass information about the connected device back to the UI.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 28 Aug 2012 05:26:09 +0000 (17:26 +1200)]
altosdroid: create connected() method
Signed-off-by: Mike Beattie <mike@ethernal.org>
Keith Packard [Mon, 27 Aug 2012 20:52:11 +0000 (13:52 -0700)]
altos: Add spiradio product
Implements the SPI radio protocol
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:51:53 +0000 (13:51 -0700)]
altos: sdcdb rc file for telefire
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:49:07 +0000 (13:49 -0700)]
altos: Add SPI linked radio API
Forward the necessary radio functions over the SPI link
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:47:16 +0000 (13:47 -0700)]
altos: Clean up radio APIs
Move api to ao_radio_cmac.h include file.
Expose ao_radio_test as standard API.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:45:56 +0000 (13:45 -0700)]
altos: Build telelco and spiradio when possible
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:44:35 +0000 (13:44 -0700)]
altos: Expose a signed version of the tick count
Useful when doing time comparisons.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:42:38 +0000 (13:42 -0700)]
altos: Specify the LCD duty cycle for stm-demo
This is the demo for the large 7-segment displays and needs static drive
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:41:13 +0000 (13:41 -0700)]
altos: Test multiple quadrature devices. Export quadrature count.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:38:44 +0000 (13:38 -0700)]
altos: Seven segment display driver
Hex numbers and the decimal point.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:37:14 +0000 (13:37 -0700)]
altos: More SPI slave changes for cc1111 driver
Don't enable DMA in the other direction when doing slave transfers.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:35:39 +0000 (13:35 -0700)]
altos: Add SPI slave get/put macros to cc1111
Theese don't try to drive the chip select line
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:34:12 +0000 (13:34 -0700)]
altos: Provide interface for STM LCD driver.
This provides a simple function interface for driving the LCD segments
in the STM chip. It also uses the update complete interrupt to block
LCD users during flush.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Mon, 27 Aug 2012 20:32:41 +0000 (13:32 -0700)]
altos: Rename drivers/ao_lco to drivers/ao_lco_cmd
These contain command line functions for testing the cmac and lco
features. Now that there's a telelco-specific ao_lco interface file,
it's useful to have both for testing.
Signed-off-by: Keith Packard <keithp@keithp.com>
Mike Beattie [Mon, 27 Aug 2012 07:41:47 +0000 (19:41 +1200)]
altosdroid: Let a freshly connected client know what the device name is!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Mon, 27 Aug 2012 07:41:29 +0000 (19:41 +1200)]
altosdroid: Add Connected/Connect_failed messages
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Mon, 27 Aug 2012 07:40:30 +0000 (19:40 +1200)]
altosdroid: don't need keys for Bundles anymore
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Mon, 27 Aug 2012 07:39:53 +0000 (19:39 +1200)]
altosdroid: Toast() requests don't need Bundles
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Mon, 27 Aug 2012 07:39:09 +0000 (19:39 +1200)]
altosdroid: really don't need to store a local copy of the device name
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Mon, 27 Aug 2012 07:37:16 +0000 (19:37 +1200)]
altosdroid: remove complexity around message passing
* Don't really need to use bundles
* TelemetryService: Use a local variable to store the bluetooth device object
Signed-off-by: Mike Beattie <mike@ethernal.org>
Keith Packard [Sun, 26 Aug 2012 16:53:16 +0000 (09:53 -0700)]
altos: Trigger sample complete when all data are ready
This has each sensor mark a bit in the current data record which is
then sent for processing when all of the data are present.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 26 Aug 2012 16:52:27 +0000 (09:52 -0700)]
altos: Shrink STM stack size
512 bytes should be enough for anybody.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 26 Aug 2012 16:49:34 +0000 (09:49 -0700)]
altos: Make ao_cur_task_index track ao_cur_task in ao_yield
This keeps the two main task references (index and pointer) in
agreement during task switching, avoiding an extra assignment at the
end of the task switching loop.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 26 Aug 2012 16:47:05 +0000 (09:47 -0700)]
altos: Make 'pad' driver useful with telefire v0.1
This reports correct status bits over the radio and to the LEDs for
all four channels, and also makes the firing test command control all
four relays.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 26 Aug 2012 16:45:03 +0000 (09:45 -0700)]
altos: Add debug command for 74hc597 driver
This dumps the current state of the 74hc597 chip.
Note that this shows that the 74hc597 driver doesn't work, and that
the circuit used in telefire v0.1 can't work.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 26 Aug 2012 16:43:34 +0000 (09:43 -0700)]
altos: Allow sharing of radio DMA with aes engine
otherwise, telefire doesn't have enough DMA channels.
Signed-off-by: Keith Packard <keithp@keithp.com>
Mike Beattie [Sun, 26 Aug 2012 11:38:33 +0000 (23:38 +1200)]
altosdroid: begin adding TextToSpeech support.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:38:10 +0000 (23:38 +1200)]
altosdroid: whitespace cleanup
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:37:58 +0000 (23:37 +1200)]
altosdroid: Send device name and connected state back to TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:37:33 +0000 (23:37 +1200)]
altosdroid: re-work connect/thread handling in AltosBluetooth
* Much more resilient to failure
* handles multiple blocked threads better
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:34:59 +0000 (23:34 +1200)]
altosdroid: remove old commented code
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:34:45 +0000 (23:34 +1200)]
altosdroid: add handling when restarting BT. delay start after stop.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:34:28 +0000 (23:34 +1200)]
altosdroid: set devicename and pass on to clients
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:30:45 +0000 (23:30 +1200)]
altosdroid: Send current state to client on connect
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:30:00 +0000 (23:30 +1200)]
altosdroid: add missing break; (just in case!)
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:29:25 +0000 (23:29 +1200)]
altosdroid: debugging statements
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:28:59 +0000 (23:28 +1200)]
altosdroid: forgot change to IncomingHandler constructor call. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:28:26 +0000 (23:28 +1200)]
altosdroid: Strings and Layout changes
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:26:58 +0000 (23:26 +1200)]
altosdroid: lots of debugging statements
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:24:13 +0000 (23:24 +1200)]
altosdroid: need sendMessageToClients() for setState().. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:23:33 +0000 (23:23 +1200)]
altosdroid: Need access to handler inside AltosBluetooth
* Also move add_monitor() call
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:20:01 +0000 (23:20 +1200)]
altosdroid: reflect change in message name
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:19:06 +0000 (23:19 +1200)]
altosdroid: begin adding state support
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:16:49 +0000 (23:16 +1200)]
altosdroid: init device variable... oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:16:04 +0000 (23:16 +1200)]
altosdroid: Rename Connect message, add connected message
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:14:09 +0000 (23:14 +1200)]
altosdroid: init telem blocking list.. oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:13:33 +0000 (23:13 +1200)]
altosdroid: disable NotificationManager stuff for now
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 11:12:48 +0000 (23:12 +1200)]
altosdroid: Convert handlers to use weakreferences
* Also renamed bluetooth start/stop methods
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:28:58 +0000 (15:28 +1200)]
altosdroid: Remove Binder import from TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:28:36 +0000 (15:28 +1200)]
altosdroid: Add State constants for future usage
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:28:09 +0000 (15:28 +1200)]
altosdroid: begin adding IPC to TelemetryService
* And add imports for LinkedBlockingQueue... oops!
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:24:19 +0000 (15:24 +1200)]
altosdroid: remove old Binder from TelemetryService
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:23:17 +0000 (15:23 +1200)]
altosdroid: begin adding IPC to main thread
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:22:23 +0000 (15:22 +1200)]
altosdroid: Add TBT initialisation to AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:21:57 +0000 (15:21 +1200)]
altosdroid: Add debugging statements to AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:21:36 +0000 (15:21 +1200)]
altosdroid: Add input thread for reading from TBT
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:20:42 +0000 (15:20 +1200)]
altosdroid: Move constructor for AltosBluetooth
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:18:44 +0000 (15:18 +1200)]
altosdroid: clean up stub functions in AltosBluetooth.java
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:11:12 +0000 (15:11 +1200)]
altosdroid: AltosBluetooth.java
* clean up variables/comments
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:10:15 +0000 (15:10 +1200)]
altosdroid: AltosBluetooth.java
* Clean up imports
* Convert from reflection to using Well Known UUID for SPP.
* clean up local variables
* Add debug conditionals to logging
* remove references to socket type
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:03:54 +0000 (15:03 +1200)]
altosdroid: Clean up imports in TelemetryService
* Begin adding AltosLib usage
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 03:00:23 +0000 (15:00 +1200)]
altosdroid: Add service start/bind/unbind to AltosDroid
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:57:04 +0000 (14:57 +1200)]
altosdroid: Remove AltosLib import from main thread
Mike Beattie [Sun, 26 Aug 2012 02:55:19 +0000 (14:55 +1200)]
altosdroid: whitespace
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:54:54 +0000 (14:54 +1200)]
altosdroid: Re-locate TextView initialisation
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:54:06 +0000 (14:54 +1200)]
altosdroid: remove UI components/imports no longer used
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:52:30 +0000 (14:52 +1200)]
altosdroid: excise BluetoothChatService example code
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:48:48 +0000 (14:48 +1200)]
altosdroid: remove TelemetryService activities
service start/stop will be handled by AltosDroid/itself now.
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:44:09 +0000 (14:44 +1200)]
altosdroid: whitespace (spaces to tabs) (part2)
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 02:29:36 +0000 (14:29 +1200)]
altosdroid: whitespace (spaces to tabs) (part1)
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Sun, 26 Aug 2012 00:41:24 +0000 (12:41 +1200)]
altosdroid: Update copyrights
Signed-off-by: Mike Beattie <mike@ethernal.org>
Keith Packard [Fri, 24 Aug 2012 07:46:55 +0000 (00:46 -0700)]
altos: Configure telefire SPI and LEDs correctly
This places the telefire SPI bus on USART1 option 2 and
marks the various LED functions with symbolic names.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:44:35 +0000 (00:44 -0700)]
altos: telelaunch doesn't need ao_radio_cmac_init
This function was used to initialize the LCO functions, which were
moved to ao_lco.c a few commits back, so ao_radio_cmac_init doesn't
even exist anymore.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:42:32 +0000 (00:42 -0700)]
altos: Get ao_pad.c working on telefire v0.1
Monitor all four channels, allow any channel to be fired.
Turn on power LED at startup time.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:40:27 +0000 (00:40 -0700)]
altos: Split out LCO functions from ao_radio_cmac.c to ao_lco.c
These functions are not used in the telelaunch or telefire nodes, so
don't force them to be included.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:39:46 +0000 (00:39 -0700)]
altos: Have radio_cmac turn on LEDs as appropriate
Use AO_LED_RX and AO_LED_TX defines if present to control LEDs during
radio operations.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:34:55 +0000 (00:34 -0700)]
altos: Add 'ao_led_set_mask' in the PCA9922 driver
This lets a subset of the LEDs be controlled independent of other LED settings.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:33:38 +0000 (00:33 -0700)]
altos: Make cc1111 SPI pins configurable
Allow either USART in any configuration. Still only supports one SPI
bus though.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Fri, 24 Aug 2012 07:27:13 +0000 (00:27 -0700)]
altos: Disable telefire 'pad' listener when testing radio
Ensures that the radio testing won't block waiting for a firing mode
packet to arrive.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 17:02:16 +0000 (10:02 -0700)]
altosui: Check for JRE 1.7 in Windows installer
altosui runs fine with version 1.7 (on Linux at least), so allow that
version to satisfy the java check instead of requiring the user to
down-grade to 1.6
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 05:51:47 +0000 (22:51 -0700)]
Here's the button driver and event queue logic
These were neglected in the commit which was supposed to include them
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 04:26:34 +0000 (21:26 -0700)]
altos: Add MMA655X driver
Just debug code at this point, will complete on real hardware
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 04:25:34 +0000 (21:25 -0700)]
altos/cc1111: Document SPI bus pin options
Just a comment in the source code about which pins each option selects.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 04:24:16 +0000 (21:24 -0700)]
altos: Use split SPI bus for MS5607 sensor
Leave CS low while releasing the SPI bus when waiting for conversion
complete -- other SPI bus users will use another set of pins.
Signed-off-by: Keith Packard <keithp@keithp.com>
Keith Packard [Sun, 19 Aug 2012 04:21:58 +0000 (21:21 -0700)]
altos: Allow STM SPI bus on multiple pin sets
This allows multiple STM pin groups to be used for each SPI
bus. Useful for the MS5607 sensor which signals conversion complete on
the MISO line.
Signed-off-by: Keith Packard <keithp@keithp.com>
Mike Beattie [Tue, 7 Aug 2012 19:07:49 +0000 (07:07 +1200)]
ao-send-telem: make --realtime work
(add "break;" to the case statement for options)
Signed-off-by: Mike Beattie <mike@ethernal.org>
Mike Beattie [Tue, 7 Aug 2012 18:49:15 +0000 (06:49 +1200)]
Merge branch 'master' of git://git.gag.com/fw/altos
Keith Packard [Tue, 7 Aug 2012 18:48:20 +0000 (11:48 -0700)]
Merge remote-tracking branch 'mjb/master'
Mike Beattie [Tue, 7 Aug 2012 18:46:56 +0000 (06:46 +1200)]
Merge branch 'master' of git://git.gag.com/fw/altos
projects / fw / altos / log