From 14731595189d156f4da83e003f1c3ac700bb0628 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Thu, 7 Apr 2011 19:37:10 +0200 Subject: [PATCH] Update to a new version of PXMC kindly provided by P. Pisa 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 | 1 - build/h8eurobot/pxmc_bsp | 1 + build/h8eurobot/pxmc_core | 1 + src/motor-control/brushless.c | 27 +++++++++++++++++++++++++-- src/odometry/brushless.c | 26 +++++++++++++++++++++++++- src/pxmc | 2 +- 6 files changed, 53 insertions(+), 5 deletions(-) delete mode 120000 build/h8eurobot/pxmc create mode 120000 build/h8eurobot/pxmc_bsp create mode 120000 build/h8eurobot/pxmc_core diff --git a/build/h8eurobot/pxmc b/build/h8eurobot/pxmc deleted file mode 120000 index 49ab3acf..00000000 --- a/build/h8eurobot/pxmc +++ /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 index 00000000..1cd840dc --- /dev/null +++ b/build/h8eurobot/pxmc_bsp @@ -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 index 00000000..d7df6200 --- /dev/null +++ b/build/h8eurobot/pxmc_core @@ -0,0 +1 @@ +../../src/pxmc/libs4c/pxmc_core/ \ No newline at end of file diff --git a/src/motor-control/brushless.c b/src/motor-control/brushless.c index 3c61b8e8..6bb4dc1e 100644 --- a/src/motor-control/brushless.c +++ b/src/motor-control/brushless.c @@ -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 + * + * 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 #include @@ -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"); diff --git a/src/odometry/brushless.c b/src/odometry/brushless.c index c584d407..8b4f00c7 100644 --- a/src/odometry/brushless.c +++ b/src/odometry/brushless.c @@ -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 + * + * 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 #include @@ -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"); diff --git a/src/pxmc b/src/pxmc index dcb49770..9f5ccc0b 160000 --- a/src/pxmc +++ b/src/pxmc @@ -1 +1 @@ -Subproject commit dcb49770b8aaa099920fd387b96203811788b8d7 +Subproject commit 9f5ccc0b6b6e5360437710eec58f5fd9a6744bec -- 2.39.2