From: Mart Lubbers <mart@martlubbers.net>
Date: Wed, 5 Apr 2017 09:13:28 +0000 (+0200)
Subject: Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
X-Git-Url: https://git.martlubbers.net/?a=commitdiff_plain;h=dcd48012f6e95d649b8fe3d0cd050ac1bdeafaf6;hp=f39868397acdc4cdcb71b58926dee62327933336;p=mTask.git

Merge branch 'master' of gitlab.science.ru.nl:mlubbers/mTask
---

diff --git a/client/linux/interface.c b/client/linux/interface.c
index 36d2a86..520873f 100644
--- a/client/linux/interface.c
+++ b/client/linux/interface.c
@@ -33,7 +33,7 @@ void usage(FILE *o, char *arg0){
 		"-p PORT  Custom port number, default: 8123\n" , arg0);
 }
 
-long getmillis(void) {
+unsigned long getmillis(void) {
 	if (gettimeofday(&tv1, NULL) == -1)
 		pdie("gettimeofday");
 	return tv1.tv_sec*1000 + tv1.tv_usec/1000;
@@ -92,7 +92,7 @@ uint8_t read_apin(uint8_t i)
 	(void) i;
 }
 
-void msdelay(long ms)
+void msdelay(unsigned long ms)
 {
 	usleep(ms*1000);
 }
diff --git a/client/stm32/interface.c b/client/stm32/interface.c
index 374a583..2d5c679 100644
--- a/client/stm32/interface.c
+++ b/client/stm32/interface.c
@@ -77,11 +77,11 @@ void led_off(uint8_t i)
 	}
 }
 
-long getmillis(void){
+unsigned long getmillis(void){
 	return ST2MS(chVTGetSystemTime());
 }
 
-void msdelay(long ms)
+void msdelay(unsigned long ms)
 {
 	chThdSleepMilliseconds(ms);
 }