msg-chumby-display 0.2.0 → 0.2.1

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/msg-chumby-daemon

@@ -92,6 +92,11 @@ else
   end
   local_id=$CONFIG['FLUKSO_LOCAL_ID']
   puts "Using Flukso at location #{location} with ID #{local_id}" if $verbose
+  low_bound=$CONFIG['CONSUMPTION_LOW']
+  mid_bound=$CONFIG['CONSUMPTION_MID']
+  high_bound=$CONFIG['CONSUMPTION_HIGH']
+  boundaries = {:low => low_bound, :mid => mid_bound, :high => high_bound}
+  puts "with consumption boundaries #{boundaries}" if $verbose
 end
 
 reading_cache=MSG_Chumby::Reading_Cache.new();
@@ -101,7 +106,7 @@ $lasthour_importer=MSG_Chumby::LastHourImporter.new(reading_cache, sensor_id, to
 $lastday_importer=MSG_Chumby::LastDayImporter.new(reading_cache, sensor_id, token);
 $shortterm_thread=nil;
 $longterm_thread=nil;
-$server=MSG_Chumby::HTTP_XML_Server.new("0.0.0.0", 3000, reading_cache);
+$server=MSG_Chumby::HTTP_XML_Server.new("0.0.0.0", 3000, reading_cache, boundaries);
 
 
 def startAll

data/etc/msgchumbydaemonrc

@@ -1,8 +1,11 @@
 # These are the access parameters of the CC-HPC demo flukso - replace
 # with your own parameters!
-ACCESS_TOKEN: "bb8640e074de14b9d444be7b1359707f"
-SENSOR_ID: "67e9fa794684e4902730be208e9d734e"
+ACCESS_TOKEN: "3f05b2e0ae297c4b850bd2608a79448a"
+SENSOR_ID: "aefd1e23cbbf573cb7b8624aa474fced"
 FLUKSO_LOCATION_METHOD: "static"
-FLUKSO_HOST: "192.168.1.102"
+FLUKSO_HOST: "flukso.kl.dfki.de"
 FLUKSO_PORT: "80"
-FLUKSO_LOCAL_ID: "d69779ec53a9323b695ee86b5328dd28"
+FLUKSO_LOCAL_ID: "aefd1e23cbbf573cb7b8624aa474fced"
+CONSUMPTION_LOW: "150"
+CONSUMPTION_MID: "800"
+CONSUMPTION_HIGH: "2000"

data/lib/msg-chumby-daemon/http-xml-server.rb

@@ -152,8 +152,25 @@ module MSG_Chumby
     end
   end
 
+  class BoundaryHandler < Mongrel::HttpHandler
+    def initialize(boundaries)
+      @boundaries = 
+       {'low' => [boundaries[:low]],
+        'mid' => [boundaries[:mid]],
+        'high' => [boundaries[:high]]}
+      @cached_document=XmlSimple.xml_out(@boundaries ,{'RootName' => "consumption"})
+    end
+    def process(request, response)
+      response.start(200) do |head,out|
+        head["Content-Type"] = "text/xml"
+        out.write(@cached_document);
+      end
+    end
+  end
+
+
   class HTTP_XML_Server
-    def initialize(host, port, reading_cache)
+    def initialize(host, port, reading_cache, boundaries)
       @server = Mongrel::HttpServer.new(host, port)
       @server.register("/time", TimeHandler.new)
       @server.register("/reset", ResetHandler.new)
@@ -161,6 +178,8 @@ module MSG_Chumby
       @server.register("/last_minute", LastMinuteHandler.new(reading_cache))
       @server.register("/last_hour", LastHourHandler.new(reading_cache))
       @server.register("/last_day", LastDayHandler.new(reading_cache))
+      @server.register("/last_day", LastDayHandler.new(reading_cache))
+      @server.register("/boundary_values", BoundaryHandler.new(boundaries))
     end
     def start
       @threads=@server.run

data/widget/currentpower/currentpower Report.txt

@@ -5,7 +5,7 @@ Metadaten
 ---------
 Byte    Wert
 ----    ----
-1290    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> <xmp:CreatorTool>Adobe Flash CS4 Professional</xmp:CreatorTool> <xmp:CreateDate>2010-03-15T15:58:56+01:00</xmp:CreateDate> <xmp:MetadataDate>2010-06-10T12:00:10+02:00</xmp:MetadataDate> <xmp:ModifyDate>2010-06-10T12:00:10+02:00</xmp:ModifyDate> </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"> <xmpMM:InstanceID>xmp.iid:05801174072068118F62D3F217E0363A</xmpMM:InstanceID> <xmpMM:DocumentID>xmp.did:05801174072068118F62D3F217E0363A</xmpMM:DocumentID> <xmpMM:OriginalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</xmpMM:OriginalDocumentID> <xmpMM:DerivedFrom rdf:parseType="Resource"> <stRef:instanceID>xmp.iid:F87F11740720681191099C69294AD041</stRef:instanceID> <stRef:documentID>xmp.did:F87F11740720681191099C69294AD041</stRef:documentID> <stRef:originalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</stRef:originalDocumentID> </xmpMM:DerivedFrom> </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <dc:format>application/x-shockwave-flash</dc:format> </rdf:Description> </rdf:RDF> 
+1290    <rdf:RDF xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"> <rdf:Description rdf:about="" xmlns:xmp="http://ns.adobe.com/xap/1.0/"> <xmp:CreatorTool>Adobe Flash CS4 Professional</xmp:CreatorTool> <xmp:CreateDate>2010-03-15T15:58:56+01:00</xmp:CreateDate> <xmp:MetadataDate>2010-08-16T11:25:22+02:00</xmp:MetadataDate> <xmp:ModifyDate>2010-08-16T11:25:22+02:00</xmp:ModifyDate> </rdf:Description> <rdf:Description rdf:about="" xmlns:xmpMM="http://ns.adobe.com/xap/1.0/mm/" xmlns:stRef="http://ns.adobe.com/xap/1.0/sType/ResourceRef#"> <xmpMM:InstanceID>xmp.iid:F77F1174072068118F62A77E962FFA57</xmpMM:InstanceID> <xmpMM:DocumentID>xmp.did:F77F1174072068118F62A77E962FFA57</xmpMM:DocumentID> <xmpMM:OriginalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</xmpMM:OriginalDocumentID> <xmpMM:DerivedFrom rdf:parseType="Resource"> <stRef:instanceID>xmp.iid:F87F11740720681191099C69294AD041</stRef:instanceID> <stRef:documentID>xmp.did:F87F11740720681191099C69294AD041</stRef:documentID> <stRef:originalDocumentID>xmp.did:F77F11740720681193E68700E4C8E173</stRef:originalDocumentID> </xmpMM:DerivedFrom> </rdf:Description> <rdf:Description rdf:about="" xmlns:dc="http://purl.org/dc/elements/1.1/"> <dc:format>application/x-shockwave-flash</dc:format> </rdf:Description> </rdf:RDF> 
 
 Bild #    Bild Byte    Gesamt Byte    Szene
 ------    ---------    -----------    ----------------

data/widget/last_reading/DataArray.as

@@ -0,0 +1,116 @@
+class DataArray
+{
+
+	var dataArray;
+	var _numValues;
+	
+	public function DataArray(numValues:Number)
+	{
+		// constructor code
+		//trace("dA constructor");
+		dataArray = new Array(numValues);
+		//trace("length" + dataArray.length);
+		_numValues = numValues;
+		initArray();
+	}
+
+	function initArray()
+	{
+		//trace("init Array");
+		var dal:Number = dataArray.length;
+		//trace("length  " + dal);
+		
+		for (var i:Number = 0; i < dal; i++)
+		{
+			//trace(i);
+			dataArray[i] = 0;
+		}
+	}
+
+
+	function max()
+	{
+		var max:Number = 0;
+
+		for (var i:Number = 0; i < dataArray.length; i++)
+		{
+			if (dataArray[i] > max)
+			{
+				max = dataArray[i];
+			}
+		}
+		return max;
+	}
+
+	function min()
+	{
+		var min:Number = dataArray[0];
+
+		for (var i:Number = 1; i < dataArray.length; i++)
+		{
+			if (dataArray[i] < min)
+			{
+				min = dataArray[i];
+			}
+		}
+		return min;
+	}
+	
+	public function addValue(val:Number){
+		//trace("addValue");
+		dataArray.reverse();
+		dataArray.pop();
+		dataArray.reverse();
+		//var help = parseInt(value_reading);
+		dataArray.push(val);
+
+	}
+	
+	public function getDataArray(){
+		//trace("da:" +dataArray);
+		return dataArray;
+	}
+	
+	public function getNow():Number{
+		return dataArray[_numValues - 1];
+	}
+	// Gibt den Durchschnitt des kompletten DataArrays zurück
+	public function average():Number{
+		var avg:Number = 0;
+		for(var i:Number = 0; i < _numValues; i++){
+			avg += dataArray[i];
+		}
+		avg = Math.round(avg / _numValues);
+		return avg;
+	}
+	// Gibt den Durchschnitt der ersten "num" Zahlen im DataArray zurück
+	public function average_number(num:Number):Number{
+		var avg:Number = 0;
+		for(var i:Number = 0; i <num; i++){
+			avg += dataArray[i];
+		}
+		avg = Math.round(avg / num);
+		return avg;
+	}
+	// Gibt den Durchschnitt von "num" Zahlen ab der Stelle "from" zurück
+	public function average_from_to(from:Number, num:Number):Number{
+		var avg:Number = 0;
+		var help:Number = from + num;
+		for(var i:Number = from; i < (help); i++){
+			avg += dataArray[i];
+		}
+		avg = Math.round(avg / num);
+		return avg;
+	}
+	
+	public function getMeasure(low:Number,middle:Number,high:Number):Number{
+		var help = this.getNow();
+		if(help > middle){
+			return 3;
+		} else if (help < middle && help > low ){
+			return 2;
+		} else {
+			return 1;
+		}
+	}
+}

data/widget/last_reading/Makefile

@@ -0,0 +1,30 @@
+SWF_FILE=energietacho.swf
+#SWF_FILE=Gluehlampe.swf
+#SWF_FILE=Gluehlampe_frames.swf
+CHUMBY_PATH=/tmp
+CHUMBY_USER=root
+CHUMBY_IP=192.168.21.209
+
+default: help
+
+copy: $(SWF_FILE)
+	scp $< $(CHUMBY_USER)@$(CHUMBY_IP):$(CHUMBY_PATH)
+
+run: $(SWF_FILE) copy stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "chumbyflashplayer.x -i $(CHUMBY_PATH)/$< 2>&1 &"
+
+stop: 
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/stop_control_panel 2>&1"
+	
+restore: stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/start_control_panel 2>&1"
+
+.SILENT:
+
+help:
+	echo "Copies and runs an SWF file on a local Chumby, please edit the Makefile."
+	echo "Available commands:"
+	echo " * copy: copies $(SWF_FILE) to the chumby at $(CHUMBY_IP)"
+	echo " * run: executes $(SWF_FILE) on the chumby "
+	echo " * stop: stops the currently active control panel"
+	echo " * restore: loads the original control panel (BROKEN?)"

data/widget/last_reading/Makefile.orig

@@ -0,0 +1,60 @@
+SWF_FILE=energietacho.swf
+#SWF_FILE=Gluehlampe.swf
+#SWF_FILE=Gluehlampe_frames.swf
+<<<<<<< Updated upstream
+CHUMBY_PATH=/tmp
+CHUMBY_USER=root
+CHUMBY_IP=192.168.21.209
+
+default: help
+
+copy: $(SWF_FILE)
+	scp $< $(CHUMBY_USER)@$(CHUMBY_IP):$(CHUMBY_PATH)
+
+run: $(SWF_FILE) copy stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "chumbyflashplayer.x -i $(CHUMBY_PATH)/$< 2>&1 &"
+
+stop: 
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/stop_control_panel 2>&1"
+	
+restore: stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/start_control_panel 2>&1"
+
+.SILENT:
+
+help:
+	echo "Copies and runs an SWF file on a local Chumby, please edit the Makefile."
+	echo "Available commands:"
+	echo " * copy: copies $(SWF_FILE) to the chumby at $(CHUMBY_IP)"
+	echo " * run: executes $(SWF_FILE) on the chumby "
+	echo " * stop: stops the currently active control panel"
+	echo " * restore: loads the original control panel (BROKEN?)"
+=======
+CHUMBY_PATH=/tmp
+CHUMBY_USER=root
+CHUMBY_IP=192.168.1.100
+
+default: help
+
+copy: $(SWF_FILE)
+	scp $< $(CHUMBY_USER)@$(CHUMBY_IP):$(CHUMBY_PATH)
+
+run: $(SWF_FILE) copy stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "chumbyflashplayer.x -i $(CHUMBY_PATH)/$< 2>&1 &"
+
+stop: 
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/stop_control_panel 2>&1"
+	
+restore: stop
+	ssh $(CHUMBY_USER)@$(CHUMBY_IP) "/usr/chumby/scripts/start_control_panel 2>&1"
+
+.SILENT:
+
+help:
+	echo "Copies and runs an SWF file on a local Chumby, please edit the Makefile."
+	echo "Available commands:"
+	echo " * copy: copies $(SWF_FILE) to the chumby at $(CHUMBY_IP)"
+	echo " * run: executes $(SWF_FILE) on the chumby "
+	echo " * stop: stops the currently active control panel"
+	echo " * restore: loads the original control panel (BROKEN?)"
+>>>>>>> Stashed changes

data/widget/last_reading/README.rdoc

@@ -0,0 +1,50 @@
+= last_reading widgets
+
+Widgets to display the last_reading the msg-chumby-daemon received from your Flukso. The boundary values for "low", "middle" and "high" are imported from the msg-chumby-daemon on widget startup. To change these values see the howto.
+
+= energietacho 
+
+The widget displays the power consumption in a speedometer like view. The needle is rotated based on the last_reading of your flukso and the provided boundary values. If the _high value is exceeded the needle "hangs" at "High" until lower values are received. However, the current consumption in watts is always displayed as digits.  
+
+= Gluehlampe
+
+The widget displays a lightbulb which glows (off, yellow, red) according to your power consumption and boundary values. 
+This widget uses three MovieClips in one frame which, and exchanges/blends them based on the result of the DataArray.getMeasure method. 
+
+Can be easily adapted by exchanging the three MovieClips with own designs.
+ 
+= Gluehlampe_frames
+
+Here, unlike in the "Gluehlampe" widget, three frames (with one MovieClip each) are used for the different states of power consumption. The shown frame is switched according to the result of DataArray.getMeasure again. 
+
+Can be easily adapted by exchanging the three MovieClips with own designs.
+
+= files
+
+- Makefile
+  Used to copy widgets to your chumby and start them. (IP needs to be adjusted!)
+  
+- energietacho.swf | .fla
+  Widget(swf) and Flash(fla) file for the speedometer like widget.
+
+- Gluehlampe.swf | .fla
+  Widget(swf) and Flash(fla) file for the lightbulb widget using only one frame.
+
+- Gluehlampe_frames.swf | .fla
+  Widget(swf) and Flash(fla) file for the lightbulb widget using multiple frames.
+
+- XMLParse.as
+  AS2 file which handles the XML parsing. 
+
+- DataArray.as
+  AS2 file which handles the received data and provides different access methods.
+ 
+- caurina.*
+  AS library for easy tweening, etc.
+
+= howto
+To simply use the widgets on your chumby with the default values, you can copy them as described in the mySmartGrid developer wiki. (Makefile is included)
+
+To change the boundary values for the consumption you have to open your msgchumbyrc file and change the three values. These changes will only take effect after a restart of the msg-chumby-daemon with the new msgchumbyrc!
+
+In the "Gluehlampe" and "Gluehlampe_frames" widgets, the three MovieClips can be exchanged with arbitrary other MovieClips. 

data/widget/last_reading/README.rtf

@@ -0,0 +1,57 @@
+{\rtf1\ansi\ansicpg1252\cocoartf1038\cocoasubrtf290
+{\fonttbl\f0\fswiss\fcharset0 Helvetica;}
+{\colortbl;\red255\green255\blue255;}
+\paperw11900\paperh16840\margl1440\margr1440\vieww12240\viewh12660\viewkind0
+\pard\tx566\tx1133\tx1700\tx2267\tx2834\tx3401\tx3968\tx4535\tx5102\tx5669\tx6236\tx6803\ql\qnatural\pardirnatural
+
+\f0\fs24 \cf0 = last_reading widgets\
+\
+Widgets to display the last_reading the msg-chumby-daemon received from your Flukso. The boundary values for "low", "middle" and "high" consumption are set to 300, 700 and 1500 watts respectively. To change these check the howto section. \
+\
+= energietacho \
+\
+The widget displays the power consumption in a speedometer like view. The needle is rotated based on the last_reading of your flukso and the provided boundary values. If the _high value is exceeded the needle "hangs" at "High" until lower values are received. However, the current consumption in watts is always displayed as digits.  \
+\
+= Gluehlampe\
+\
+The widget displays a lightbulb which glows (off, yellow, red) according to your power consumption and boundary values. \
+This widget uses three MovieClips in one frame which, and exchanges/blends them based on the result of the DataArray.getMeasure method. \
+\
+Can be easily adapted by exchanging the three MovieClips with own designs.\
+ \
+= Gluehlampe_frames\
+\
+Here, unlike in the "Gluehlampe" widget, three frames (with one MovieClip each) are used for the different states of power consumption. The shown frame is switched according to the result of DataArray.getMeasure again. \
+\
+Can be easily adapted by exchanging the three MovieClips with own designs.\
+\
+= files\
+\
+- Makefile\
+  Used to copy widgets to your chumby and start them. (IP needs to be adjusted!)\
+  \
+- energietacho.swf | .fla\
+  Widget(swf) and Flash(fla) file for the speedometer like widget.\
+\
+- Gluehlampe.swf | .fla\
+  Widget(swf) and Flash(fla) file for the lightbulb widget using only one frame.\
+\
+- Gluehlampe_frames.swf | .fla\
+   Widget(swf) and Flash(fla) file for the lightbulb widget using multiple frames.\
+\
+- XMLParse.as\
+  AS2 file which handles the XML parsing. \
+\
+-DataArray.as\
+  AS2 file which handles the received data and provides different access methods.\
+ \
+- com.greensock.*\
+  AS library for easy tweening, etc.\
+\
+= howto\
+To simply use the widgets on your chumby with the default values, you can copy them as described in the mySmartGrid developer wiki. (Makefile is included)\
+\
+To change the boundary values for the consumption you have to open the respective *.fla file with AdobeFlash. In the "Actions" for the first frame you can enter new values for _low, _middle, and _high boundary values. \
+You need to recompile/export the widget to get an updated .swf file which you can then transfer to your chumby.\
+\
+In the "Gluehlampe" and "Gluehlampe_frames" widgets, the three MovieClips can be exchanged with arbitrary other MovieClips. }

data/widget/last_reading/XmlParse.as

@@ -0,0 +1 @@
+class XmlParse

data/widget/last_reading/caurina/transitions/AuxFunctions.as

@@ -0,0 +1,88 @@
+/**
+ * Generic, auxiliary functions
+ *
+ * @author		Zeh Fernando
+ * @version		1.0.0
+ */
+
+class caurina.transitions.AuxFunctions {
+
+	/**
+	 * Gets the R (xx0000) bits from a number
+	 *
+	 * @param		p_num				Number		Color number (ie, 0xffff00)
+	 * @return							Number		The R value
+	 */
+	public static function numberToR(p_num:Number):Number {
+		// The initial & is meant to crop numbers bigger than 0xffffff
+		return (p_num & 0xff0000) >> 16;
+	}
+
+	/**
+	 * Gets the G (00xx00) bits from a number
+	 *
+	 * @param		p_num				Number		Color number (ie, 0xffff00)
+	 * @return							Number		The G value
+	 */
+	public static function numberToG(p_num:Number):Number {
+		return (p_num & 0xff00) >> 8;
+	}
+
+	/**
+	 * Gets the B (0000xx) bits from a number
+	 *
+	 * @param		p_num				Number		Color number (ie, 0xffff00)
+	 * @return							Number		The B value
+	 */
+	public static function numberToB(p_num:Number):Number {
+		return (p_num & 0xff);
+	}
+
+	/**
+	 * Checks whether a string is on an array
+	 *
+	 * @param		p_string			String		String to search for
+	 * @param		p_array				Array		Array to be searched
+	 * @return							Boolean		Whether the array contains the string or not
+	 */
+	public static function isInArray(p_string:String, p_array:Array):Boolean {
+		var l:Number = p_array.length;
+		for (var i:Number = 0; i < l; i++) {
+			if (p_array[i] == p_string) return true;
+		}
+		return false;
+	}
+
+	/**
+	 * Returns the number of properties an object has
+	 *
+	 * @param		p_object			Object		Target object with a number of properties
+	 * @return							Number		Number of total properties the object has
+	 */
+	public static function getObjectLength(p_object:Object):Number {
+		var totalProperties:Number = 0;
+		for (var pName:String in p_object) totalProperties ++;
+		return totalProperties;
+	}
+
+	/* Takes a variable number of objects as parameters and "adds" their properties, from left to right. If a latter object defines a property as null, it will be removed from the final object
+	* @param		args				Object(s)	A variable number of objects
+	* @return							Object		An object with the sum of all paremeters added as properties.
+	*/
+	public static function concatObjects(/*objects to concat*/) : Object{
+		var finalObject : Object = {};
+		var currentObject : Object;
+		for (var i : Number = 0; i < arguments.length; i++){
+			currentObject = arguments[i];
+			for (var prop : String in currentObject){
+				if (currentObject[prop] == null){
+				    // delete in case is null
+					delete finalObject[prop];
+				}else{
+					finalObject[prop] = currentObject[prop]
+				}
+			}
+		}
+		return finalObject;
+	}
+}