From deaff8323e533a4938d25888d45451c8e02ff3d4 Mon Sep 17 00:00:00 2001
From: Pavel Kirienko <pavel.kirienko@gmail.com>
Date: Wed, 10 Sep 2014 14:13:41 +0400
Subject: [PATCH] STM32/LPC11C24 examples: branding

---
 .../lpc11c24/test_olimex_lpc_p11c24/blackmagic.gdbinit        | 4 ----
 libuavcan_drivers/stm32/test_stm32f107/Makefile               | 2 +-
 libuavcan_drivers/stm32/test_stm32f107/README.md              | 2 +-
 libuavcan_drivers/stm32/test_stm32f107/src/main.cpp           | 2 +-
 libuavcan_drivers/stm32/test_stm32f107/src/sys/chconf.h       | 2 +-
 libuavcan_drivers/stm32/test_stm32f107/src/sys/halconf.h      | 2 +-
 6 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/blackmagic.gdbinit b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/blackmagic.gdbinit
index f2502d76c5..cea99657df 100644
--- a/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/blackmagic.gdbinit
+++ b/libuavcan_drivers/lpc11c24/test_olimex_lpc_p11c24/blackmagic.gdbinit
@@ -1,8 +1,4 @@
 #
-# Copyright (c) 2014 Courierdrone, courierdrone.com
-# Distributed under the MIT License, available in the file LICENSE.
-# Author: Pavel Kirienko <pavel.kirienko@courierdrone.com>
-#
 # Template for .gdbinit
 # Copy the file to .gdbinit in your project root, and adjust the path below to match your system
 #
diff --git a/libuavcan_drivers/stm32/test_stm32f107/Makefile b/libuavcan_drivers/stm32/test_stm32f107/Makefile
index 08cd232a87..0a4c521deb 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/Makefile
+++ b/libuavcan_drivers/stm32/test_stm32f107/Makefile
@@ -44,4 +44,4 @@ RELEASE_OPT = -Os -fomit-frame-pointer
 DEBUG_OPT = -Os -g3
 #USE_OPT = -flto
 
-include crdr_chibios/rules_stm32f105_107.mk
+include zubax_chibios/rules_stm32f105_107.mk
diff --git a/libuavcan_drivers/stm32/test_stm32f107/README.md b/libuavcan_drivers/stm32/test_stm32f107/README.md
index aec55e02dd..be6e0a530d 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/README.md
+++ b/libuavcan_drivers/stm32/test_stm32f107/README.md
@@ -1,4 +1,4 @@
 UAVCAN test project for STM32
 -----------------------------
 
-Please checkout/symlink https://github.com/Courierdrone/crdr_chibios into subdirectory `crdr_chibios`; then follow instructions in `crdr_chibios/README.md`.
+Please checkout/symlink https://github.com/Zubax/zubax_chibios into subdirectory `zubax_chibios`; then follow instructions in `zubax_chibios/README.md`.
diff --git a/libuavcan_drivers/stm32/test_stm32f107/src/main.cpp b/libuavcan_drivers/stm32/test_stm32f107/src/main.cpp
index 1f50b82fcb..b82fbbb6a1 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/src/main.cpp
+++ b/libuavcan_drivers/stm32/test_stm32f107/src/main.cpp
@@ -3,7 +3,7 @@
  */
 
 #include <unistd.h>
-#include <crdr_chibios/sys/sys.h>
+#include <zubax_chibios/sys/sys.h>
 #include <uavcan_stm32/uavcan_stm32.hpp>
 #include <uavcan/protocol/global_time_sync_slave.hpp>
 
diff --git a/libuavcan_drivers/stm32/test_stm32f107/src/sys/chconf.h b/libuavcan_drivers/stm32/test_stm32f107/src/sys/chconf.h
index 98f956ee5f..1c5f1e9e45 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/src/sys/chconf.h
+++ b/libuavcan_drivers/stm32/test_stm32f107/src/sys/chconf.h
@@ -26,4 +26,4 @@
 #define PORT_IDLE_THREAD_STACK_SIZE    64
 #define PORT_INT_REQUIRED_STACK        256
 
-#include <crdr_chibios/sys/chconf_tail.h>
+#include <zubax_chibios/sys/chconf_tail.h>
diff --git a/libuavcan_drivers/stm32/test_stm32f107/src/sys/halconf.h b/libuavcan_drivers/stm32/test_stm32f107/src/sys/halconf.h
index d38d00727d..7ba0fd82d9 100644
--- a/libuavcan_drivers/stm32/test_stm32f107/src/sys/halconf.h
+++ b/libuavcan_drivers/stm32/test_stm32f107/src/sys/halconf.h
@@ -29,4 +29,4 @@
 #define SERIAL_DEFAULT_BITRATE      115200
 #define SERIAL_BUFFERS_SIZE         128
 
-#include <crdr_chibios/sys/halconf_tail.h>
+#include <zubax_chibios/sys/halconf_tail.h>