From 27dcf7b10e139f0e145368ac28191c5aa3bcdc07 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Tue, 26 May 2015 21:47:05 +0300
Subject: [PATCH 1/7] restructuring project dirs and files structuring project
 files and dirs

---
 .gitignore                                   |   3 +
 Makefile                                     |  45 +++++----
 README.md                                    |   5 +-
 coap.c => libraries/microcoap/microcoap.c    |   2 +-
 coap.h => libraries/microcoap/microcoap.h    |   6 +-
 microcoap-example/connections.h              |  12 +++
 endpoints.c => microcoap-example/endpoints.c |  10 +-
 microcoap-example/endpoints.h                |  15 +++
 microcoap-example/microcoap-example.ino      | 100 +++++++++++++++++++
 9 files changed, 170 insertions(+), 28 deletions(-)
 rename coap.c => libraries/microcoap/microcoap.c (99%)
 rename coap.h => libraries/microcoap/microcoap.h (98%)
 create mode 100644 microcoap-example/connections.h
 rename endpoints.c => microcoap-example/endpoints.c (95%)
 create mode 100644 microcoap-example/endpoints.h
 create mode 100644 microcoap-example/microcoap-example.ino

diff --git a/.gitignore b/.gitignore
index 12c2f74..26064bc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,3 +33,6 @@ coap
 *.i*86
 *.x86_64
 *.hex
+
+# OS system files
+.directory
\ No newline at end of file
diff --git a/Makefile b/Makefile
index 19175d2..09ba2f4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,22 +1,33 @@
-CFLAGS += -Wall -DDEBUG
+# make       -> compile microcoap app
+# make clean -> remove the app file and all object files (.o)
+# make all   -> clean and compile
+APPNAME  = microcoap
+SRC     = main-posix.c   \
+          libraries/microcoap/microcoap.c \
+          microcoap-example/endpoints.c
+# compilation options
+CFLAGS  = -Wall -DDEBUG
+INC_DIR = libraries/microcoap \
+          microcoap-example
 # -DIPV6
-SRC = $(wildcard *.c)
-OBJ = $(SRC:%.c=%.o)
-DEPS = $(SRC:%.c=%.d)
-EXEC = coap
+# linking options
+# LDFLAGS = -shared -Wl,-soname,$(APPNAME)
 
-all: $(EXEC)
+# how to compile individual object files
+OBJS    = $(SRC:.c=.o)
+.c.o:
+	$(CC) $(CFLAGS) -I$(INC_DIR) -c $< -o $@
 
--include $(DEPS)
-
-$(EXEC): $(OBJ)
-	@$(CC) $(CFLAGS) -o $@ $^
-
-%.o: %.c %.d
-	@$(CC) -c $(CFLAGS) -o $@ $<
-
-%.d: %.c
-	@$(CC) -MM $(CFLAGS) $< > $@
+.PHONY: all clean
 
+# library compilation
+$(APPNAME): $(OBJS) $(SRC)
+	$(CC) $(OBJS) -o $(APPNAME)
+#$(LDFLAGS)
+    
+# cleaning rule
 clean:
-	@$(RM) $(EXEC) $(OBJ) $(DEPS)
+	rm -f $(OBJS) $(APPNAME) *~
+
+# additional rule
+all: clean $(APPNAME)
\ No newline at end of file
diff --git a/README.md b/README.md
index 12c5f6b..6477aa4 100644
--- a/README.md
+++ b/README.md
@@ -16,11 +16,12 @@ Endpoint handlers are defined in endpoints.c
 For linux/OSX
 
     make
-    ./coap
+    ./micocoap
 
 For Arduino
 
-    open microcoap.ino
+    copy libraries and microcoap-example directories to the Arduino IDE sketches folder
+    open: File -> sketches folder -> microcoap-example
 
 To test, use libcoap
 
diff --git a/coap.c b/libraries/microcoap/microcoap.c
similarity index 99%
rename from coap.c
rename to libraries/microcoap/microcoap.c
index 4d036f5..4788602 100644
--- a/coap.c
+++ b/libraries/microcoap/microcoap.c
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <string.h>
 #include <stddef.h>
-#include "coap.h"
+#include "microcoap.h"
 
 extern void endpoint_setup(void);
 extern const coap_endpoint_t endpoints[];
diff --git a/coap.h b/libraries/microcoap/microcoap.h
similarity index 98%
rename from coap.h
rename to libraries/microcoap/microcoap.h
index 9090285..288aea3 100644
--- a/coap.h
+++ b/libraries/microcoap/microcoap.h
@@ -1,8 +1,8 @@
-#ifndef COAP_H
-#define COAP_H 1
+#ifndef MICROCOAP_H
+#define MICROCOAP_H 1
 
 #ifdef __cplusplus
-extern "C" {
+extern "C" {    
 #endif
 
 #include <stdint.h>
diff --git a/microcoap-example/connections.h b/microcoap-example/connections.h
new file mode 100644
index 0000000..908eeea
--- /dev/null
+++ b/microcoap-example/connections.h
@@ -0,0 +1,12 @@
+#ifndef CONNECTIONS_H
+#define CONNECTIONS 1
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#define LED 13
+
+#ifdef __cplusplus
+}
+#endif
+#endif // CONNECTIONS
\ No newline at end of file
diff --git a/endpoints.c b/microcoap-example/endpoints.c
similarity index 95%
rename from endpoints.c
rename to microcoap-example/endpoints.c
index ccc961b..775810e 100644
--- a/endpoints.c
+++ b/microcoap-example/endpoints.c
@@ -1,6 +1,7 @@
 #include <stdbool.h>
 #include <string.h>
-#include "coap.h"
+#include "microcoap.h"
+#include "connections.h"
 
 static char light = '0';
 
@@ -10,10 +11,9 @@ void build_rsp(void);
 
 #ifdef ARDUINO
 #include "Arduino.h"
-static int led = 6;
 void endpoint_setup(void)
 {                
-    pinMode(led, OUTPUT);     
+    pinMode(LED, OUTPUT);     
     build_rsp();
 }
 #else
@@ -44,7 +44,7 @@ static int handle_put_light(coap_rw_buffer_t *scratch, const coap_packet_t *inpk
     {
         light = '1';
 #ifdef ARDUINO
-        digitalWrite(led, HIGH);
+        digitalWrite(LED, HIGH);
 #else
         printf("ON\n");
 #endif
@@ -54,7 +54,7 @@ static int handle_put_light(coap_rw_buffer_t *scratch, const coap_packet_t *inpk
     {
         light = '0';
 #ifdef ARDUINO
-        digitalWrite(led, LOW);
+        digitalWrite(LED, LOW);
 #else
         printf("OFF\n");
 #endif
diff --git a/microcoap-example/endpoints.h b/microcoap-example/endpoints.h
new file mode 100644
index 0000000..323e01f
--- /dev/null
+++ b/microcoap-example/endpoints.h
@@ -0,0 +1,15 @@
+#ifndef ENDPOINTS_H
+#define ENDPOINTS_H 1
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#include "microcoap.h"
+
+static int handle_get_light(coap_rw_buffer_t *scratch, const coap_packet_t *inpkt, coap_packet_t *outpkt, uint8_t id_hi, uint8_t id_lo);
+static int handle_put_light(coap_rw_buffer_t *scratch, const coap_packet_t *inpkt, coap_packet_t *outpkt, uint8_t id_hi, uint8_t id_lo);
+
+#ifdef __cplusplus
+}
+#endif
+#endif // ENDPOINTS_H
diff --git a/microcoap-example/microcoap-example.ino b/microcoap-example/microcoap-example.ino
new file mode 100644
index 0000000..6b9cf5c
--- /dev/null
+++ b/microcoap-example/microcoap-example.ino
@@ -0,0 +1,100 @@
+/*
+* WARNING - UDP_TX_PACKET_MAX_SIZE is hardcoded by Arduino to 24 bytes
+* This limits the size of possible outbound UDP packets
+*/
+
+#include <SPI.h>
+#include <Ethernet.h>
+#include <stdint.h>
+#include <EthernetUdp.h>
+#include "endpoints.h"
+#include "microcoap.h"
+
+#define PORT 5683
+static uint8_t mac[] = {0x00, 0xAA, 0xBB, 0xCC, 0xDE, 0x02};
+
+EthernetClient client;
+EthernetUDP udp;
+uint8_t packetbuf[256];
+static uint8_t scratch_raw[32];
+static coap_rw_buffer_t scratch_buf = {scratch_raw, sizeof(scratch_raw)};
+
+void setup()
+{
+    int i;
+    Serial.begin(9600);
+    while (!Serial) 
+    {
+        ; // wait for serial port to connect. Needed for Leonardo only
+    }
+
+    // start the Ethernet connection:
+    if (Ethernet.begin(mac) == 0)
+    {
+        Serial.println("Failed to configure Ethernet using DHCP");
+        while(1);
+    }
+    Serial.print("My IP address: ");
+    for (i=0;i<4;i++)
+    {
+        Serial.print(Ethernet.localIP()[i], DEC);
+        Serial.print("."); 
+    }
+    Serial.println();
+    udp.begin(PORT);
+
+    coap_setup();
+    endpoint_setup();
+}
+
+void udp_send(const uint8_t *buf, int buflen)
+{
+    udp.beginPacket(udp.remoteIP(), udp.remotePort());
+    while(buflen--)
+        udp.write(*buf++);
+    udp.endPacket();
+}
+
+void loop()
+{
+    int sz;
+    int rc;
+    coap_packet_t pkt;
+    int i;
+    
+    if ((sz = udp.parsePacket()) > 0)
+    {
+        udp.read(packetbuf, sizeof(packetbuf));
+
+        for (i=0;i<sz;i++)
+        {
+            Serial.print(packetbuf[i], HEX);
+            Serial.print(" ");
+        }
+        Serial.println("");
+
+        if (0 != (rc = coap_parse(&pkt, packetbuf, sz)))
+        {
+            Serial.print("Bad packet rc=");
+            Serial.println(rc, DEC);
+        }
+        else
+        {
+            size_t rsplen = sizeof(packetbuf);
+            coap_packet_t rsppkt;
+            coap_handle_req(&scratch_buf, &pkt, &rsppkt);
+
+            memset(packetbuf, 0, UDP_TX_PACKET_MAX_SIZE);
+            if (0 != (rc = coap_build(packetbuf, &rsplen, &rsppkt)))
+            {
+                Serial.print("coap_build failed rc=");
+                Serial.println(rc, DEC);
+            }
+            else
+            {
+                udp_send(packetbuf, rsplen);
+            }
+        }
+    }
+}
+

From 840c0e92691362da6e5ddbc815105cdd39781bde Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Tue, 26 May 2015 21:58:55 +0300
Subject: [PATCH 2/7] adding more info to readme

---
 README.md | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/README.md b/README.md
index 6477aa4..e0b71d0 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ For Arduino
     copy libraries and microcoap-example directories to the Arduino IDE sketches folder
     open: File -> sketches folder -> microcoap-example
 
+Arduino LED pin defined at `microcoap-example\connections.h` and set to 13 (default embedded led for some Arduino boards)
+
 To test, use libcoap
 
     ./coap-client -v 100 -m get coap://127.0.0.1/.well-known/core
@@ -33,6 +35,12 @@ To test, use libcoap
 Or use copper (Firefox plugin)
 
     coap://127.0.0.1
+    
+How to add new coap links
+======================
+
+Use `microcoap-example` dir and edit it or prepare similar folder.
+Edit `endpoints.h` and `endpoints.c` similar to light entry.
 
 Arduino problem
 ===============

From 5ef97e1378633bfb1178e522b71613bf07223119 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Tue, 26 May 2015 22:08:35 +0300
Subject: [PATCH 3/7] Update README.md

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index e0b71d0..d3ffbc5 100644
--- a/README.md
+++ b/README.md
@@ -20,10 +20,10 @@ For linux/OSX
 
 For Arduino
 
-    copy libraries and microcoap-example directories to the Arduino IDE sketches folder
+    copy libraries and microcoap-example directories to the Arduino IDE sketches folder (or just change the sketches folder to the microcoap dir)
     open: File -> sketches folder -> microcoap-example
 
-Arduino LED pin defined at `microcoap-example\connections.h` and set to 13 (default embedded led for some Arduino boards)
+Arduino LED pin defined at `microcoap-example\connections.h` and set to `13` (default embedded led for some Arduino boards)
 
 To test, use libcoap
 

From 378201c2128df9af80880a0e21b1692dc101a3c8 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Wed, 27 May 2015 01:38:41 +0300
Subject: [PATCH 4/7] fixing posix make problems

---
 .gitignore    |  2 +-
 Makefile      |  7 ++--
 main-posix.c  |  2 +-
 microcoap.ino | 99 ---------------------------------------------------
 4 files changed, 4 insertions(+), 106 deletions(-)
 delete mode 100644 microcoap.ino

diff --git a/.gitignore b/.gitignore
index 26064bc..07d1385 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,5 @@
 # Executable
-coap
+microcoap
 
 # Object files
 *.o
diff --git a/Makefile b/Makefile
index 09ba2f4..94d79ac 100644
--- a/Makefile
+++ b/Makefile
@@ -10,8 +10,6 @@ CFLAGS  = -Wall -DDEBUG
 INC_DIR = libraries/microcoap \
           microcoap-example
 # -DIPV6
-# linking options
-# LDFLAGS = -shared -Wl,-soname,$(APPNAME)
 
 # how to compile individual object files
 OBJS    = $(SRC:.c=.o)
@@ -20,11 +18,10 @@ OBJS    = $(SRC:.c=.o)
 
 .PHONY: all clean
 
-# library compilation
+# app compilation
 $(APPNAME): $(OBJS) $(SRC)
 	$(CC) $(OBJS) -o $(APPNAME)
-#$(LDFLAGS)
-    
+
 # cleaning rule
 clean:
 	rm -f $(OBJS) $(APPNAME) *~
diff --git a/main-posix.c b/main-posix.c
index 3711b02..12d1670 100644
--- a/main-posix.c
+++ b/main-posix.c
@@ -4,7 +4,7 @@
 #include <stdbool.h>
 #include <strings.h>
 
-#include "coap.h"
+#include "microcoap.h"
 
 #define PORT 5683
 
diff --git a/microcoap.ino b/microcoap.ino
deleted file mode 100644
index 148b6ce..0000000
--- a/microcoap.ino
+++ /dev/null
@@ -1,99 +0,0 @@
-/*
-* WARNING - UDP_TX_PACKET_MAX_SIZE is hardcoded by Arduino to 24 bytes
-* This limits the size of possible outbound UDP packets
-*/
-
-#include <SPI.h>
-#include <Ethernet.h>
-#include <stdint.h>
-#include <EthernetUdp.h>
-#include "coap.h"
-
-#define PORT 5683
-static uint8_t mac[] = {0x00, 0xAA, 0xBB, 0xCC, 0xDE, 0x02};
-
-EthernetClient client;
-EthernetUDP udp;
-uint8_t packetbuf[256];
-static uint8_t scratch_raw[32];
-static coap_rw_buffer_t scratch_buf = {scratch_raw, sizeof(scratch_raw)};
-
-void setup()
-{
-    int i;
-    Serial.begin(9600);
-    while (!Serial) 
-    {
-        ; // wait for serial port to connect. Needed for Leonardo only
-    }
-
-    // start the Ethernet connection:
-    if (Ethernet.begin(mac) == 0)
-    {
-        Serial.println("Failed to configure Ethernet using DHCP");
-        while(1);
-    }
-    Serial.print("My IP address: ");
-    for (i=0;i<4;i++)
-    {
-        Serial.print(Ethernet.localIP()[i], DEC);
-        Serial.print("."); 
-    }
-    Serial.println();
-    udp.begin(PORT);
-
-    coap_setup();
-    endpoint_setup();
-}
-
-void udp_send(const uint8_t *buf, int buflen)
-{
-    udp.beginPacket(udp.remoteIP(), udp.remotePort());
-    while(buflen--)
-        udp.write(*buf++);
-    udp.endPacket();
-}
-
-void loop()
-{
-    int sz;
-    int rc;
-    coap_packet_t pkt;
-    int i;
-    
-    if ((sz = udp.parsePacket()) > 0)
-    {
-        udp.read(packetbuf, sizeof(packetbuf));
-
-        for (i=0;i<sz;i++)
-        {
-            Serial.print(packetbuf[i], HEX);
-            Serial.print(" ");
-        }
-        Serial.println("");
-
-        if (0 != (rc = coap_parse(&pkt, packetbuf, sz)))
-        {
-            Serial.print("Bad packet rc=");
-            Serial.println(rc, DEC);
-        }
-        else
-        {
-            size_t rsplen = sizeof(packetbuf);
-            coap_packet_t rsppkt;
-            coap_handle_req(&scratch_buf, &pkt, &rsppkt);
-
-            memset(packetbuf, 0, UDP_TX_PACKET_MAX_SIZE);
-            if (0 != (rc = coap_build(packetbuf, &rsplen, &rsppkt)))
-            {
-                Serial.print("coap_build failed rc=");
-                Serial.println(rc, DEC);
-            }
-            else
-            {
-                udp_send(packetbuf, rsplen);
-            }
-        }
-    }
-}
-

From 03a1e4f2d49a7a36d27020a7a1413e6831b1c016 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Wed, 27 May 2015 01:40:41 +0300
Subject: [PATCH 5/7] readme minor typo fix

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d3ffbc5..38e181b 100644
--- a/README.md
+++ b/README.md
@@ -16,7 +16,7 @@ Endpoint handlers are defined in endpoints.c
 For linux/OSX
 
     make
-    ./micocoap
+    ./microcoap
 
 For Arduino
 

From d98424d0f1aae726e4cd7314caea8695f696f6a7 Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Fri, 15 Apr 2016 17:27:22 +0300
Subject: [PATCH 6/7] working on simplifying arduino library including
 (makefile is not working yet)

---
 libraries/microcoap/microcoap.c => microcoap.c | 1 +
 libraries/microcoap/microcoap.h => microcoap.h | 1 +
 Makefile => src-posix/Makefile                 | 0
 main-posix.c => src-posix/main-posix.c         | 0
 4 files changed, 2 insertions(+)
 rename libraries/microcoap/microcoap.c => microcoap.c (99%)
 rename libraries/microcoap/microcoap.h => microcoap.h (99%)
 rename Makefile => src-posix/Makefile (100%)
 rename main-posix.c => src-posix/main-posix.c (100%)

diff --git a/libraries/microcoap/microcoap.c b/microcoap.c
similarity index 99%
rename from libraries/microcoap/microcoap.c
rename to microcoap.c
index 4788602..cf7e3a6 100644
--- a/libraries/microcoap/microcoap.c
+++ b/microcoap.c
@@ -7,6 +7,7 @@
 #include "microcoap.h"
 
 extern void endpoint_setup(void);
+extern void increment_tick(void);
 extern const coap_endpoint_t endpoints[];
 
 #ifdef DEBUG
diff --git a/libraries/microcoap/microcoap.h b/microcoap.h
similarity index 99%
rename from libraries/microcoap/microcoap.h
rename to microcoap.h
index 288aea3..9941946 100644
--- a/libraries/microcoap/microcoap.h
+++ b/microcoap.h
@@ -165,6 +165,7 @@ int coap_handle_req(coap_rw_buffer_t *scratch, const coap_packet_t *inpkt, coap_
 void coap_option_nibble(uint32_t value, uint8_t *nibble);
 void coap_setup(void);
 void endpoint_setup(void);
+void increment_tick(void); // FIXME: create cpp wrapper
 
 #ifdef __cplusplus
 }
diff --git a/Makefile b/src-posix/Makefile
similarity index 100%
rename from Makefile
rename to src-posix/Makefile
diff --git a/main-posix.c b/src-posix/main-posix.c
similarity index 100%
rename from main-posix.c
rename to src-posix/main-posix.c

From afd4ff05c6a2541360b90c6be4d23527b876790b Mon Sep 17 00:00:00 2001
From: Alexey Andreyev <yetanotherandreyev@gmail.com>
Date: Tue, 26 Apr 2016 11:29:24 +0300
Subject: [PATCH 7/7] working on microcoap

---
 src-posix/Makefile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src-posix/Makefile b/src-posix/Makefile
index 94d79ac..455376b 100644
--- a/src-posix/Makefile
+++ b/src-posix/Makefile
@@ -3,12 +3,12 @@
 # make all   -> clean and compile
 APPNAME  = microcoap
 SRC     = main-posix.c   \
-          libraries/microcoap/microcoap.c \
-          microcoap-example/endpoints.c
+          ../microcoap.c \
+          ../microcoap-example/endpoints.c
 # compilation options
 CFLAGS  = -Wall -DDEBUG
-INC_DIR = libraries/microcoap \
-          microcoap-example
+INC_DIR = ../ \
+          ../microcoap-example
 # -DIPV6
 
 # how to compile individual object files
@@ -27,4 +27,4 @@ clean:
 	rm -f $(OBJS) $(APPNAME) *~
 
 # additional rule
-all: clean $(APPNAME)
\ No newline at end of file
+all: clean $(APPNAME)