deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Add query parameter to generic resouce macros

Browse source 
Modify all callback functions to use new signature.
ota-update now uses this to pass the partition to some get/put methods.
This commit is contained in:
Ralf Schlatterbeck 2017-08-20 15:01:30 +02:00
parent 954da749eb
commit e3784fa9c7
20 changed files with 357 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

11
examples/osd/openvoting-box/sketch.h
View file

@ -5,8 +5,15 @@
extern "C" {
#endif
size_t color_to_string (const char *name, const char *uri, char *buf, size_t bsize);
int color_from_string (const char *name, const char *uri, const char *s);
size_t color_to_string
( const char *name
, const char *uri
, const char *query
, char *buf
, size_t bsize
);
int color_from_string
(const char *name, const char *uri, const char *query, const char *s);
int color_rgb_from_string (const char *r, const char *g, const char *b);
#ifdef __cplusplus

22
examples/osd/openvoting-box/sketch.pde
View file

@ -70,13 +70,20 @@ name_to_offset (const char * name)
}
extern "C" size_t
color_to_string (const char *name, const char *uri, char *buf, size_t bsize)
color_to_string
( const char *name
, const char *uri
, const char *query
, char *buf
, size_t bsize
)
{
return snprintf (buf, bsize, "%d", color_rgb [name_to_offset (name)]);
}
extern "C" int
color_from_string (const char *name, const char *uri, const char *s)
color_from_string
(const char *name, const char *uri, const char *query, const char *s)
{
color_rgb [name_to_offset (name)] = atoi (s);
leds.setColorRGB(0,color_rgb [0], color_rgb [1], color_rgb [2]);
@ -95,7 +102,13 @@ color_rgb_from_string (const char *r, const char *g, const char *b)
}
static size_t
ip_to_string (const char *name, const char *uri, char *buf, size_t bsize)
ip_to_string
( const char *name
, const char *uri
, const char *query
, char *buf
, size_t bsize
)
{
#define IP(x) UIP_NTOHS(server_ipaddr.u16[x])
return snprintf
@ -104,7 +117,8 @@ ip_to_string (const char *name, const char *uri, char *buf, size_t bsize)
);
}
int ip_from_string (const char *name, const char *uri, const char *s)
int ip_from_string
(const char *name, const char *uri, const char *query, const char *s)
{
/* Returns 1 if successful, only copy valid address */
if (uiplib_ip6addrconv (s, &tmp_addr)) {