aboutsummaryrefslogtreecommitdiff
path: root/libraries/Ethernet
diff options
context:
space:
mode:
Diffstat (limited to 'libraries/Ethernet')
-rwxr-xr-xlibraries/Ethernet/Print.cpp156
-rwxr-xr-xlibraries/Ethernet/Print.h56
-rw-r--r--libraries/Ethernet/examples/WebServer/WebServer.pde2
-rwxr-xr-xlibraries/Ethernet/utility/spi.h2
4 files changed, 3 insertions, 213 deletions
diff --git a/libraries/Ethernet/Print.cpp b/libraries/Ethernet/Print.cpp
deleted file mode 100755
index 7159566..0000000
--- a/libraries/Ethernet/Print.cpp
+++ /dev/null
@@ -1,156 +0,0 @@
-/*
- HarwareSerial.cpp - Hardware serial library for Wiring
- Copyright (c) 2006 Nicholas Zambetti. All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-
- Modified 23 November 2006 by David A. Mellis
- */
-
-#include <stdio.h>
-#include <string.h>
-#include <inttypes.h>
-#include "wiring.h"
-
-#include "Print.h"
-
-// Public Methods //////////////////////////////////////////////////////////////
-
-void Print::print(uint8_t b)
-{
- write(b);
-}
-
-void Print::print(char c)
-{
- print((byte) c);
-}
-
-void Print::print(const char c[])
-{
- while (*c)
- print(*c++);
-}
-
-void Print::print(int n)
-{
- print((long) n);
-}
-
-void Print::print(unsigned int n)
-{
- print((unsigned long) n);
-}
-
-void Print::print(long n)
-{
- if (n < 0) {
- print('-');
- n = -n;
- }
- printNumber(n, 10);
-}
-
-void Print::print(unsigned long n)
-{
- printNumber(n, 10);
-}
-
-void Print::print(long n, int base)
-{
- if (base == 0)
- print((char) n);
- else if (base == 10)
- print(n);
- else
- printNumber(n, base);
-}
-
-void Print::println(void)
-{
- print('\r');
- print('\n');
-}
-
-void Print::println(char c)
-{
- print(c);
- println();
-}
-
-void Print::println(const char c[])
-{
- print(c);
- println();
-}
-
-void Print::println(uint8_t b)
-{
- print(b);
- println();
-}
-
-void Print::println(int n)
-{
- print(n);
- println();
-}
-
-void Print::println(unsigned int n)
-{
- print(n);
- println();
-}
-
-void Print::println(long n)
-{
- print(n);
- println();
-}
-
-void Print::println(unsigned long n)
-{
- print(n);
- println();
-}
-
-void Print::println(long n, int base)
-{
- print(n, base);
- println();
-}
-
-// Private Methods /////////////////////////////////////////////////////////////
-
-void Print::printNumber(unsigned long n, uint8_t base)
-{
- unsigned char buf[8 * sizeof(long)]; // Assumes 8-bit chars.
- unsigned long i = 0;
-
- if (n == 0) {
- print('0');
- return;
- }
-
- while (n > 0) {
- buf[i++] = n % base;
- n /= base;
- }
-
- for (; i > 0; i--)
- print((char) (buf[i - 1] < 10 ?
- '0' + buf[i - 1] :
- 'A' + buf[i - 1] - 10));
-}
diff --git a/libraries/Ethernet/Print.h b/libraries/Ethernet/Print.h
deleted file mode 100755
index f3ec809..0000000
--- a/libraries/Ethernet/Print.h
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- HardwareSerial.h - Hardware serial library for Wiring
- Copyright (c) 2006 Nicholas Zambetti. All right reserved.
-
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-*/
-
-#ifndef Print_h
-#define Print_h
-
-#include <inttypes.h>
-
-#define DEC 10
-#define HEX 16
-#define OCT 8
-#define BIN 2
-#define BYTE 0
-
-class Print
-{
- private:
- void printNumber(unsigned long, uint8_t);
- public:
- virtual void write(uint8_t);
- void print(char);
- void print(const char[]);
- void print(uint8_t);
- void print(int);
- void print(unsigned int);
- void print(long);
- void print(unsigned long);
- void print(long, int);
- void println(void);
- void println(char);
- void println(const char[]);
- void println(uint8_t);
- void println(int);
- void println(unsigned int);
- void println(long);
- void println(unsigned long);
- void println(long, int);
-};
-
-#endif
diff --git a/libraries/Ethernet/examples/WebServer/WebServer.pde b/libraries/Ethernet/examples/WebServer/WebServer.pde
index c14860f..b337a8e 100644
--- a/libraries/Ethernet/examples/WebServer/WebServer.pde
+++ b/libraries/Ethernet/examples/WebServer/WebServer.pde
@@ -54,6 +54,8 @@ void loop()
}
}
}
+ // give the web browser time to receive the data
+ delay(1);
client.stop();
}
}
diff --git a/libraries/Ethernet/utility/spi.h b/libraries/Ethernet/utility/spi.h
index 0bb30ba..000705d 100755
--- a/libraries/Ethernet/utility/spi.h
+++ b/libraries/Ethernet/utility/spi.h
@@ -37,7 +37,7 @@
// PB4(MISO), PB3(MOSI), PB5(SCK), PB2(/SS) // CS=1, waiting for SPI start // SPI mode 0, 4MHz
#define SPI0_Init() DDRB |= SPI0_SS_BIT|SPI0_SCLK_BIT|SPI0_MOSI_BIT;\
- PORTB = SPI0_SS_BIT;\
+ PORTB |= SPI0_SS_BIT; PORTB &= ~(SPI0_SCLK_BIT|SPI0_MOSI_BIT);\
SPCR = 0x50
//-----------------------------------------------------------------------------