Merge pull request #2 from lmirel/dev

v0.8.1rc1
lmirel · Apr 23, 2019 · a6f9e38 · a6f9e38
2 parents c7aa0b6 + 124ef99
commit a6f9e38
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 4 deletions.
diff --git a/lib/extras.h b/lib/extras.h
@@ -10,6 +10,8 @@ modification history
                adapted for motion feedback controller
 */
 
+#define MFC_VERSION "0.8.1"
+
 /*
   int pkt_type;
   int pkt_dof_type;

diff --git a/mfcserver/mfc-main-svr.c b/mfcserver/mfc-main-svr.c
@@ -228,7 +228,7 @@ int env_init (int argc, char **argv)
    *
    */
   printf ("\n# ##");
-  printf ("\n#MFC server");
+  printf ("\n#MFC server %s", MFC_VERSION);
   printf ("\n#running configuration:");
   printf ("\n#   motion response %dms (-l%d) range [0..100]", _oml, _oml);
   printf ("\n#      motion speed %d (-s%d) range [1..7]", _omspeed, _omspeed);

diff --git a/mfcxtract/mfc-xtract.c b/mfcxtract/mfc-xtract.c
@@ -192,7 +192,7 @@ int main (int argc, char **argv, char **envp)
   //configuration summary
   lport = 64402;
   printf ("\n# ##");
-  printf ("\n#MFC extractor client");
+  printf ("\n#MFC extractor client %s", MFC_VERSION);
   printf ("\n#running configuration:");
   //printf ("\n#      roll range %d [1..10]", _rollspd);
   //printf ("\n#    accel. speed %d (-a%d) range [1..10]", _accspd, _accspd);

diff --git a/usbxtract/sw/Makedefs b/usbxtract/sw/Makedefs
@@ -1,3 +1,3 @@
 CFLAGS += -Wall -Wextra -Wno-unused-parameter -O3
 LDLIBS += -lusb-1.0 -ludev
-CPPFLAGS+=-I../include -Iinclude -Ilib/gasync/include
+CPPFLAGS+=-I../include -I../../lib -Iinclude -Ilib/gasync/include
diff --git a/usbxtract/sw/adapter.c b/usbxtract/sw/adapter.c
@@ -186,7 +186,7 @@ void adapter_init(void) {
 char adapter_debug (char dbg)
 {
   char ret = adapterDbg;
-  if (dbg > 0)
+  if (dbg != 0xff)
     adapterDbg = dbg;
   return ret;
 }

diff --git a/usbxtract/sw/usbxtract.c b/usbxtract/sw/usbxtract.c
@@ -16,6 +16,8 @@
 #include <getopt.h>
 #include <adapter.h>
 
+#include <extras.h>
+
 static char * port = NULL;
 static char * udev = NULL;
 int vid = 0, pid = 0;
@@ -101,6 +103,8 @@ static void terminate (int sig)
 
 int main (int argc, char * argv[]) 
 {
+  printf ("\n# ##");
+  printf ("\n#USB extractor %s\n", MFC_VERSION);
 
   (void) signal (SIGINT, terminate);
   (void) signal (SIGTERM, terminate);