From 200c1e018d67022f3c9f568e1dbb16324f00f578 Mon Sep 17 00:00:00 2001
From: dewagter <dewagter@gmail.com>
Date: Fri, 23 May 2014 15:46:58 +0200
Subject: [PATCH] [intermcu_uart] Naming convention: PORT_NR=1 -> PORT=UART1

---
 conf/airframes/CDW/DualBoardApFbw.xml                     | 4 ++--
 conf/airframes/CDW/TwoSeas.xml                            | 4 ++--
 conf/airframes/examples/separate_fbw_ap.xml               | 4 ++--
 .../firmwares/subsystems/fixedwing/intermcu_uart.makefile | 8 ++++----
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/conf/airframes/CDW/DualBoardApFbw.xml b/conf/airframes/CDW/DualBoardApFbw.xml
index 9379be87818..0fbd5590e52 100644
--- a/conf/airframes/CDW/DualBoardApFbw.xml
+++ b/conf/airframes/CDW/DualBoardApFbw.xml
@@ -245,7 +245,7 @@
       <!-- split of ap/fbw specific subsystems for ap -->
       <subsystem name="actuators" type="dummy"/>
       <subsystem name="intermcu" type="uart">
-        <configure name="INTERMCU_PORT_NR" value="5"/>
+        <configure name="INTERMCU_PORT" value="UART5"/>
       </subsystem>
 
       <subsystem name="control"/>
@@ -265,7 +265,7 @@
       <!-- split of ap/fbw specific subsystems for fbw -->
       <subsystem name="actuators" type="pwm"/>
       <subsystem name="intermcu" type="uart">
-        <configure name="INTERMCU_PORT_NR" value="2"/>
+        <configure name="INTERMCU_PORT" value="UART2"/>
       </subsystem>
     </target>
 
diff --git a/conf/airframes/CDW/TwoSeas.xml b/conf/airframes/CDW/TwoSeas.xml
index 9a7bb0699be..049bf8775d3 100644
--- a/conf/airframes/CDW/TwoSeas.xml
+++ b/conf/airframes/CDW/TwoSeas.xml
@@ -21,7 +21,7 @@
       <!-- FBW -->
       <subsystem name="actuators" type="dummy"/>
       <subsystem name="intermcu" type="uart">
-        <configure name="INTERMCU_PORT_NR" value="2"/>
+        <configure name="INTERMCU_PORT" value="UART2"/>
       </subsystem>
       <!-- AP -->
       <subsystem name="control"/>
@@ -48,7 +48,7 @@
       </subsystem>
       <!-- FBW <-> AP -->
       <subsystem name="intermcu" type="uart">
-        <configure name="INTERMCU_PORT_NR" value="1"/>
+        <configure name="INTERMCU_PORT" value="UART1"/>
       </subsystem>
       <!-- SERVO'S -->
       <subsystem name="actuators" type="pwm"/>
diff --git a/conf/airframes/examples/separate_fbw_ap.xml b/conf/airframes/examples/separate_fbw_ap.xml
index abb0185263d..54f23abae5b 100644
--- a/conf/airframes/examples/separate_fbw_ap.xml
+++ b/conf/airframes/examples/separate_fbw_ap.xml
@@ -243,7 +243,7 @@
     <subsystem name="radio_control" type="ppm"/>
     <subsystem name="actuators" type="direct"/>
     <subsystem name="intermcu" type="uart">
-      <configure name="INTERMCU_PORT_NR" value="2" />
+      <configure name="INTERMCU_PORT" value="UART2" />
     </subsystem>
 
 
@@ -300,7 +300,7 @@
     <subsystem name="actuators" type="dummy"/>
 
     <subsystem name="intermcu" type="uart">
-      <configure name="INTERMCU_PORT_NR" value="5" />
+      <configure name="INTERMCU_PORT" value="UART5" />
     </subsystem>
 
 </firmware>
diff --git a/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile b/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
index 997a642e06e..bef958f0966 100644
--- a/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
+++ b/conf/firmwares/subsystems/fixedwing/intermcu_uart.makefile
@@ -5,14 +5,14 @@
 
 ifeq ($(TARGET),fbw)
   ifeq ($(INTERMCU_PORT),none)
-    INTERMCU_PORT_NR = 2
+    INTERMCU_PORT = UART2
   endif
-  fbw.CFLAGS += -DINTERMCU_LINK=UART$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
+  fbw.CFLAGS += -DINTERMCU_LINK=$(INTERMCU_PORT) -DUSE_$(INTERMCU_PORT) -D$(INTERMCU_PORT)_BAUD=B57600
 else
   ifeq ($(INTERMCU_PORT),none)
-    INTERMCU_PORT_NR = 5
+    INTERMCU_PORT = UART5
   endif
-  ap.CFLAGS += -DINTERMCU_LINK=UART$(INTERMCU_PORT_NR) -DUSE_UART$(INTERMCU_PORT_NR) -DUART$(INTERMCU_PORT_NR)_BAUD=B57600
+  ap.CFLAGS += -DINTERMCU_LINK=$(INTERMCU_PORT) -DUSE_$(INTERMCU_PORT) -D$(INTERMCU_PORT)_BAUD=B57600
 endif
 
 ifneq ($(TARGET),sim)