arduino/esp8266
1
0
Fork 0
mirror of https://github.com/esp8266/Arduino.git synced 2025-06-19 09:42:11 +03:00
Code Activity

Merged 1.0.4 pre-release into 1.5

Browse Source
This commit is contained in:
Cristian Maglie
2012-12-17 16:53:45 +01:00
parent 69bc5369f3 105a5b1c05
commit 38c05d2742
7 changed files with 405 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
hardware/arduino/avr/libraries/Esplora/examples/EsploraTable/EsploraTable.ino
View File

@ -1,17 +1,16 @@
/*
Esplora Table
Acts like a keyboard that prints some of its sensors'
Acts like a keyboard that prints sensor
data in a table-like text, row by row.
It is a sort of "data-logger".
At startup, it does nothing. It just waits for you to open a
spreadsheet (e.g. Google Drive spreadsheet) so it can put its
data. Then, by pressing Switch 1, it starts printing the table
At startup, it does nothing. It waits for you to open a
spreadsheet (e.g. Google Drive spreadsheet) so it can write
data. By pressing Switch 1, it starts printing the table
headers and the first row of data. It waits a bit, then it
will print another row, and so on.
The amount of time between each row is given by the slider.
The amount of time between each row is determined by the slider.
If put to full left, the sketch will wait 10 seconds; at
full right position, it will wait 5 minutes. An intermediate
position will make the sketch wait for some time in-between.
@ -175,17 +174,12 @@ void logAndPrint() {
}
/**
* Similar to delay(), but allows to do something else
* in the meanwhile. In particular, it calls waitLoop().
* Similar to delay(), but allows the program to do something else
* in the meanwhile. In particular, it calls checkSwitchPress().
* Note 1: it may wait longer than the specified amount, not less;
* Note 2: beware of data synchronization issues, e.g. if the
* whileWaiting() function alters some variables used by the
* activeDelay() function alters some variables used by the
* caller of this function.
*
* I discovered by chance that there's an ongoing discussion about
* adding yield() in the Arduino API:
* http://comments.gmane.org/gmane.comp.hardware.arduino.devel/1381
* The purpose is the same, but for now I'm using this implementation.
*/
void activeDelay(unsigned long amount) {
unsigned long at = millis() + amount;

1
hardware/arduino/avr/libraries/Ethernet/Dhcp.cpp
View File

@ -43,6 +43,7 @@ int DhcpClass::request_DHCP_lease(){
_dhcpTransactionId = random(1UL, 2000UL);
_dhcpInitialTransactionId = _dhcpTransactionId;
_dhcpUdpSocket.stop();
if (_dhcpUdpSocket.begin(DHCP_CLIENT_PORT) == 0)
{
// Couldn't get a socket

3
hardware/arduino/avr/libraries/Ethernet/Ethernet.cpp
View File

@ -10,7 +10,8 @@ uint16_t EthernetClass::_server_port[MAX_SOCK_NUM] = {
int EthernetClass::begin(uint8_t *mac_address)
{
_dhcp = new DhcpClass();
static DhcpClass s_dhcp;
_dhcp = &s_dhcp;
// Initialise the basic info