Temperature sensor is working.

jlkalberer · Oct 2, 2015 · 13c6c3d · 13c6c3d
1 parent 6cdd6e6
commit 13c6c3d
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 18 deletions.
diff --git a/Source/KegServer/KegServer.ino b/Source/KegServer/KegServer.ino
@@ -20,8 +20,8 @@
 #include <OneWire.h>
 #include "Temperature.h"
 
-#define SSID      "casanova"
-#define PASSWORD       "bitchhunter"
+#define SSID      "da_shiz"
+#define PASSWORD       "longasspassword"
 #define AUTH      WIFLY_AUTH_WPA2_PSK
 
 //#define LOGGING 1
@@ -54,7 +54,7 @@ const int kNetworkDelay = 1000;
 
 WiFly wifly(WIFLY_PIN_1, WIFLY_PIN_2);
 NFC nfc;
-RestClient r(wifly, "192.168.1.144");
+RestClient r(wifly, "192.168.1.113");
 
 byte state, waitCount;
 volatile int flowCount = 0;
@@ -63,7 +63,6 @@ unsigned long time, totalPulses;
 void setup()
 {
 	Serial.begin(9600); 
-
 	// initialize serial communications at 9600 bps:
 
 	Memory();
@@ -205,4 +204,4 @@ void ReadTemperature()
 void flowCounter() 
 {
 	flowCount++;
-}
+}
diff --git a/Source/KegServer/KegServer.vcxproj b/Source/KegServer/KegServer.vcxproj
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <ItemGroup Label="ProjectConfigurations">
     <ProjectConfiguration Include="Debug|Win32">
       <Configuration>Debug</Configuration>
@@ -18,13 +18,13 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v110</PlatformToolset>
+    <PlatformToolset>v120</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>MultiByte</CharacterSet>
   </PropertyGroup>

diff --git a/Source/KegServer/KegServer.vcxproj.filters b/Source/KegServer/KegServer.vcxproj.filters
@@ -42,6 +42,9 @@
     <ClCompile Include="NFC.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="Temperature.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="b64.h">
@@ -74,6 +77,9 @@
     <ClInclude Include="NFC.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="Temperature.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <None Include="KegServer.ino" />

diff --git a/Source/KegServer/NFC.cpp b/Source/KegServer/NFC.cpp
@@ -2,9 +2,9 @@
 
 #define BLOCK_SIZE 16
 
-NFC::NFC() : nfc(SCK, MISO, MOSI, SS) , linkLayer(&nfc), snep(&linkLayer)
+NFC::NFC() : nfc(SS) , linkLayer(&nfc), snep(&linkLayer)
 {
-	this->state = ReadPhone;
+	this->state = ReadCard;
 }
 
 void NFC::Setup()
@@ -34,7 +34,7 @@ uint8_t* NFC::Read()
 
 	if (this->state == ReadCard)
 	{
-		this->state = ReadPhone;
+		//this->state = ReadPhone;
 
 		uint8_t success;
 		uint8_t uid[] = { 0, 0, 0, 0, 0, 0, 0 };  // Buffer to store the returned UID
@@ -47,7 +47,7 @@ uint8_t* NFC::Read()
 
 		if (success) {
 			// Display some basic information about the card
-			DBGL("Found an ISO14443A card");
+			Serial.println("Found an ISO14443A card");
 			DBG("  UID Length: ");DBG(uidLength);DBGL(" bytes");
 			DBG("  UID Value: ");
 			DBGL("");
@@ -147,14 +147,17 @@ uint8_t* NFC::Read()
 			else if (uidLength == 7)
 			{
 				// We probably have a Mifare Ultralight card ...
-				DBGL("Seems to be a Mifare Ultralight tag (7 byte UID)");
+				Serial.println("Seems to be a Mifare Ultralight tag (7 byte UID)");
 
 				// Try to read the first general-purpose user page (#4)
 				DBGL("Reading page 4");
+                                for(int i = 0; i < 5; i++)
+                                {
 				uint8_t data[32];
-				success = nfc.mifareultralight_ReadPage (4, data);
+				success = nfc.mifareultralight_ReadPage (i, data);
 				if (success)
 				{
+					Serial.println((char*)data);
 					// Data seems to have been read ... spit it out
 					this->rxNDEFMessagePtr = NULL;
 
@@ -164,10 +167,11 @@ uint8_t* NFC::Read()
 				else
 				{
 					DBGL("Ooops ... unable to read the requested page!?");
-				} 
+				}
+                                }
 			}
 		}
-	}
+	}/*
 	else if (this->state == ReadPhone)
 	{
 		this->state = ReadCard;
@@ -228,7 +232,7 @@ uint8_t* NFC::Read()
 			DBGL("Error...");
 			this->rxNDEFMessagePtr = NULL;
 		}
-	}
+	}*/
 
 	return rxNDEFMessagePtr;
-}
+}