move utils back into begin() until we have more

This commit is contained in:
Josh Goebel 2016-02-20 14:49:54 -05:00 committed by Scott Allen
parent eb5fb39e28
commit c25668de0e
2 changed files with 13 additions and 13 deletions

View File

@ -26,8 +26,12 @@ void Arduboy::start() // deprecated
void Arduboy::begin()
{
boot(); // required
bootUtils();
boot();
if(pressed(UP_BUTTON)) {
flashlight();
}
bootLogo();
// Audio
@ -38,7 +42,7 @@ void Arduboy::begin()
void Arduboy::beginMinimal()
{
boot(); // required
boot();
// Audio
tunes.initChannel(PIN_SPEAKER_1);
@ -57,13 +61,6 @@ void Arduboy::flashlight()
setRGBled(0,0,0);
}
void Arduboy::bootUtils()
{
if(pressed(UP_BUTTON)) {
flashlight();
}
}
void Arduboy::bootLogo()
{
// setRGBled(10,0,0);

View File

@ -44,6 +44,12 @@ public:
/// Initializes the hardware
void begin();
/// Initializes the hardware (no logo, no other bootime niceities)
/**
* If you want to build your own customized boot sequence compare
* begin() with beginMinimal() and just add back the things you wish
* to have in your own sequence, leaving out the things you do not
* desire.
**/
void beginMinimal();
void start() __attribute__ ((deprecated("use begin() instead")));
@ -59,9 +65,6 @@ public:
*/
void flashlight();
/// Boot utility detection (such as flashlight, etc.)
void inline bootUtils() __attribute__((always_inline));
/// Clears display.
void clear();
void clearDisplay() __attribute__ ((deprecated("use clear() instead")));