Feature Development for UI and User Experience Improvment

* Basic execution improvement and project settings

* Fixing compilation warning in SceneManager

* Removing MainApp class to reduce memory footprint

* PNG files renaming for in readme.md name match

* Blinking duration extension capabilities
Fixing ATtiny naming and addition of details on the blink duration extension.

* SceneManagerClass init function renamed to begin.
Fix SceneManager.begin() not called at firmware initialization

* SceneManagerClass init function renamed to begin.
Fix SceneManager.begin() not called at firmware initialization
Forcing Light to Off at initialization

* Fixing algo forcing system to start and stay in undefined state for the SceneManager internal state machine.

* Remove unused MainApp files

* Documentation update for revision 1.2

Author: NicolasBesson

BlinkyBike/BlinkyBike/BlinkyBike.ino

@@ -23,19 +23,142 @@
  *             |  _ <| | | '_ \| |/ / | | | |  _ <| | |/ / _ \
  *             | |_) | | | | | |   <| |_| | | |_) | |   <  __/
  *             |____/|_|_|_| |_|_|\_\\__, | |____/|_|_|\_\___|
- *                                    __/ |  Version 1.1      
+ *                                    __/ |  Version 1.2      
  *                                   |___/                    
  *
  *****************************************************************************/
 
-#include "MainApp.h"
+#if defined(ARDUINO) && ARDUINO >= 100
+	#include "arduino.h"
+#else
+	#include "WProgram.h"
+#endif
+
+#include "Adafruit_NeoPixel.h"
+#include "Timer.h"
+#include "Button.h"
+#include "Stripes.h"
+#include "SceneManager.h"
+
+// LED Stripes configuration
+// See Stripes.h
+
+// Buttons configuration
+#define BUTTON_LEFT_PIN					3
+#define BUTTON_RIGHT_PIN				2
+
+#define BUTTON_DEBOUNCE_TIMEOUT			10
+#define BUTTON_STATE_TIMEOUT			200
+#define BUTTON_HOLD_TIMEOUT				(1 * 1000)
+
+// Scenes timer index
+#define SCENE_TIMER_FRONT			0
+#define SCENE_TIMER_REAR_LEFT		1
+#define SCENE_TIMER_REAR_RIGHT		2
+
+
+// LED Stripes
+Adafruit_NeoPixel frontLight		= Adafruit_NeoPixel(LED_STRIPE_FRONT_NUMLED,		LED_STRIPE_FRONT_PIN,		NEO_GRB + NEO_KHZ800);
+Adafruit_NeoPixel rearLeftLight		= Adafruit_NeoPixel(LED_STRIPE_REARLEFT_NUMLED,		LED_STRIPE_REARLEFT_PIN,	NEO_GRB + NEO_KHZ800);
+Adafruit_NeoPixel rearRightLight	= Adafruit_NeoPixel(LED_STRIPE_REARRIGHT_NUMLED,	LED_STRIPE_REARRIGHT_PIN,	NEO_GRB + NEO_KHZ800);
+
+// Buttons
+Button leftButton = Button(BUTTON_LEFT_PIN, BUTTON_DEBOUNCE_TIMEOUT, BUTTON_HOLD_TIMEOUT, BUTTON_STATE_TIMEOUT, BUTTON_PULLUP);
+Button rightButton = Button(BUTTON_RIGHT_PIN, BUTTON_DEBOUNCE_TIMEOUT, BUTTON_HOLD_TIMEOUT, BUTTON_STATE_TIMEOUT, BUTTON_PULLUP);
+
+// Timers
+Timer appTimer = Timer();
+
+
+/// <summary>
+/// Front Timer callback function
+/// </summary>
+void loadSceneFront_callback()
+{
+	SceneManager.nextSceneStepFront();
+}
+
+/// <summary>
+/// Rear Left Timer callback function
+/// </summary>
+void loadSceneRearLeft_callback()
+{
+	SceneManager.nextSceneStepRearLeft();
+}
+
+/// <summary>
+/// Rear Right Timer callback function
+/// </summary>
+void loadSceneRearRight_callback()
+{
+	SceneManager.nextSceneStepRearRight();
+}
 
 // the setup function runs once when you press reset or power the board
 void setup() {
-	MainApp.init();
+	// Initialize the LED Stripes	
+	frontLight.begin();
+	rearLeftLight.begin();
+	rearRightLight.begin();
+
+	// Initialize the timer
+	appTimer.configureTimer(SCENE_TIMER_FRONT, 2 * 1000, loadSceneFront_callback);
+	appTimer.configureTimer(SCENE_TIMER_REAR_LEFT, 2 * 1000, loadSceneRearLeft_callback);
+	appTimer.configureTimer(SCENE_TIMER_REAR_RIGHT, 2 * 1000, loadSceneRearRight_callback);
+
+	// Clear the LED Stripes
+	frontLight.show();
+	rearLeftLight.show();
+	rearRightLight.show();
+
+	// Initialize the SceneManager
+	SceneManager.begin();
 }
 
 // the loop function runs over and over again until power down or reset
 void loop() {
-	MainApp.loop();
+	// Update the button state
+	ButtonState leftButtonState = leftButton.getButtonState();
+	ButtonState rightButtonState = rightButton.getButtonState();
+
+	// Update the scene based on button state
+	SceneManager.updateScene(leftButtonState, rightButtonState);
+
+	// Reset short press state
+	leftButton.clearButtonState();
+	rightButton.clearButtonState();
+
+	// Handle scene updates
+	// Updates occurs on Timer elapsed and call to updateScene
+	// Front
+	if (SceneManager.isSceneUpdatedFront() == true)
+	{
+		// update the timer for current step duration
+		appTimer.updateTimer(SCENE_TIMER_FRONT, SceneManager.getSceneStepDurationFront());
+	}
+
+	// Rear Left
+	if (SceneManager.isSceneUpdatedRearLeft() == true)
+	{
+		// update the timer for current step duration
+		appTimer.updateTimer(SCENE_TIMER_REAR_LEFT, SceneManager.getSceneStepDurationRearLeft());
+	}
+
+	// Rear Right
+	if (SceneManager.isSceneUpdatedRearRight() == true)
+	{
+		// update the timer for current step duration
+		appTimer.updateTimer(SCENE_TIMER_REAR_RIGHT, SceneManager.getSceneStepDurationRearRight());
+	}
+
+	// Update the LED Stripes
+	SceneManager.updateStripes(&frontLight, &rearLeftLight, &rearRightLight);
+	
+	// Display the LED Stripes
+	frontLight.show();
+	rearLeftLight.show();
+	rearRightLight.show();
+
+	// Update timer info
+	appTimer.run();
 }

BlinkyBike/BlinkyBike/BlinkyBike.vcxproj

@@ -81,9 +81,6 @@
     <ClInclude Include="Button.h">
       <FileType>CppCode</FileType>
     </ClInclude>
-    <ClInclude Include="MainApp.h">
-      <FileType>CppCode</FileType>
-    </ClInclude>
     <ClInclude Include="SceneManager.h">
       <FileType>CppCode</FileType>
     </ClInclude>
@@ -100,11 +97,15 @@
     <ClCompile Include="AnimationPlayer.cpp" />
     <ClCompile Include="Animations.cpp" />
     <ClCompile Include="Button.cpp" />
-    <ClCompile Include="MainApp.cpp" />
     <ClCompile Include="SceneManager.cpp" />
     <ClCompile Include="Timer.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
+  <ProjectExtensions>
+    <VisualStudio>
+      <UserProperties vm.upload.useprogrammer="1" />
+    </VisualStudio>
+  </ProjectExtensions>
 </Project>