Skip to content

Commit

Permalink
Revert a2a36a2^..HEAD
Browse files Browse the repository at this point in the history
  • Loading branch information
tigoe committed Jul 8, 2011
1 parent a2a36a2 commit 2cbcf4a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
6 changes: 6 additions & 0 deletions .gitignore
Expand Up @@ -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
2 changes: 1 addition & 1 deletion chapter10/GetPostWebServer/GetPostWebServer.ino
Expand Up @@ -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)
Expand Down
12 changes: 6 additions & 6 deletions chapter10/P4ADatalogger/P4ADatalogger.pde
Expand Up @@ -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() {
Expand Down Expand Up @@ -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:
Expand Down

0 comments on commit 2cbcf4a

Please sign in to comment.