Skip to content
Browse files

Revert a2a36a2^..HEAD

  • Loading branch information...
1 parent a2a36a2 commit 2cbcf4a0ff5fd81581ba433ea2579a207ec11a8b @tigoe committed Jul 7, 2011
Showing with 13 additions and 7 deletions.
  1. +6 −0 .gitignore
  2. +1 −1 chapter10/GetPostWebServer/GetPostWebServer.ino
  3. +6 −6 chapter10/P4ADatalogger/P4ADatalogger.pde
View
6 .gitignore
@@ -42,3 +42,9 @@ chapter10/P4ATest/android/bin/P4ATest-debug.apk
chapter10/P4ATest/android/bin/P4ATest-debug-unaligned.apk
chapter10/P4ATest/android/AndroidManifest.xml
+
+chapter9/project27/SonMicroWriter/sketch.properties
+
+chapter10/FakeBTTester/FakeBTTester.pde
+
+chapter10/GetPostWebServer/GetPostWebServer.ino
View
2 chapter10/GetPostWebServer/GetPostWebServer.ino
@@ -22,7 +22,7 @@ IPAddress ip(192,168,1,20);
Server server(80);
const int fileStringLength = 16; // length of the file requested
-const int typeLength = 5; // length of GET or POST
+const int typeLength = 6; // length of GET or POST
const int sdChipSelect = 4; // SD card chipSelect
const int relayPin = 2; // pin that the relay is attached to
const long tempCheckInterval = 10000; // time between checks (in ms)
View
12 chapter10/P4ADatalogger/P4ADatalogger.pde
@@ -29,7 +29,7 @@ boolean updateNow = false;
boolean sendNow = false;
color bgColor = #2B0D15 ;
-color textColor = #FFEB97 ;
+color textColor = #FFEB97 ; //45304C
color buttonColor = #565F63 ;
color buttonHighlightColor = #ACBD9B ;
void setup() {
@@ -58,17 +58,17 @@ void draw() {
// display data onscreen:
textAlign(LEFT);
- text(connectionState, 10, screenHeight/4);
- text(getTime(), 10, screenHeight/4 + 60);
- text("latest reading (volts): " + thisReading, 10, screenHeight/4 + 90);
- text("Server updated at:\n" + lastSendTime, 10, screenHeight/4 + 120);
+ text(connectionState, 10, screenHeight/3);
+ text(getTime(), 10, screenHeight/2);
+ text("latest reading (volts): " + thisReading, 10, screenHeight/2 + 30);
+ text("Server updated at:\n" + lastSendTime, 10, screenHeight/2 + 90);
// draw the button:
readButton.display();
sendButton.display();
if (sendNow) {
- text("sending, please wait...", 10, screenHeight/4 - 60);
+ text("sending, please wait...", 10, screenHeight/4 + 20);
}
// getData() depends on being connected:

0 comments on commit 2cbcf4a

Please sign in to comment.
Something went wrong with that request. Please try again.