Commit Graph
17 Commits
Author SHA1 Message Date
Robert Giseburt 4bcafa8069 Merge branch 'rob' into alden
Conflicts:
	TinyG2/TinyG2.cppproj
	TinyG2/controller.cpp
	TinyG2/controller.h
	TinyG2/main.cpp
	TinyG2/stepper.cpp
	TinyG2/tinyg2.h
2013-04-19 13:57:10 -05:00
aldenhart 7de43e1b11 004.12 Got a simple GET function working 2013-04-19 13:04:41 -04:00
aldenhart 4646e1e6b0 004.11 working on replacement strcpy function in util.cpp 2013-04-19 11:01:25 -04:00
alden.hart 88c86834d7 004.10 Compiles but doesn't actually work yet 2013-04-18 21:12:18 -04:00
aldenhart 7d4b39f160 004.09 addinmg in text support - doesn't compile yet 2013-04-18 17:12:14 -04:00
aldenhart 5113db383c 004.09 Reverted controller_state back to a singleton 2013-04-18 15:44:11 -04:00
aldenhart ffc9af46b3 004.08 serial working - not yet cleaned up 2013-04-18 14:47:33 -04:00
aldenhart 22a1a8611a 004.08 Pulled in changes from rob branch -Support OPTIMIZATION=s on the make line. 2013-04-18 12:02:57 -04:00
Robert Giseburt 01c49bd11e Move IndicatorLed over to Motate, and blink every second.
Using GetTickCount() to grab the actual system tick value (in milliseconds, currently), and offset from there. (Currently SAM-specific.)

Also use the built-in hardware pin toggle (where available).
2013-04-17 16:05:38 -05:00
aldenhart 354e34f514 004.07 Debugging serial in controller.cpp - not working in this push 2013-04-17 09:26:38 -04:00
aldenhart 46c1168382 004.06 Works with native makefile; added BeRTOS language to tinyg2.h 2013-04-17 08:58:35 -04:00
alden.hart bb35a754db Merged changes from rob branch 2013-04-17 06:34:15 -04:00
alden.hart 67fc82654e Alden changes to cppproj, controller.cpp and xio.cpp/.h during compile testing 2013-04-17 06:31:27 -04:00
alden.hart e68170cde2 resync git 2013-04-16 16:13:28 -04:00
alden.hart 6ea585f452 004.05 attempting to fix the line reader inner loop after the uint8_t conversion 2013-04-15 07:11:26 -04:00
alden.hart 8cc6b1097d 004.02 Added read_line; start long process of converting doubles to floats 2013-04-13 22:08:43 -04:00
alden.hart 8b989d9d4e 004.01 added controller; moved serial and LED to controller 2013-04-13 21:07:28 -04:00