Release 2.2

.gitignore

@@ -0,0 +1,5 @@
+.cproject
+.project
+.settings/
+*.pyc
+*.DS_STORE

AuroraPluginTemplate/Debug/makefile

@@ -46,7 +46,7 @@ all: libAuroraPlugin.so
 libAuroraPlugin.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross G++ Linker'
-	g++ -L../Utilities -u _passLayoutData -u _passColorPalette -u _dataManagerCleanup -u _getEnabledFeatures -u _initRhythmFeatures -u _updateRhythmFeatures -u _deinitRhythmFeatures -u _initBeatFeatures -u _updateBeatFeatures -u _deinitBeatFeatures -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Wl,--whole-archive -L../Utilities -lPluginUtilities -Wl,--no-whole-archive -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

AuroraPluginTemplate/inc/Logger.h

@@ -8,7 +8,9 @@
 #ifndef INC_LOGGER_H_
 #define INC_LOGGER_H_
 
-#define LOGGING_ENABLED
+#include <stdio.h>
+
+//#define LOGGING_ENABLED
 
 #ifdef LOGGING_ENABLED
 #define PRINTLOG(format, ...) printf(format,  ##__VA_ARGS__)

AuroraPluginTemplate/inc/PluginFeatures.h

@@ -19,10 +19,12 @@ void enableEnergy(void);
 void enableFft(uint16_t nFftBins);
 void enableDistance(void);
 void enableSpeed(void);			// get motion speed in m/s
+void enableMel(void);
 uint16_t getEnergy(void);
 uint8_t *getFftBins(void);
 uint8_t getDistance(void);
 uint8_t getSpeed(void);
+uint8_t *getMelBins(void);
 
 /* ----------------------------------
  * BEAT FEATURE FUNCTIONS

AuroraPluginTemplate/inc/PluginOptions.h

@@ -0,0 +1,18 @@
+#ifndef PLUGIN_OPTIONS_H
+#define PLUGIN_OPTIONS_H
+
+const char* pluginOptionsJsonString = "{\"options\": [{\"defaultValue\": 15, \"minValue\": 1, \"type\": \"int\", \"name\": \"transTime\", \"maxValue\": 600}]}";
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char* getPluginOptionsJsonString(){
+	return pluginOptionsJsonString;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

AuroraPluginTemplate/inc/PluginOptionsManager.h

@@ -0,0 +1,23 @@
+/*
+ * PluginOptionsManager.h
+ *
+ *  Created on: Jul 25, 2017
+ *      Author: eski
+ */
+
+#ifndef INC_PLUGINOPTIONSMANAGER_H_
+#define INC_PLUGINOPTIONSMANAGER_H_
+
+#define PLUGIN_OPTIONS_ERROR_OPTION_NO_EXIST -10
+#define PLUGIN_OPTIONS_ERROR_WRONG_OPTION_TYPE -11
+
+#include <string>
+
+
+int getOptionValue(const char* name, int& value);
+int getOptionValue(const char* name, bool& value);
+int getOptionValue(const char* name, double& value);
+int getOptionValue(const char* name, std::string & value);
+
+
+#endif /* INC_PLUGINOPTIONSMANAGER_H_ */

AuroraPluginTemplate/inc/Version.h

@@ -9,7 +9,7 @@
 #define INC_VERSION_H_
 
 
-#define SDK_VERSION "2.0"
+#define SDK_VERSION "2.2"
 
 
 #endif /* INC_VERSION_H_ */

AuroraPluginTemplate/src/AuroraPlugin.cpp

@@ -17,11 +17,14 @@
 
 
 #include "AuroraPlugin.h"
+
+#include "../inc/PluginFeatures.h"
 #include "LayoutProcessingUtils.h"
 #include "ColorUtils.h"
 #include "DataManager.h"
-#include "PluginFeatures.h"
 #include "Logger.h"
+#include "PluginOptionsManager.h"
+// #include "PluginOptions.h"  /**< uncomment for Plugin Options */
 
 #ifdef __cplusplus
 extern "C" {

Examples/Converge/Converge.opt

@@ -0,0 +1 @@
+{"palette": [{"hue": 227, "saturation": 100, "brightness": 99}, {"hue": 182, "saturation": 100, "brightness": 100}, {"hue": 125, "saturation": 100, "brightness": 93}, {"hue": 62, "saturation": 100, "brightness": 100}, {"hue": 31, "saturation": 100, "brightness": 100}, {"hue": 2, "saturation": 100, "brightness": 100}, {"hue": 307, "saturation": 100, "brightness": 100}], "pluginType": "color", "pluginUuid": "c6e98ebc-dfb3-4f5e-a6cb-f63907278379", "version": "1.0", "animType": "plugin", "animName": "Converge", "colorType": "HSB"}

Examples/WeirdWheel/Debug/makefile → Examples/Converge/Debug/makefile

@@ -46,7 +46,7 @@ all: libAuroraPlugin.so
 libAuroraPlugin.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross G++ Linker'
-	g++ -L../Utilities -u _passLayoutData -u _passColorPalette -u _dataManagerCleanup -u _getEnabledFeatures -u _initRhythmFeatures -u _updateRhythmFeatures -u _deinitRhythmFeatures -u _initBeatFeatures -u _updateBeatFeatures -u _deinitBeatFeatures -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Wl,--whole-archive -L../Utilities -lPluginUtilities -Wl,--no-whole-archive -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Examples/WeirdWheel/Debug/src/AuroraPlugin.d → Examples/Converge/Debug/src/AuroraPlugin.d

@@ -1,7 +1,8 @@
 src/AuroraPlugin.o: ../src/AuroraPlugin.cpp ../inc/AuroraPlugin.h \
  ../inc/LayoutProcessingUtils.h ../inc/Point.h ../inc/Shape.h \
  ../inc/ColorUtils.h ../inc/DataManager.h ../inc/ColorUtils.h \
- ../inc/LayoutProcessingUtils.h ../inc/PluginFeatures.h ../inc/Logger.h
+ ../inc/LayoutProcessingUtils.h ../inc/PluginFeatures.h ../inc/Logger.h \
+ ../inc/PluginOptionsManager.h ../inc/PluginOptions.h
 
 ../inc/AuroraPlugin.h:
 
@@ -22,3 +23,7 @@ src/AuroraPlugin.o: ../src/AuroraPlugin.cpp ../inc/AuroraPlugin.h \
 ../inc/PluginFeatures.h:
 
 ../inc/Logger.h:
+
+../inc/PluginOptionsManager.h:
+
+../inc/PluginOptions.h:

Examples/Converge/inc/PluginOptions.h

@@ -0,0 +1,18 @@
+#ifndef PLUGIN_OPTIONS_H
+#define PLUGIN_OPTIONS_H
+
+const char* pluginOptionsJsonString = "{\"options\": [{\"defaultValue\": 15, \"minValue\": 1, \"type\": \"int\", \"name\": \"transTime\", \"maxValue\": 600}]}";
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+const char* getPluginOptionsJsonString(){
+	return pluginOptionsJsonString;
+}
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif

Examples/Converge/inc/PluginOptionsManager.h

@@ -0,0 +1,23 @@
+/*
+ * PluginOptionsManager.h
+ *
+ *  Created on: Jul 25, 2017
+ *      Author: eski
+ */
+
+#ifndef INC_PLUGINOPTIONSMANAGER_H_
+#define INC_PLUGINOPTIONSMANAGER_H_
+
+#define PLUGIN_OPTIONS_ERROR_OPTION_NO_EXIST -10
+#define PLUGIN_OPTIONS_ERROR_WRONG_OPTION_TYPE -11
+
+#include <string>
+
+
+int getOptionValue(const char* name, int& value);
+int getOptionValue(const char* name, bool& value);
+int getOptionValue(const char* name, double& value);
+int getOptionValue(const char* name, std::string & value);
+
+
+#endif /* INC_PLUGINOPTIONSMANAGER_H_ */

Examples/WeirdWheel/inc/Version.h → Examples/Converge/inc/Version.h

@@ -9,7 +9,7 @@
 #define INC_VERSION_H_
 
 
-#define SDK_VERSION "2.0"
+#define SDK_VERSION "2.2"
 
 
 #endif /* INC_VERSION_H_ */

Examples/WeirdWheel/src/AuroraPlugin.cpp → Examples/Converge/src/AuroraPlugin.cpp

@@ -22,6 +22,8 @@
 #include "DataManager.h"
 #include "PluginFeatures.h"
 #include "Logger.h"
+#include "PluginOptionsManager.h"
+#include "PluginOptions.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -55,6 +57,8 @@ void initPlugin(){
     //grab the layout data, this function returns a pointer to a statically allocated buffer. Safe to call as many time as required.
     //Dont delete this pointer. The memory is managed automatically.
     LayoutData* layoutData = getLayoutData();
+
+    getOptionValue("transTime", transTime);
 
     rotateAuroraPanels(layoutData, &layoutData->globalOrientation);
 

Examples/FrequencyStars/Debug/makefile

@@ -45,7 +45,7 @@ all: libFrequencyStars.so
 libFrequencyStars.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross G++ Linker'
-	g++ -L../Utilities -u _passLayoutData -u _passColorPalette -u _dataManagerCleanup -u _getEnabledFeatures -u _initRhythmFeatures -u _updateRhythmFeatures -u _deinitRhythmFeatures -u _initBeatFeatures -u _updateBeatFeatures -u _deinitBeatFeatures -shared -o "libFrequencyStars.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Wl,--whole-archive -L../Utilities -lPluginUtilities -Wl,--no-whole-archive -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Examples/RhythmicNorthernLights/Debug/makefile

@@ -46,7 +46,7 @@ all: libAuroraPlugin.so
 libAuroraPlugin.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross G++ Linker'
-	g++ -L../Utilities -u _passLayoutData -u _passColorPalette -u _dataManagerCleanup -u _getEnabledFeatures -u _initRhythmFeatures -u _updateRhythmFeatures -u _deinitRhythmFeatures -u _initBeatFeatures -u _updateBeatFeatures -u _deinitBeatFeatures -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Wl,--whole-archive -L../Utilities -lPluginUtilities -Wl,--no-whole-archive -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '
 

Examples/Soda/Debug/makefile

@@ -46,7 +46,7 @@ all: libAuroraPlugin.so
 libAuroraPlugin.so: $(OBJS) $(USER_OBJS)
 	@echo 'Building target: $@'
 	@echo 'Invoking: Cross G++ Linker'
-	g++ -L../Utilities -u _passLayoutData -u _passColorPalette -u _dataManagerCleanup -u _getEnabledFeatures -u _initRhythmFeatures -u _updateRhythmFeatures -u _deinitRhythmFeatures -u _initBeatFeatures -u _updateBeatFeatures -u _deinitBeatFeatures -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	g++ -Wl,--whole-archive -L../Utilities -lPluginUtilities -Wl,--no-whole-archive -shared -o "libAuroraPlugin.so" $(OBJS) $(USER_OBJS) $(LIBS)
 	@echo 'Finished building target: $@'
 	@echo ' '