now this shit works

Dependencies:   BufferedSerial

Dependents:   IoTWeatherStation

Fork of ESP8266NodeMCUInterface by ESP8266

Committer:
michaeljkoster
Date:
Tue Dec 02 16:02:21 2014 +0000
Revision:
22:c4360e61486a
Parent:
21:690526f05fe6
Child:
23:de9221771e96
Add state.cmdMode and some cleanup

Who changed what in which revision?

UserRevisionLine numberNew contents of line
samux 1:fb4494783863 1 /* Copyright (C) 2012 mbed.org, MIT License
samux 1:fb4494783863 2 *
samux 1:fb4494783863 3 * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
samux 1:fb4494783863 4 * and associated documentation files (the "Software"), to deal in the Software without restriction,
samux 1:fb4494783863 5 * including without limitation the rights to use, copy, modify, merge, publish, distribute,
samux 1:fb4494783863 6 * sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is
samux 1:fb4494783863 7 * furnished to do so, subject to the following conditions:
samux 1:fb4494783863 8 *
samux 1:fb4494783863 9 * The above copyright notice and this permission notice shall be included in all copies or
samux 1:fb4494783863 10 * substantial portions of the Software.
samux 1:fb4494783863 11 *
samux 1:fb4494783863 12 * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING
samux 1:fb4494783863 13 * BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
samux 1:fb4494783863 14 * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM,
samux 1:fb4494783863 15 * DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
samux 1:fb4494783863 16 * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
samux 1:fb4494783863 17 */
samux 1:fb4494783863 18
samux 1:fb4494783863 19 #include "UDPSocket.h"
samux 1:fb4494783863 20
samux 1:fb4494783863 21 #include <string>
samux 1:fb4494783863 22 #include <algorithm>
samux 1:fb4494783863 23
michaeljkoster 12:c5f0eac67a8a 24 extern Serial pc;
michaeljkoster 12:c5f0eac67a8a 25
samux 1:fb4494783863 26 UDPSocket::UDPSocket()
samux 1:fb4494783863 27 {
samux 1:fb4494783863 28 endpoint_configured = false;
samux 1:fb4494783863 29 endpoint_read = false;
michaeljkoster 19:fb8d5bff2076 30 Endpoint currentEndpoint;
samux 1:fb4494783863 31 }
samux 1:fb4494783863 32
samux 1:fb4494783863 33 int UDPSocket::init(void)
samux 1:fb4494783863 34 {
samux 1:fb4494783863 35 return 0;
samux 1:fb4494783863 36 }
samux 1:fb4494783863 37
samux 1:fb4494783863 38 // Server initialization
samux 1:fb4494783863 39 int UDPSocket::bind(int port)
samux 1:fb4494783863 40 {
samux 1:fb4494783863 41 return 0;
samux 1:fb4494783863 42 }
samux 1:fb4494783863 43
samux 1:fb4494783863 44 // -1 if unsuccessful, else number of bytes written
samux 1:fb4494783863 45 int UDPSocket::sendTo(Endpoint &remote, char *packet, int length)
samux 1:fb4494783863 46 {
samux 1:fb4494783863 47 Timer tmr;
samux 1:fb4494783863 48 int idx = 0;
samux 1:fb4494783863 49
samux 1:fb4494783863 50 confEndpoint(remote);
samux 1:fb4494783863 51
samux 1:fb4494783863 52 tmr.start();
samux 1:fb4494783863 53
samux 1:fb4494783863 54 while ((tmr.read_ms() < _timeout) || _blocking) {
samux 1:fb4494783863 55
samux 1:fb4494783863 56 idx += wifi->send(packet, length);
samux 1:fb4494783863 57
samux 1:fb4494783863 58 if (idx == length)
samux 1:fb4494783863 59 return idx;
samux 1:fb4494783863 60 }
samux 1:fb4494783863 61 return (idx == 0) ? -1 : idx;
samux 1:fb4494783863 62 }
samux 1:fb4494783863 63
samux 1:fb4494783863 64 // -1 if unsuccessful, else number of bytes received
samux 1:fb4494783863 65 int UDPSocket::receiveFrom(Endpoint &remote, char *buffer, int length)
samux 1:fb4494783863 66 {
samux 1:fb4494783863 67 Timer tmr;
samux 1:fb4494783863 68 int idx = 0;
samux 1:fb4494783863 69 int nb_available = 0;
samux 1:fb4494783863 70 int time = -1;
michaeljkoster 22:c4360e61486a 71 tmr.start();
michaeljkoster 22:c4360e61486a 72
samux 1:fb4494783863 73 if (_blocking) {
samux 1:fb4494783863 74 while (1) {
samux 1:fb4494783863 75 nb_available = wifi->readable();
samux 1:fb4494783863 76 if (nb_available != 0) {
samux 1:fb4494783863 77 break;
samux 1:fb4494783863 78 }
samux 1:fb4494783863 79 }
michaeljkoster 21:690526f05fe6 80 }
michaeljkoster 21:690526f05fe6 81 else {
michaeljkoster 22:c4360e61486a 82 tmr.reset();
michaeljkoster 21:690526f05fe6 83
michaeljkoster 21:690526f05fe6 84 while (time < _timeout){
michaeljkoster 21:690526f05fe6 85 nb_available = wifi->readable();
michaeljkoster 21:690526f05fe6 86 if (nb_available < 0) return nb_available;
michaeljkoster 21:690526f05fe6 87 if (nb_available > 0) break ;
michaeljkoster 21:690526f05fe6 88 time = tmr.read_ms();
michaeljkoster 21:690526f05fe6 89 }
michaeljkoster 21:690526f05fe6 90
michaeljkoster 21:690526f05fe6 91 if (nb_available == 0) return nb_available;
michaeljkoster 21:690526f05fe6 92 }
michaeljkoster 21:690526f05fe6 93
michaeljkoster 22:c4360e61486a 94 tmr.reset();
samux 1:fb4494783863 95 while (time < _timeout) {
samux 1:fb4494783863 96
samux 1:fb4494783863 97 nb_available = wifi->readable();
samux 1:fb4494783863 98 for (int i = 0; i < min(nb_available, length); i++) {
samux 1:fb4494783863 99 buffer[idx] = wifi->getc();
samux 1:fb4494783863 100 idx++;
samux 1:fb4494783863 101 }
samux 1:fb4494783863 102
samux 1:fb4494783863 103 if (idx == length) {
samux 1:fb4494783863 104 break;
samux 1:fb4494783863 105 }
samux 1:fb4494783863 106
samux 1:fb4494783863 107 time = tmr.read_ms();
samux 1:fb4494783863 108 }
samux 1:fb4494783863 109 readEndpoint(remote);
samux 1:fb4494783863 110 return (idx == 0) ? -1 : idx;
samux 1:fb4494783863 111 }
samux 1:fb4494783863 112
samux 1:fb4494783863 113 bool UDPSocket::confEndpoint(Endpoint & ep)
samux 1:fb4494783863 114 {
michaeljkoster 19:fb8d5bff2076 115 currentEndpoint = ep;
samux 1:fb4494783863 116 return true;
samux 1:fb4494783863 117 }
samux 1:fb4494783863 118
samux 1:fb4494783863 119 bool UDPSocket::readEndpoint(Endpoint & ep)
samux 1:fb4494783863 120 {
michaeljkoster 19:fb8d5bff2076 121 ep = currentEndpoint;
michaeljkoster 16:3f0efaa57a12 122 return true;
samux 1:fb4494783863 123 }