diff options
-rw-r--r-- | src/common/sourcelist.txt | 1 | ||||
-rw-r--r-- | src/glutt-o-logique/gps.c | 28 | ||||
-rw-r--r-- | src/simulator/src/GPS/gps.c | 2 |
3 files changed, 2 insertions, 29 deletions
diff --git a/src/common/sourcelist.txt b/src/common/sourcelist.txt index a8602d6..717b215 100644 --- a/src/common/sourcelist.txt +++ b/src/common/sourcelist.txt @@ -1 +1,2 @@ src/GPIO/usart.c +src/GPS/gps.c diff --git a/src/glutt-o-logique/gps.c b/src/glutt-o-logique/gps.c deleted file mode 100644 index 03437c6..0000000 --- a/src/glutt-o-logique/gps.c +++ /dev/null @@ -1,28 +0,0 @@ -/* - * The MIT License (MIT) - * - * Copyright (c) 2016 Matthias P. Braendli, Maximilien Cuony - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * The above copyright notice and this permission notice shall be included in all - * copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR - * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, - * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE - * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER - * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, - * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE - * SOFTWARE. -*/ - -#include "stm32f4xx_conf.h" -#include "stm32f4xx.h" - -#include "../common/src/GPS/gps.c" diff --git a/src/simulator/src/GPS/gps.c b/src/simulator/src/GPS/gps.c index 0ca20f3..728d165 100644 --- a/src/simulator/src/GPS/gps.c +++ b/src/simulator/src/GPS/gps.c @@ -1,4 +1,4 @@ -#include "../../../common/src/GPS/gps.c" +#include "GPIO/usart.h" void gps_usart_send(char * string) { |