]> rtime.felk.cvut.cz Git - eurobot/public.git/commitdiff
Update to a new version of PXMC kindly provided by P. Pisa
authorMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 7 Apr 2011 17:37:10 +0000 (19:37 +0200)
committerMichal Sojka <sojkam1@fel.cvut.cz>
Thu, 7 Apr 2011 17:50:24 +0000 (19:50 +0200)
Also add comments with license information and make the PXMC based
applications print the required (by GPL) copyright notice and no warranty
message.

build/h8eurobot/pxmc [deleted symlink]
build/h8eurobot/pxmc_bsp [new symlink]
build/h8eurobot/pxmc_core [new symlink]
src/motor-control/brushless.c
src/odometry/brushless.c
src/pxmc

diff --git a/build/h8eurobot/pxmc b/build/h8eurobot/pxmc
deleted file mode 120000 (symlink)
index 49ab3ac..0000000
+++ /dev/null
@@ -1 +0,0 @@
-../../src/pxmc
\ No newline at end of file
diff --git a/build/h8eurobot/pxmc_bsp b/build/h8eurobot/pxmc_bsp
new file mode 120000 (symlink)
index 0000000..1cd840d
--- /dev/null
@@ -0,0 +1 @@
+../../src/pxmc/libs4c/pxmc_bsp/
\ No newline at end of file
diff --git a/build/h8eurobot/pxmc_core b/build/h8eurobot/pxmc_core
new file mode 120000 (symlink)
index 0000000..d7df620
--- /dev/null
@@ -0,0 +1 @@
+../../src/pxmc/libs4c/pxmc_core/
\ No newline at end of file
index 3c61b8e877a7f4783be7d2c4f5c507fd03cd0a5f..6bb4dc1ea8acd4bcbb405ac573235c9f5422e1ac 100644 (file)
@@ -1,3 +1,20 @@
+/*
+ *  Copyright (C) 2006-2011 Department of Control Engineering, FEE,
+ *  Czech Technical University in Prague, Czech Republic,
+ *  http://dce.fel.cvut.cz/
+ *                                                                    
+ *  Copyright (C) 2006-2011 Michal Sojka <sojkam1@fel.cvut.cz>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
 /* procesor H8S/2638 ver 1.1  */
 #include <types.h>
 #include <cpu_def.h>
@@ -694,8 +711,14 @@ int main()
     DEB_LED_ON(LED_RESET);
     wdg_enable(6);              /* 420 ms */
     sti();
-    _print("CPU initialized\r\n");
-
+    _print("CPU initialized\r\n\r\n");
+    
+    printf("Eurobot motor control application.\n"
+          "Copyright (C) 2005-2011 PiKRON s.r.o., P. Pisa, M. Sojka and others.\n"
+          "This is free software; see the source code for copying conditions.\n"
+          "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or\n"
+          "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+    
     pxmc_initialize();
     printf("PXMC initialized (motor: %s)", pxmc_variant);
     printf("\n");
index c584d40794c1da5a542430d48625fb38df030f76..8b4f00c7fb9f6e632c7fc1f87a4d4630cb8bf65b 100644 (file)
@@ -1,3 +1,21 @@
+/*
+ *  Copyright (C) 2006-2011 Department of Control Engineering, FEE,
+ *  Czech Technical University in Prague, Czech Republic,
+ *  http://dce.fel.cvut.cz/
+ *                                                                    
+ *  Copyright (C) 2006-2011 Michal Sojka <sojkam1@fel.cvut.cz>
+ *
+ *  This program is free software; you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation; either version 2 of the License, or
+ *  (at your option) any later version.
+ *  
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ */
+
 /* procesor H8S/2638 ver 1.1  */
 #include <types.h>
 #include <cpu_def.h>
@@ -637,8 +655,14 @@ int main()
     DEB_LED_ON(LED_RESET);
     wdg_enable(6);              /* 420 ms */
     sti();
-    _print("CPU initialized\r\n");
+    _print("CPU initialized\r\n\r\n");
 
+    printf("Eurobot odometry application.\n"
+          "Copyright (C) 2005-2011 PiKRON s.r.o., P. Pisa, M. Sojka and others.\n"
+          "This is free software; see the source code for copying conditions.\n"
+          "There is ABSOLUTELY NO WARRANTY; not even for MERCHANTABILITY or\n"
+          "FITNESS FOR A PARTICULAR PURPOSE.\n\n");
+    
     pxmc_initialize();
     printf("PXMC odometry initialized (motor: %s)", pxmc_variant);
     printf("\n");
index dcb49770b8aaa099920fd387b96203811788b8d7..9f5ccc0b6b6e5360437710eec58f5fd9a6744bec 160000 (submodule)
--- a/src/pxmc
+++ b/src/pxmc
@@ -1 +1 @@
-Subproject commit dcb49770b8aaa099920fd387b96203811788b8d7
+Subproject commit 9f5ccc0b6b6e5360437710eec58f5fd9a6744bec