Revision 19:6414961fb98d, committed 2015-10-21

Comitter:

dwini

Date:

Wed Oct 21 14:21:15 2015 +0000

Parent:

15:3a83785963fa

Child:

20:519a5339bfa2

Commit message:

Add error.h and change Methods to CoapPdu::Methods

Changed in this revision

--- a/client.cpp	Wed Oct 21 13:32:06 2015 +0000
+++ b/client.cpp	Wed Oct 21 14:21:15 2015 +0000
@@ -13,16 +13,19 @@
 }
 
 // Respons handler can be left null if no content respons is expected
-void Client::sendRequest(char* uri, void (*response_handler)(Request*, Response*), Method method) {
+void Client::sendRequest(char* uri, void (*response_handler)(Request*, Response*), CoapPDU::Code method) {
 
     CoapPDU *req_pdu = new CoapPDU();
     
     switch (method) {
-        case GET:
+        case CoapPDU::COAP_GET:
             req_pdu->setType(CoapPDU::COAP_CONFIRMABLE);
-            req_pdu->setCode(CoapPDU::COAP_GET);
+            break;
+        case CoapPDU::COAP_POST:
+            req_pdu->setType(CoapPDU::COAP_CONFIRMABLE);
             break;
     }
+    req_pdu->setCode(method);
     req_pdu->setMessageID(new_message_id++);
     new_token_id++;
     req_pdu->setToken((uint8_t *)&new_token_id, sizeof(new_token_id));
@@ -37,7 +40,7 @@
         printf("UDP socket problem - Could not send PDU\r\n");
         return;
     } else {
-        if (method == GET) {  // Or confirmable ...
+        if (method == CoapPDU::COAP_GET) {  // Or confirmable ...
             // We need to save request and wait for respons of server
             ResourceRequest req = { new_token_id, uri, response_handler, method, req_pdu };
             requests.push_back(req);

--- a/client.h	Wed Oct 21 13:32:06 2015 +0000
+++ b/client.h	Wed Oct 21 14:21:15 2015 +0000
@@ -44,7 +44,7 @@
         Client(const char * server, const int port, std::string identifier="Client");
         
     public:
-        void sendRequest(char* uri, void (*response_handler)(Request*, Response*), Method method);
+        void sendRequest(char* uri, void (*response_handler)(Request*, Response*), CoapPDU::Code method);
         void checkForResponse(void);
     
 };
\ No newline at end of file

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/error.h	Wed Oct 21 14:21:15 2015 +0000
@@ -0,0 +1,66 @@
+/* mbed Microcontroller Library
+ * Copyright (c) 2006-2013 ARM Limited
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+#ifndef MBED_ERROR_H
+#define MBED_ERROR_H
+
+/** To generate a fatal compile-time error, you can use the pre-processor #error directive.
+ *
+ * @code
+ * #error "That shouldn't have happened!"
+ * @endcode
+ *
+ * If the compiler evaluates this line, it will report the error and stop the compile.
+ *
+ * For example, you could use this to check some user-defined compile-time variables:
+ *
+ * @code
+ * #define NUM_PORTS 7
+ * #if (NUM_PORTS > 4)
+ *     #error "NUM_PORTS must be less than 4"
+ * #endif
+ * @endcode
+ *
+ * Reporting Run-Time Errors:
+ * To generate a fatal run-time error, you can use the mbed error() function.
+ *
+ * @code
+ * error("That shouldn't have happened!");
+ * @endcode
+ *
+ * If the mbed running the program executes this function, it will print the
+ * message via the USB serial port, and then die with the blue lights of death!
+ *
+ * The message can use printf-style formatting, so you can report variables in the
+ * message too. For example, you could use this to check a run-time condition:
+ *
+ * @code
+ * if(x >= 5) {
+ *     error("expected x to be less than 5, but got %d", x);
+ * }
+ * #endcode
+ */
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+void error(const char* format, ...);
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif
\ No newline at end of file