added support for WT450 sensor, more code removed to reduce code space and

more, check README

Author: JP

Ninja/Ninja.h

@@ -4,9 +4,9 @@
 // This part defines which version to use when compile
 // Only one define is allowed.
 
-#define V11					1
-//#define V12				1
-#define VERSION_NO 	"0.43"
+//#define V11					1
+#define V12				1
+#define VERSION_NO 	"0.44"
 //#define TESTER	1
 
 #if defined(V12) && defined(V11)  

Ninja/NinjaArduino/NinjaArduino.ino

@@ -15,22 +15,25 @@ void setup()
 	pinMode(RED_LED_PIN, OUTPUT);
 	pinMode(GREEN_LED_PIN, OUTPUT);
 	pinMode(BLUE_LED_PIN, OUTPUT);
-	digitalWrite(RED_LED_PIN, HIGH);		// set the RED LED  Off
-	digitalWrite(GREEN_LED_PIN, HIGH);	// set the GREEN LED Off
-	digitalWrite(BLUE_LED_PIN, HIGH);		// set the BLUE LED Off
+	digitalWrite(RED_LED_PIN, HIGH);            // set the RED LED  Off
+	digitalWrite(GREEN_LED_PIN, HIGH);          // set the GREEN LED Off
+	digitalWrite(BLUE_LED_PIN, HIGH);           // set the BLUE LED Off
 
+#ifdef V11
+        digitalWrite(BLUE_LED_PIN, LOW);           // Power on Status
+#endif 
 #ifdef V12
 	pinMode(RED_STAT_LED_PIN, OUTPUT);
 	pinMode(GREEN_STAT_LED_PIN, OUTPUT);
 	pinMode(BLUE_STAT_LED_PIN, OUTPUT);
 	digitalWrite(RED_STAT_LED_PIN, HIGH);		// set the RED STAT LED  Off
-	digitalWrite(GREEN_STAT_LED_PIN, HIGH);	// set the GREEN STAT LED Off
-	digitalWrite(BLUE_STAT_LED_PIN, HIGH);	// set the BLUE STAT LED Off
+	digitalWrite(GREEN_STAT_LED_PIN, HIGH);	        // set the GREEN STAT LED Off
+	digitalWrite(BLUE_STAT_LED_PIN, LOW);	        // Power on Status
 #endif
 }
 
 void loop()
 {
 	nOBJECTS.sendObjects();				// Send Ninja Objects 
 	nOBJECTS.doReactors();				// Receive Ninja Objects reactors
-}
+}

NinjaObjects/NinjaObjects.cpp

@@ -37,20 +37,21 @@ const char strWindDirection[16][4] =
 	"W", "WNW", "NW", "NNW"
 };
 
+/*
 struct __freelist
 {
 	size_t sz;
 	struct __freelist *nx;
 };
-
+*/
 
 // Variables need to be moved to private or public part of the object - TODO
-uint16_t biggest;
+//uint16_t biggest;
 NinjaObjects nOBJECTS;
 char serInStr[recvLEN];  // array to hold the incoming serial string bytes
 
-extern char * const __brkval;
-extern struct __freelist *__flp;
+//extern char * const __brkval;
+//extern struct __freelist *__flp;
 
 char strGUID[GUID_LEN];
 int intVID=0;
@@ -160,6 +161,8 @@ void dec2binWzerofill(char* bin, unsigned long long Dec, unsigned int bitLength)
 	return;
 }
 
+
+/*
 // given a PROGMEM string, use Serial.print() to send it out
 // this is needed to save precious memory
 //thanks to todbot for this http://todbot.com/blog/category/programming/
@@ -175,7 +178,9 @@ void printProgStr(const prog_char* str) {
 		str++;
 	}
 }
+*/
 
+/*
 uint16_t freeMem(uint16_t *biggest)
 {
 	char *brkval;
@@ -211,6 +216,7 @@ void freeMem(char* message)
 	Serial.print(":\t");
 	Serial.println(freeMem(&biggest));
 }
+*/
 
 
 //read a string from the serial and store it in an array
@@ -589,7 +595,7 @@ void NinjaObjects::doJSONError(int errorCode)
 	aJsonObject* root = aJson.createObject();
 	if (root == NULL)
 	{
-		Serial.println("error root"); 
+		//Serial.println("error root"); 
 		return;
 	}
 
@@ -615,7 +621,7 @@ void NinjaObjects::doJSONResponse()
 	aJsonObject* root = aJson.createObject();
 	if (root == NULL)
 	{
-		Serial.println("error root"); 
+		//Serial.println("error root"); 
 		return;
 	}
 
@@ -653,7 +659,7 @@ void NinjaObjects::doJSONData(char * strGUID, int intVID, int intDID, char * str
 	aJsonObject* root = aJson.createObject();
 	if (root == NULL)
 	{
-		Serial.println("error root"); 
+		//Serial.println("error root"); 
 		return;
 	}
 
@@ -794,6 +800,37 @@ void NinjaObjects::doOnBoardAccelerometer()
 }
 #endif
 
+void NinjaObjects::doWT450(unsigned long long value)
+{
+	char strAddress[5];
+	unsigned long data;
+	int house=0;
+	byte station=0;
+	int humidity=0;
+	double temperature=0;
+	double tempdecimal=0;
+	byte tempfraction=0;
+
+	data=(unsigned long)value;
+
+	house=(data>>28) & (0x0f);
+	station=((data>>26) & (0x03))+1;
+	humidity=(data>>16)&(0xff);
+	temperature=((data>>8) & (0xff))-50;
+	tempfraction=(data>>4) & (0x0f);
+
+	tempdecimal=((tempfraction>>3 & 1) * 0.5) + ((tempfraction>>2 & 1) * 0.25) + ((tempfraction>>1 & 1) * 0.125) + ((tempfraction & 1) * 0.0625);
+	temperature=temperature+tempdecimal;
+	temperature=(int)(temperature*10);
+	temperature=temperature/10;
+
+	sprintf(strAddress,"%02d%02d", house, station);
+	
+	doJSONData(strAddress, 0, 30, NULL, humidity, false,0);
+	doJSONData(strAddress, 0, 31, NULL, temperature, false,0);
+	
+}
+
 void NinjaObjects::doLacrosseTX3(unsigned long long tx3value)
 {
 	byte nibble[10];
@@ -904,7 +941,7 @@ void NinjaObjects::do433(void)
 
 	mySwitch.enableReceive(RX433_INT);
 
-	if (mySwitch.available()) 
+	if (mySwitch.available() && (mySwitch.getReceivedProtocol()>0 && mySwitch.getReceivedProtocol()<6))
 	{
 		unsigned long long value = mySwitch.getReceivedValue();
 		if (value == 0) // unknown encoding
@@ -932,6 +969,8 @@ void NinjaObjects::do433(void)
 				doLacrosseTX3(value);
 			else if (mySwitch.getReceivedProtocol()==4)
 				doLacrosseWS2355(value);
+			else if(mySwitch.getReceivedProtocol()==5)
+				doWT450(value);
 			else
 			{		
 				if (mySwitch.getReceivedBitlength()> (DATA_LEN/2))
@@ -1196,6 +1235,7 @@ boolean NinjaObjects::doPort3(byte* DHT22_PORT)
 	return IsDHT22;
 }
 
+
 void NinjaObjects::doDHT22(byte port)
 {
 	int intTemperature;

NinjaObjects/NinjaObjects.h

@@ -53,6 +53,7 @@ class NinjaObjects {
 		void do433(void);
 		void doLacrosseTX3(unsigned long long tx3value);
 		void doLacrosseWS2355(unsigned long long ws2344value);
+		void doWT450(unsigned long long value);
 };
 
 extern NinjaObjects nOBJECTS;

NinjaObjects/README

@@ -2,6 +2,9 @@ NinjaObjects.cpp - Ninja Objects library
 
 Based on the aJson example from http://interactive-matter.eu/how-to/ajson-arduino-json-library/
 
+8th October 2012 by JP Liew
+	- added doWT450()to decode house, station, humidity & temp from raw data
+
 2nd October 2012 by JP Liew
 	- added TESTER code for Ninja Cape to test another fresh cape out from production
 	- added DID 8888,8889,8890 to support special command for TESTER to send/receive signal