Jim Morris [Tue, 12 Jan 2016 23:04:13 +0000 (15:04 -0800)]
Merge pull request #824 from wolfmanjm/upstreamedge
remove unsupported touchprobe module, has been archived in branch arc…
Jim Morris [Tue, 12 Jan 2016 23:02:42 +0000 (15:02 -0800)]
remove unsupported touchprobe module, has been archived in branch archive/touchprobe
this has not been compiled in a year or more and it out of date.
Jim Morris [Tue, 12 Jan 2016 22:59:13 +0000 (14:59 -0800)]
Merge pull request #811 from quillford/patch-1
small config sample typo fix
Jim Morris [Tue, 12 Jan 2016 22:51:54 +0000 (14:51 -0800)]
Merge pull request #823 from wolfmanjm/upstreamedge
Minor syntax tweaks
Jim Morris [Tue, 12 Jan 2016 22:50:33 +0000 (14:50 -0800)]
replace k_max_wcs with MAX_WCS define
Jim Morris [Sun, 10 Jan 2016 02:57:57 +0000 (18:57 -0800)]
optimize S parameter of Switch
Remove obsolete F parameter from M92
Jim Morris [Thu, 7 Jan 2016 21:33:05 +0000 (13:33 -0800)]
append NOMSD to version if a nomsd build
when using M28 save to sdcard, allow commands from other streams to be exectued while it is saving from the submitting stream
Jim Morris [Tue, 5 Jan 2016 21:48:17 +0000 (13:48 -0800)]
update comments to explain in more detail what is going on with reset position after an abort
Jim Morris [Tue, 5 Jan 2016 21:27:06 +0000 (13:27 -0800)]
Merge pull request #819 from wolfmanjm/upstreamedge
fix issue #818
Jim Morris [Tue, 5 Jan 2016 21:24:49 +0000 (13:24 -0800)]
Fix position after abort, fixes issue #818
Cancel suspend if home is issued while suspended
Jim Morris [Tue, 5 Jan 2016 18:57:35 +0000 (10:57 -0800)]
G28 cancels suspend
Jim Morris [Sat, 2 Jan 2016 03:44:22 +0000 (19:44 -0800)]
Merge pull request #816 from wolfmanjm/upstreamedge
allow subcodes in switch command definitions
Jim Morris [Sat, 2 Jan 2016 03:43:25 +0000 (19:43 -0800)]
allow subcodes in switch command definitions
Jim Morris [Sat, 2 Jan 2016 02:55:44 +0000 (18:55 -0800)]
Merge pull request #815 from wolfmanjm/upstreamedge
change selection of zprobe strategies from subcodes to Pn parameter
Jim Morris [Sat, 2 Jan 2016 02:44:37 +0000 (18:44 -0800)]
change selection of zprobe strategies from subcodes to Pn parameter
add G29.1 to output probe results in a format better suited for pasting in external programs
Jim Morris [Mon, 28 Dec 2015 23:23:29 +0000 (15:23 -0800)]
update firmware.bin
quillford [Mon, 28 Dec 2015 06:17:42 +0000 (22:17 -0800)]
small config sample typo fix
Jim Morris [Tue, 22 Dec 2015 08:34:26 +0000 (00:34 -0800)]
Update README.creole
Jim Morris [Tue, 22 Dec 2015 08:27:02 +0000 (00:27 -0800)]
Update README.creole
Jim Morris [Tue, 22 Dec 2015 05:20:54 +0000 (21:20 -0800)]
Merge pull request #810 from wolfmanjm/feature/add-G38.2-probe
Feature/add g38.2 probe
Jim Morris [Mon, 21 Dec 2015 22:09:49 +0000 (14:09 -0800)]
subtract z delta for current position as the probe went down (todo allow for up)
Jim Morris [Sun, 20 Dec 2015 10:02:27 +0000 (02:02 -0800)]
return seek rate of feed rate depending on grou
p 1 state
for get state return correct feed rate depeonding on grouo 1 state
Jim Morris [Sun, 20 Dec 2015 07:47:54 +0000 (23:47 -0800)]
refactor
Jim Morris [Sun, 20 Dec 2015 00:53:36 +0000 (16:53 -0800)]
initial implementation of G38.2 in Z axis only
Jim Morris [Sun, 20 Dec 2015 00:15:05 +0000 (16:15 -0800)]
Merge pull request #808 from wolfmanjm/upstreamedge
fix modal group 1 commands (G1-G3)
Jim Morris [Sat, 19 Dec 2015 23:12:10 +0000 (15:12 -0800)]
fix modal group 1 commands (G1-G3)
Jim Morris [Fri, 18 Dec 2015 05:03:56 +0000 (21:03 -0800)]
Merge pull request #807 from rparrett/feature/newglyphs
New/original glyphs for WatchScreen
Rob Parrett [Fri, 18 Dec 2015 04:40:58 +0000 (04:40 +0000)]
New/original glyphs for WatchScreen
Jim Morris [Wed, 16 Dec 2015 23:10:54 +0000 (15:10 -0800)]
Merge pull request #806 from wolfmanjm/upstreamedge
fix current tool returned in get state
Jim Morris [Wed, 16 Dec 2015 23:10:00 +0000 (15:10 -0800)]
fix current tool returned in get state
Jim Morris [Wed, 16 Dec 2015 22:59:11 +0000 (14:59 -0800)]
Merge pull request #804 from wolfmanjm/feature/wcs-and-g92-offsets
Feature/wcs and g92 offsets
Jim Morris [Wed, 16 Dec 2015 21:43:39 +0000 (13:43 -0800)]
add get state command to return current modal states (ala GRBL)
Jim Morris [Wed, 16 Dec 2015 10:01:53 +0000 (02:01 -0800)]
tidy up info display of wcs (get wcs and M503)
Jim Morris [Tue, 15 Dec 2015 23:39:10 +0000 (15:39 -0800)]
fix endstop center after home to use G53
Jim Morris [Tue, 15 Dec 2015 22:44:43 +0000 (14:44 -0800)]
zprobe moves must use G53 so they move in machine space
Jim Morris [Tue, 15 Dec 2015 09:37:33 +0000 (01:37 -0800)]
Extruder should ignore M114 subcodes > 0
Jim Morris [Tue, 15 Dec 2015 08:10:34 +0000 (00:10 -0800)]
update sample configs
set move_to_origin_after_home to true be default for deltas to compensate for trim
Jim Morris [Tue, 15 Dec 2015 07:55:31 +0000 (23:55 -0800)]
whitespace changes...
Fix segmentation, must not use last_milestone as it gets set afterwards not in append_milestone anymore
fix typo in the nmotors PR
Jim Morris [Tue, 15 Dec 2015 02:34:30 +0000 (18:34 -0800)]
fix G10 L20
Jim Morris [Tue, 15 Dec 2015 01:45:44 +0000 (17:45 -0800)]
add command get wcs to print current state of all offsets that contribute to the WCS
Jim Morris [Tue, 15 Dec 2015 01:19:20 +0000 (17:19 -0800)]
add a get pos command thgat prints all the 5 different variants of M114 great for debugging and maybe for a host
Jim Morris [Mon, 14 Dec 2015 20:18:10 +0000 (12:18 -0800)]
revert last commit as duh homing does not use robot to move so turning off compensation is a waste of time
Jim Morris [Mon, 14 Dec 2015 08:48:14 +0000 (00:48 -0800)]
turn off bed compensation while homing
Jim Morris [Mon, 14 Dec 2015 06:17:16 +0000 (22:17 -0800)]
add G28.1 with no args resets all axis to 0
Jim Morris [Mon, 14 Dec 2015 06:13:59 +0000 (22:13 -0800)]
add G28.1 to do a manual homing (similar to what G92 used to do)
Jim Morris [Mon, 14 Dec 2015 04:23:15 +0000 (20:23 -0800)]
Make G92 work as expected based on current WCS position
Jim Morris [Mon, 14 Dec 2015 03:45:57 +0000 (19:45 -0800)]
Improve the M114 print options, make M114 just use last_milestone, M114.1 gets realtime version
Jim Morris [Sun, 13 Dec 2015 23:40:34 +0000 (15:40 -0800)]
fix G53
Jim Morris [Sun, 13 Dec 2015 23:25:49 +0000 (15:25 -0800)]
major refactor.
process wcs offsets immediately.
add in tool offset to that.
Jim Morris [Sun, 13 Dec 2015 09:38:30 +0000 (01:38 -0800)]
Redo where the wcs is applied (very early) but maintain last_milestone as the requested position
Jim Morris [Sun, 13 Dec 2015 07:25:33 +0000 (23:25 -0800)]
tighten up the concept of machine position and workspace coordinates.
fix the G53 implementation so it is handled properly in all the places it matters
recreate last milestone when needed
fix the reset_axis to handle the WCS <-> MCS
Make M114 display actualt current position based on stepper position
add variations of M114.n to display the various different coordinate systems
Jim Morris [Sun, 13 Dec 2015 02:22:10 +0000 (18:22 -0800)]
implement G53 Move in machine coordinates.
Jim Morris [Sat, 12 Dec 2015 11:14:15 +0000 (03:14 -0800)]
attempt to implement a manual setting of machine coordinates, and inverse translate for WCS
Jim Morris [Sat, 12 Dec 2015 10:32:22 +0000 (02:32 -0800)]
print out current machine coordinates with M114.1
Jim Morris [Sat, 12 Dec 2015 10:28:20 +0000 (02:28 -0800)]
get the G92 offset calculation the right way around
Jim Morris [Sat, 12 Dec 2015 10:18:11 +0000 (02:18 -0800)]
fix g92_offset to be relative to current position not absolute
Jim Morris [Sat, 12 Dec 2015 10:04:00 +0000 (02:04 -0800)]
Squashed commit of the following:
commit
4eac17d902f8947ec2800899a0bc4995d7935bbb
Author: Jim Morris <morris@wolfman.com>
Date: Sat Dec 12 01:44:54 2015 -0800
add handling for G54-G59.3 Select Coordinate System
add handling for G10 L2 to set them
change the way G92 is handled, just sets a global offset which is not persistent across reset
Save the WCS offsets in M500 and display them in M503 (if they are non zero)
commit
9bd850b438e68f639801cf5d536f8e8e6ddd1869
Merge:
50a6ccf da5e07c
Author: Jim Morris <morris@wolfman.com>
Date: Fri Dec 11 23:51:18 2015 -0800
Merge branch 'feature/nmotors' of https://github.com/trayracing/Smoothieware into feature/wcs
commit
da5e07cb89c626de194794a5e755752b10c94452
Merge:
9a0f07c 1d33bc3
Author: trayracing <trayracing@users.noreply.github.com>
Date: Sun Nov 22 22:01:25 2015 -0500
Merge branch 'edge' into feature/nmotors
commit
1d33bc3cca946c9482eadb56af1d688709236659
Merge:
49aee48 56fc1d0
Author: trayracing <trayracing@users.noreply.github.com>
Date: Sun Nov 22 21:58:03 2015 -0500
Merge remote-tracking branch 'upstream/edge' into edge
commit
9a0f07c60825b757fe59b6d43e5c59c6b614b21d
Merge:
bc7f502 5a8918f
Author: trayracing <trayracing@users.noreply.github.com>
Date: Sun Nov 22 12:22:40 2015 -0500
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
commit
49aee4880980477a81ad7883b9893436d1f837fa
Merge:
19b1b4d 5a8918f
Author: trayracing <trayracing@users.noreply.github.com>
Date: Sun Nov 22 12:21:51 2015 -0500
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into edge
commit
bc7f5029f8163904ebe97ec3fdaff6a62471ca75
Author: trayracing <trayracing@users.noreply.github.com>
Date: Fri Nov 13 17:53:33 2015 -0500
Robot checksum array should be const
commit
9d6ad25534bbcf8d3a6089f89a214ad52edaa4db
Author: trayracing <trayracing@users.noreply.github.com>
Date: Fri Nov 13 17:48:59 2015 -0500
Merge rest of removal of pauser
commit
9a7b21b8423589473b4103f96a2f8c721ecd8067
Merge:
d6b9f04 19b1b4d
Author: trayracing <trayracing@users.noreply.github.com>
Date: Fri Nov 13 17:45:15 2015 -0500
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
Resolved Conflicts:
src/modules/robot/Stepper.cpp
commit
d6b9f044b48c06d7db3494c9a5d28eb9afca581b
Merge:
3f3b6da d901843
Author: trayracing <trayracing@users.noreply.github.com>
Date: Tue Nov 10 21:32:32 2015 -0500
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
commit
3f3b6da950f227f3e5748ec1b4964076ac53ed72
Merge:
da21d3a f3514fc
Author: trayracing <trayracing@users.noreply.github.com>
Date: Tue Nov 10 09:20:12 2015 -0500
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
resolved conflicts:
src/modules/tools/scaracal/SCARAcal.cpp
commit
da21d3a19595ae4437af396c4d77b79624971606
Author: trayracing <trayracing@users.noreply.github.com>
Date: Tue Nov 10 08:44:28 2015 -0500
Robot config changes per code review - removed default robot actuator pins, etc.
Removed default robot actuator pins.
Flattened checksum array.
Optimized checksum array for k_max_actuators==3.
Added compile time static_assert if checksum array is smaller than
k_max_actuators.
Removed printf warning that arm solution wants more than
k_max_actuators.
commit
b632c6a6f919e076d15c56e3c0d1b58aad1abbf3
Author: trayracing <trayracing@users.noreply.github.com>
Date: Mon Nov 9 22:31:29 2015 -0500
Limit robot actuators to 3 by default and remove multicartesian arm solution per code review
commit
896a6229e02d5d5cdc0a3641d76aacb6c209a8a1
Author: trayracing <trayracing@users.noreply.github.com>
Date: Mon Nov 9 21:53:26 2015 -0500
Limit M-code manipulation of actuator settings to 3 (or fewer) for now, per code review
commit
63928b90dcf2c351cf6ac1839a09244c8b7e0945
Author: trayracing <trayracing@users.noreply.github.com>
Date: Mon Nov 9 21:34:58 2015 -0500
Remove endstop trim changes per code review
commit
ce97fc105f11b90e6dad3c8c8fe7ac53e97b1c8d
Author: trayracing <trayracing@users.noreply.github.com>
Date: Mon Nov 9 21:15:44 2015 -0500
Set zeta default step_mm to 80 like others, and remove step_mm default from table
In robot.cpp, did not split default pins into separate table as it did
not help size. Did remove step_mm column and made zeta step_mm default
match most others.
commit
71639b04ee26927cb16e54c3976881d3ffb1bf80
Author: trayracing <trayracing@users.noreply.github.com>
Date: Thu Nov 5 08:05:12 2015 -0500
prevent trim array overrun for > 3 actuators
Thanks wolfmanjm
commit
b4699cff6cea0d9b2555eae406aab7e9a5554aee
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Nov 4 22:05:05 2015 -0500
Add back actuator letter in robot.cpp check_max_actuator_speeds warning
commit
319d984fab37b035b5df97d6bd76a1b30022ed11
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Nov 4 21:30:58 2015 -0500
Cleanup - Updated comments in robot.cpp
commit
3a3f30fe95c92c3da8df0473aef18d6c2623fcf4
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Nov 4 21:02:27 2015 -0500
Cleanup for code review
Remove reference in actuator for loops - copying a pointer is fine.
remove duplicated conditional in M203 of robot
commit
598a961bad5ed49c827b38dfe43319054a716ca4
Author: trayracing <trayracing@users.noreply.github.com>
Date: Tue Nov 3 21:07:48 2015 -0500
Tested nmotor code
fix config names in robot, remove dot from arm solution config name
commit
2e07963b9e8a00408af7a7803ca7d41d5ab29ac0
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Oct 28 17:40:07 2015 -0400
Remove previously added overload of RotableCartesianSolution::rotate
commit
4e5b80ab952355f2e60725584983a458ab0e60f8
Merge:
425ecde 325a6ac
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Oct 28 17:06:35 2015 -0400
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
commit
425ecde7417dcb78498d6bfe250980b3a1adbaab
Merge:
91dec71 9f7d481
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Oct 28 16:59:19 2015 -0400
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
commit
91dec71421b151a8e337e153cb5418b919b06cc5
Author: trayracing <trayracing@users.noreply.github.com>
Date: Wed Oct 21 07:25:45 2015 -0400
made multicartesian configurable
multicartesion.axis_map: lowest digit is the actuator count. Each higher
digit is the axis for the next actuator.
commit
2780db376d3d60a19f92cea80f9ccd29d1b02adf
Merge:
065c5fc ed25d57
Author: trayracing <trayracing@users.noreply.github.com>
Date: Fri Oct 16 23:11:21 2015 -0400
Merge remote-tracking branch 'refs/remotes/Smoothieware/edge' into feature/nmotors
commit
065c5fc950ceb8c24ac1128d54a10470364fc5dc
Author: trayracing <trayracing@users.noreply.github.com>
Date: Fri Oct 16 23:09:24 2015 -0400
Support > 3 robot actuators and add multi-cartesian arm solution - rough code
Coded but not tested - Arm solutions now report the number of actuators
needed, (subject to a compile time limit, currently 6). endstops and
zprobe do not yet handle > 3 actuators. Multi-cartesian solution drives
3 pairs of motors.
Jim Morris [Fri, 11 Dec 2015 22:07:36 +0000 (14:07 -0800)]
update firmware.bin
Jim Morris [Fri, 11 Dec 2015 01:40:58 +0000 (17:40 -0800)]
Merge pull request #801 from wolfmanjm/upstreamedge
fix aborting zprobes and homing.
Jim Morris [Fri, 11 Dec 2015 01:35:29 +0000 (17:35 -0800)]
fix corexy halted homing cycle properly.
Jim Morris [Fri, 11 Dec 2015 01:19:29 +0000 (17:19 -0800)]
Make sure steppers are stopped if on_halt interrupts a homing cycle
Jim Morris [Fri, 11 Dec 2015 01:14:58 +0000 (17:14 -0800)]
Make sure steppers are stopped if on_halt interrupts zprobe
Jim Morris [Fri, 11 Dec 2015 00:56:56 +0000 (16:56 -0800)]
Allow temporary override of heater off when using suspend or M600
M600.1 or suspend h
will suspend and leave heaters on
Jim Morris [Thu, 10 Dec 2015 22:32:05 +0000 (14:32 -0800)]
Merge pull request #800 from wolfmanjm/upstreamedge
fix switch state after on_halt to match what it was set to.
Jim Morris [Thu, 10 Dec 2015 22:28:43 +0000 (14:28 -0800)]
fix switch state after on_halt to match what it was set to.
Jim Morris [Thu, 10 Dec 2015 05:51:29 +0000 (21:51 -0800)]
Merge pull request #799 from wolfmanjm/optimize/temperatureswitch
reduce the memory usage of each temperatureswitch.
Jim Morris [Thu, 10 Dec 2015 05:36:22 +0000 (21:36 -0800)]
reduce the memory usage of each temperatureswitch.
no longer required to keep a vector of temperaturecontrollers
Jim Morris [Tue, 8 Dec 2015 20:32:03 +0000 (12:32 -0800)]
update firmware.bin
Jim Morris [Tue, 8 Dec 2015 04:37:20 +0000 (20:37 -0800)]
Merge pull request #796 from wolfmanjm/upstreamedge
fix temperatureswitch for arm/disarm config
Jim Morris [Tue, 8 Dec 2015 04:34:32 +0000 (20:34 -0800)]
fix temeratureswitch for arm/disarm config
Jim Morris [Sun, 6 Dec 2015 23:55:22 +0000 (15:55 -0800)]
Merge pull request #795 from wolfmanjm/upstreamedge
Allow LCD probe status to display longer status lines
Jim Morris [Sun, 6 Dec 2015 23:53:53 +0000 (15:53 -0800)]
Allow LCD probe status to display longer status lines
Print confirmation for clearing leveling plane
Jim Morris [Sun, 6 Dec 2015 07:13:00 +0000 (23:13 -0800)]
Merge pull request #794 from wolfmanjm/feature/unkill-button
Feature/unkill button
Jim Morris [Sun, 6 Dec 2015 07:09:42 +0000 (23:09 -0800)]
Allow unkill button to clear halt generated from another source
Jim Morris [Sun, 6 Dec 2015 07:00:22 +0000 (23:00 -0800)]
Add an option to clear a halt by holdng the kill button for two seconds when halted.
Jim Morris [Thu, 3 Dec 2015 07:17:36 +0000 (23:17 -0800)]
update comment
Jim Morris [Thu, 3 Dec 2015 06:44:05 +0000 (22:44 -0800)]
Merge pull request #783 from leonmf/fix/FilamentDetectorAllowBulgeOnly
Allow bulge detector without encoder in filament detector
Jim Morris [Wed, 2 Dec 2015 03:01:58 +0000 (19:01 -0800)]
Update README.creole
Jim Morris [Wed, 2 Dec 2015 02:59:55 +0000 (18:59 -0800)]
Update README.creole
Jim Morris [Wed, 2 Dec 2015 02:59:01 +0000 (18:59 -0800)]
Update README.creole
Jim Morris [Wed, 2 Dec 2015 02:44:11 +0000 (18:44 -0800)]
Merge pull request #793 from wolfmanjm/upstreamedge
applied PR #607 manually to update the way nano libs are pulled in
Jim Morris [Wed, 2 Dec 2015 02:41:58 +0000 (18:41 -0800)]
applied PR #607 manually to u[date the way nano libs are pulled in
Jim Morris [Wed, 2 Dec 2015 02:26:15 +0000 (18:26 -0800)]
Update .travis.yml
Jim Morris [Wed, 2 Dec 2015 02:23:50 +0000 (18:23 -0800)]
Update .travis.yml
Jim Morris [Wed, 2 Dec 2015 02:08:28 +0000 (18:08 -0800)]
Merge pull request #792 from wolfmanjm/upstreamedge
try a 64 bit install
Jim Morris [Wed, 2 Dec 2015 02:07:43 +0000 (18:07 -0800)]
try a 64 bit install
Jim Morris [Wed, 2 Dec 2015 01:43:02 +0000 (17:43 -0800)]
Merge pull request #791 from wolfmanjm/upstreamedge
more updates for travis
Jim Morris [Wed, 2 Dec 2015 01:42:33 +0000 (17:42 -0800)]
more updates for travis
Jim Morris [Wed, 2 Dec 2015 01:40:05 +0000 (17:40 -0800)]
Merge pull request #790 from wolfmanjm/upstreamedge
try using gcc from repo
Jim Morris [Wed, 2 Dec 2015 01:39:24 +0000 (17:39 -0800)]
try using gcc from repo
Jim Morris [Wed, 2 Dec 2015 01:22:29 +0000 (17:22 -0800)]
Merge pull request #789 from wolfmanjm/upstreamedge
more travis fixes
Jim Morris [Wed, 2 Dec 2015 01:21:58 +0000 (17:21 -0800)]
more travis fixes
Jim Morris [Wed, 2 Dec 2015 01:16:46 +0000 (17:16 -0800)]
Merge pull request #788 from wolfmanjm/upstreamedge
fix travis_install
Jim Morris [Wed, 2 Dec 2015 01:16:12 +0000 (17:16 -0800)]
fix travis_install
Jim Morris [Wed, 2 Dec 2015 01:11:26 +0000 (17:11 -0800)]
Merge pull request #787 from wolfmanjm/upstreamedge
fix path settings
Jim Morris [Wed, 2 Dec 2015 01:10:55 +0000 (17:10 -0800)]
fix path settings
Jim Morris [Wed, 2 Dec 2015 01:05:47 +0000 (17:05 -0800)]
Merge pull request #786 from wolfmanjm/upstreamedge
update
Jim Morris [Wed, 2 Dec 2015 01:05:12 +0000 (17:05 -0800)]
update
Jim Morris [Wed, 2 Dec 2015 00:59:11 +0000 (16:59 -0800)]
Update .travis.yml
Jim Morris [Wed, 2 Dec 2015 00:58:47 +0000 (16:58 -0800)]
Update .travis.yml