Merge pull request #13 from pixelmatix/Aurora1.3

Merging Aurora1.3 to master

Author: jasoncoon

.gitignore

@@ -1,7 +1,16 @@
+**/.DS_Store
+spec.d
+.ino.cpp
+Release
+Arduino
 Debug
 Visual Micro
 *.suo
 *.sdf
 *.opensdf
 *.vcxproj.filters
-*.vcxproj.user
+*.vcxproj.user
+/Release/
+.cproject
+.project
+.settings/

Animations.h

@@ -1,31 +1,33 @@
 /*
- * Aurora: https://github.com/pixelmatix/aurora
- * Copyright (c) 2014 Jason Coon
- *
- * Portions of this code are adapted from Craig Lindley's LightAppliance: https://github.com/CraigLindley/LightAppliance
- * Copyright (c) 2014 Craig A. Lindley
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy of
- * this software and associated documentation files (the "Software"), to deal in
- * the Software without restriction, including without limitation the rights to
- * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
- * the Software, and to permit persons to whom the Software is furnished to do so,
- * subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in all
- * copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
- * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
- * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
- * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
- * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
- */
+* Aurora: https://github.com/pixelmatix/aurora
+* Copyright (c) 2014 Jason Coon
+*
+* Portions of this code are adapted from Craig Lindley's LightAppliance: https://github.com/CraigLindley/LightAppliance
+* Copyright (c) 2014 Craig A. Lindley
+*
+* Permission is hereby granted, free of charge, to any person obtaining a copy of
+* this software and associated documentation files (the "Software"), to deal in
+* the Software without restriction, including without limitation the rights to
+* use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+* the Software, and to permit persons to whom the Software is furnished to do so,
+* subject to the following conditions:
+*
+* The above copyright notice and this permission notice shall be included in all
+* copies or substantial portions of the Software.
+*
+* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+* FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+* COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+* IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+* CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+*/
 
 #ifndef Animations_H
 #define Animations_H
 
+extern GifPlayer gifPlayer;
+
 class Animations : public Playlist {
 public:
 

Attractor.h

@@ -24,14 +24,16 @@
  * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include "Vector.h"
+
 class Attractor {
 public:
     float mass;    // Mass, tied to size
     float G;       // Gravitational Constant
     PVector location;   // Location
 
     Attractor() {
-        location = PVector((MATRIX_WIDTH / 2) - 1, (MATRIX_HEIGHT / 2) - 1);
+        location = PVector(MATRIX_CENTRE_X, MATRIX_CENTRE_Y);
         mass = 10;
         G = .5;
     }
@@ -45,4 +47,4 @@ class Attractor {
         force *= strength;                                  // Get force vector --> magnitude * direction
         return force;
     }
-};
+};

Aurora.h

@@ -0,0 +1,51 @@
+/*
+ * Aurora: https://github.com/pixelmatix/aurora
+ * Copyright (c) 2014 Jason Coon
+ *
+ * Designed in collaboration with Pixelmatix using the SmartMatrix Library: http://pixelmatix.com
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy of
+ * this software and associated documentation files (the "Software"), to deal in
+ * the Software without restriction, including without limitation the rights to
+ * use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+ * the Software, and to permit persons to whom the Software is furnished to do so,
+ * subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+ * FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+ * COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+ * IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef AURORA_H_
+#define AURORA_H_
+
+#include <SmartMatrix_32x32.h>
+
+const int MATRIX_CENTER_X = MATRIX_WIDTH / 2;
+const int MATRIX_CENTER_Y = MATRIX_HEIGHT / 2;
+
+const byte MATRIX_CENTRE_X = MATRIX_CENTER_X - 1;
+const byte MATRIX_CENTRE_Y = MATRIX_CENTER_Y - 1;
+
+void powerOff();
+void loadSettings();
+int getBrightnessLevel();
+int getBackgroundBrightnessLevel();
+void adjustBrightness(int delta);
+uint8_t cycleBrightness();
+void adjustBackgroundBrightness(int d);
+void boundBrightness();
+void boundBackgroundBrightness();
+void saveBrightnessSetting();
+void saveBackgroundBrightnessSetting();
+int loadIntSetting(char* dir, const char* settingPath, int maxLength, int defaultValue);
+void saveIntSetting(char* dir, const char* settingPath, int value);
+
+
+#endif

Aurora.ino

@@ -24,6 +24,8 @@
 
 #include "Hardware.h"
 
+#include "Aurora.h"
+
 uint8_t brightness = 255;
 uint8_t backgroundBrightness = 63;
 
@@ -37,9 +39,6 @@ uint8_t backgroundBrightnessMap[brightnessCount] = { 8, 16, 32, 64, 128 };
 #include <SPI.h>
 #include <SD.h>
 
-const int MATRIX_CENTER_X = MATRIX_WIDTH / 2;
-const int MATRIX_CENTER_Y = MATRIX_HEIGHT / 2;
-
 #include <Wire.h>
 #include <Time.h>
 #include <DS1307RTC.h>
@@ -76,6 +75,9 @@ bool isTimeAvailable = false;
 #include "ClockDigitalShort.h"
 ClockDigitalShort clockDigitalShort;
 
+#include "ClockText.h"
+ClockText clockText;
+
 #include "ClockDisplay.h"
 ClockDisplay clockDisplay;
 
@@ -87,6 +89,9 @@ Animations animations;
 
 #include "Bitmaps.h"
 
+rgb24 menuColor = CRGB(CRGB::Blue);
+int autoPlayDurationSeconds = 10;
+
 #include "MenuItem.h"
 #include "Menu.h"
 Menu menu;
@@ -97,14 +102,19 @@ Settings settings;
 #include "SettingsSetTime.h"
 #include "SettingsMoveClock.h"
 
+#include "StreamingMode.h"
+StreamingMode streamingMode;
+
 MenuItem menuItemPatterns = MenuItem("Patterns", &patterns);
 MenuItem menuItemAnimations = MenuItem("Animations", &animations);
+MenuItem menuItemStreamingMode = MenuItem("Streaming Mode", &streamingMode);
 MenuItem menuItemSettings = MenuItem("Settings", &settings);
 
 // Main Menu
 MenuItem* mainMenuItems [] = {
     &menuItemPatterns,
     &menuItemAnimations,
+    &menuItemStreamingMode,
     &menuItemSettings,
 };
 
@@ -117,8 +127,8 @@ void setup()
     // Setup serial interface
     Serial.begin(9600);
 
-    //delay(3000);
-    //Serial.println(F("starting..."));
+    // delay(3000);
+    // Serial.println(F("starting..."));
 
     // Initialize the IR receiver
     irReceiver.enableIRIn();
@@ -170,6 +180,11 @@ void setup()
     if (enableStartupSplash) {
         while (matrix.getScrollStatus() != 0) {}
     }
+
+    if (!HAS_IR) {
+        menu.playbackState = Menu::PlaybackState::Autoplay;
+        menu.visible = false;
+    }
 }
 
 void loop()
@@ -207,6 +222,12 @@ void loadSettings() {
     boundBackgroundBrightness();
     matrix.setBackgroundBrightness(backgroundBrightness);
 
+    menuColor.red = loadIntSetting("/aurora/", "/aurora/menuR.txt", 3, 0);
+    menuColor.green = loadIntSetting("/aurora/", "/aurora/menuG.txt", 3, 0);
+    menuColor.blue = loadIntSetting("/aurora/", "/aurora/menuB.txt", 3, 255);
+
+    autoPlayDurationSeconds = loadIntSetting("/aurora/", "/aurora/autoplyd.txt", 3, 10);
+
     clockDisplay.loadSettings();
 }
 
@@ -244,11 +265,11 @@ void adjustBrightness(int delta) {
     brightness = brightnessMap[level];
     boundBrightness();
     matrix.setBrightness(brightness);
-    saveBrightnessSetting();
 }
 
 uint8_t cycleBrightness() {
     adjustBrightness(1);
+    saveBrightnessSetting();
 
     if (brightness == brightnessMap[0])
         return 0;
@@ -274,7 +295,6 @@ void adjustBackgroundBrightness(int d) {
     backgroundBrightness = backgroundBrightnessMap[level];
     boundBackgroundBrightness();
     matrix.setBackgroundBrightness(backgroundBrightness);
-    saveBackgroundBrightnessSetting();
 }
 
 void boundBrightness() {
@@ -299,6 +319,28 @@ void saveBackgroundBrightnessSetting() {
     saveIntSetting("/aurora/", "/aurora/bckbrght.txt", backgroundBrightness);
 }
 
+void saveMenuColor() {
+    saveMenuR();
+    saveMenuG();
+    saveMenuB();
+}
+
+void saveMenuR() {
+    saveIntSetting("/aurora/", "/aurora/menuR.txt", menuColor.red);
+}
+
+void saveMenuG() {
+    saveIntSetting("/aurora/", "/aurora/menuG.txt", menuColor.green);
+}
+
+void saveMenuB() {
+    saveIntSetting("/aurora/", "/aurora/menuB.txt", menuColor.blue);
+}
+
+void saveAutoPlayDurationSeconds() {
+    saveIntSetting("/aurora/", "/aurora/autoplyd.txt", autoPlayDurationSeconds);
+}
+
 int loadIntSetting(char* dir, const char* settingPath, int maxLength, int defaultValue) {
     if (!sdAvailable)
         return defaultValue;
@@ -354,4 +396,14 @@ void saveIntSetting(char* dir, const char* settingPath, int value) {
         file.print(value, 10);
         file.close();
     }
-}
+}
+
+// translates from x, y into an index into the LED array
+uint16_t XY(uint8_t x, uint8_t y) {
+    if (y >= MATRIX_HEIGHT) { y = MATRIX_HEIGHT - 1; }
+    if (y < 0) { y = 0; }
+    if (x >= MATRIX_WIDTH) { x = MATRIX_WIDTH - 1; }
+    if (x < 0) { x = 0; }
+
+    return (y * MATRIX_WIDTH) + x;
+}

Aurora.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.30723.0
+VisualStudioVersion = 12.0.31101.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Aurora", "Aurora.vcxproj", "{B0C98204-D78F-4B9E-AAB9-0A8453BB16EC}"
 EndProject