Merge branch 'master' of https://github.com/Misfittech/nano_stepper · Misfittech/nano_stepper@684f9ac · GitHub

Commit

Merge branch 'master' of https://github.com/Misfittech/nano_stepper

Browse files

Conflicts:
	firmware/stepper_nano_zero/board.h
	firmware/stepper_nano_zero/commands.cpp
	firmware/stepper_nano_zero/nonvolatile.cpp
	firmware/stepper_nano_zero/stepper_controller.cpp
	firmware/stepper_nano_zero/stepper_controller.h

Loading branch information

trampas committed Dec 6, 2016

2 parents 26f7745 + c0dcae2 commit 684f9ac