From 4f1f2b0b8c531153a6a897ffc767abb1a9d5d745 Mon Sep 17 00:00:00 2001
From: Simon Kirby <sim@netnation.com>
Date: Sat, 12 Sep 2015 22:27:17 -0700
Subject: [PATCH] Replace empty LED macro definitions with automatic helper
 macros.

---
 afro.inc        | 14 +++++++-------
 afro2.inc       | 16 ++++++++--------
 arctictiger.inc |  9 ---------
 birdie70a.inc   |  9 ---------
 bs.inc          |  9 ---------
 bs40a.inc       |  9 ---------
 bs_nfet.inc     |  9 ---------
 diy0.inc        |  6 +++---
 dlu40a.inc      |  9 ---------
 dlux.inc        |  9 ---------
 dys_nfet.inc    |  9 ---------
 hk200a.inc      |  9 ---------
 hm135a.inc      |  9 ---------
 hxt200a.inc     |  4 ----
 kda.inc         |  9 ---------
 kda_nfet.inc    |  9 ---------
 kda_nfet_ni.inc |  9 ---------
 rb50a.inc       |  9 ---------
 rb70a.inc       |  9 ---------
 rct50a.inc      |  9 ---------
 tbs.inc         |  9 ---------
 tbs_hv.inc      |  9 ---------
 tgy.asm         | 23 +++++++++++++++++++++++
 tgy.inc         |  9 ---------
 tgy6a.inc       |  9 ---------
 tp.inc          |  9 ---------
 tp70a.inc       |  9 ---------
 tp_i2c.inc      |  9 ---------
 tp_nfet.inc     |  9 ---------
 29 files changed, 41 insertions(+), 238 deletions(-)

diff --git a/afro.inc b/afro.inc
index 5e70f40..a43b60a 100644
--- a/afro.inc
+++ b/afro.inc
@@ -52,28 +52,28 @@
 ;*********************
 ; PORT D definitions *
 ;*********************
-.equ	WarnLED		= 2
+.equ	red_led		= 2
 .equ	AnFET		= 3
 .equ	BnFET		= 4
 .equ	CnFET		= 5
-.equ	StatLED		= 7
+.equ	green_led	= 7
 
 .equ	INIT_PD		= 0
-.equ	DIR_PD		= (1<<AnFET)+(1<<BnFET)+(1<<CnFET)+(1<<WarnLED)+(1<<StatLED)
+.equ	DIR_PD		= (1<<AnFET)+(1<<BnFET)+(1<<CnFET)+(1<<red_led)+(1<<green_led)
 
 .equ	AnFET_port	= PORTD
 .equ	BnFET_port	= PORTD
 .equ	CnFET_port	= PORTD
 
 .MACRO RED_on
-	sbi	PORTD, WarnLED
+	sbi	PORTD, red_led
 .ENDMACRO
 .MACRO RED_off
-	cbi	PORTD, WarnLED
+	cbi	PORTD, red_led
 .ENDMACRO
 .MACRO GRN_on
-	cbi	PORTD, StatLED
+	cbi	PORTD, green_led
 .ENDMACRO
 .MACRO GRN_off
-	sbi	PORTD, StatLED
+	sbi	PORTD, green_led
 .ENDMACRO
diff --git a/afro2.inc b/afro2.inc
index f173749..e7b1ae5 100644
--- a/afro2.inc
+++ b/afro2.inc
@@ -38,7 +38,7 @@
 .equ	i2c_clk		= 5	; ADC5/SCL
 .equ	i2c_data	= 4	; ADC4/SDA
 .equ	ApFET		= 3	; o
-.equ	StatLED		= 2	; o
+.equ	green_led	= 2	; o
 .equ	mux_b		= 1	; ADC1 phase input
 .equ	mux_a		= 0	; ADC0 phase input
 
@@ -46,7 +46,7 @@
 .equ	O_GROUND	= 1
 
 .equ	INIT_PC		= (1<<i2c_clk)+(1<<i2c_data)
-.equ	DIR_PC		= (1<<ApFET)+(1<<StatLED)
+.equ	DIR_PC		= (1<<ApFET)+(1<<green_led)
 
 .equ	ApFET_port	= PORTC
 
@@ -58,26 +58,26 @@
 .equ	CnFET		= 5
 .equ	BnFET		= 4
 .equ	AnFET		= 3
-.equ	WarnLED		= 2
+.equ	red_led		= 2
 ;.equ			= 1
 ;.equ			= 0 USART_RX
 
 .equ	INIT_PD		= 0
-.equ	DIR_PD		= (1<<AnFET)+(1<<BnFET)+(1<<CnFET)+(1<<WarnLED)
+.equ	DIR_PD		= (1<<AnFET)+(1<<BnFET)+(1<<CnFET)+(1<<red_led)
 
 .equ	AnFET_port	= PORTD
 .equ	BnFET_port	= PORTD
 .equ	CnFET_port	= PORTD
 
 .MACRO RED_on
-	sbi	PORTD, WarnLED
+	sbi	PORTD, red_led
 .ENDMACRO
 .MACRO RED_off
-	cbi	PORTD, WarnLED
+	cbi	PORTD, red_led
 .ENDMACRO
 .MACRO GRN_on
-	sbi	PORTC, StatLED
+	sbi	PORTC, green_led
 .ENDMACRO
 .MACRO GRN_off
-	cbi	PORTC, StatLED
+	cbi	PORTC, green_led
 .ENDMACRO
diff --git a/arctictiger.inc b/arctictiger.inc
index dcff219..f346f4c 100644
--- a/arctictiger.inc
+++ b/arctictiger.inc
@@ -71,12 +71,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/birdie70a.inc b/birdie70a.inc
index dc0ed4e..f2ebaed 100644
--- a/birdie70a.inc
+++ b/birdie70a.inc
@@ -64,12 +64,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/bs.inc b/bs.inc
index 0195145..c8dd192 100644
--- a/bs.inc
+++ b/bs.inc
@@ -69,12 +69,3 @@
 .equ	DIR_PB		= (1<<CnFET)
 
 .equ	CnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/bs40a.inc b/bs40a.inc
index c681538..77f9ec2 100644
--- a/bs40a.inc
+++ b/bs40a.inc
@@ -65,12 +65,3 @@
 .equ	DIR_PB		= (1<<AnFET)
 
 .equ	AnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/bs_nfet.inc b/bs_nfet.inc
index 98ec2a8..9790efc 100644
--- a/bs_nfet.inc
+++ b/bs_nfet.inc
@@ -69,12 +69,3 @@
 .equ	DIR_PB		= (1<<CnFET)
 
 .equ	CnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/diy0.inc b/diy0.inc
index 43ed279..79c711b 100644
--- a/diy0.inc
+++ b/diy0.inc
@@ -13,7 +13,7 @@
 ; PORT D definitions *
 ;*********************
 .equ	red_led		= 7
-.equ	blue_led	= 5
+.equ	green_led	= 5
 .equ	ApFET		= 4
 .equ	io1		= 3
 .equ	io2		= 2
@@ -32,10 +32,10 @@
 	cbi	DDRD, red_led
 .ENDMACRO
 .MACRO GRN_on
-	sbi	DDRD, blue_led
+	sbi	DDRD, green_led
 .ENDMACRO
 .MACRO GRN_off
-	cbi	DDRD, blue_led
+	cbi	DDRD, green_led
 .ENDMACRO
 
 ;*********************
diff --git a/dlu40a.inc b/dlu40a.inc
index 421e556..8e67cba 100644
--- a/dlu40a.inc
+++ b/dlu40a.inc
@@ -67,12 +67,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/dlux.inc b/dlux.inc
index 84431c1..751fd0f 100644
--- a/dlux.inc
+++ b/dlux.inc
@@ -28,15 +28,6 @@
 .equ	AnFET_port	= PORTD
 .equ	ApFET_port	= PORTD
 
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
-
 ;*********************
 ; PORT C definitions *
 ;*********************
diff --git a/dys_nfet.inc b/dys_nfet.inc
index 8a99280..38b55f3 100644
--- a/dys_nfet.inc
+++ b/dys_nfet.inc
@@ -71,12 +71,3 @@
 .equ	ApFET_port	= PORTD
 .equ	BpFET_port	= PORTD
 .equ	CpFET_port	= PORTD
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/hk200a.inc b/hk200a.inc
index be0ecaf..a4adf8c 100644
--- a/hk200a.inc
+++ b/hk200a.inc
@@ -64,12 +64,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/hm135a.inc b/hm135a.inc
index 0f843cd..a426604 100644
--- a/hm135a.inc
+++ b/hm135a.inc
@@ -63,12 +63,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/hxt200a.inc b/hxt200a.inc
index 384fad9..3413591 100644
--- a/hxt200a.inc
+++ b/hxt200a.inc
@@ -38,10 +38,6 @@
 .MACRO RED_off
 	cbi	DDRC, red_led
 .ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
 
 ;*********************
 ; PORT C definitions *
diff --git a/kda.inc b/kda.inc
index 64f4590..930e1c1 100644
--- a/kda.inc
+++ b/kda.inc
@@ -65,12 +65,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/kda_nfet.inc b/kda_nfet.inc
index 94419fd..b902f26 100644
--- a/kda_nfet.inc
+++ b/kda_nfet.inc
@@ -65,12 +65,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/kda_nfet_ni.inc b/kda_nfet_ni.inc
index 17e3dbd..189da9f 100644
--- a/kda_nfet_ni.inc
+++ b/kda_nfet_ni.inc
@@ -66,12 +66,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/rb50a.inc b/rb50a.inc
index caef382..527a2f7 100644
--- a/rb50a.inc
+++ b/rb50a.inc
@@ -67,12 +67,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/rb70a.inc b/rb70a.inc
index 390eb9f..6aacc5a 100644
--- a/rb70a.inc
+++ b/rb70a.inc
@@ -64,12 +64,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/rct50a.inc b/rct50a.inc
index d8891ce..882d5c6 100644
--- a/rct50a.inc
+++ b/rct50a.inc
@@ -67,12 +67,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tbs.inc b/tbs.inc
index 904f6d6..72daba3 100644
--- a/tbs.inc
+++ b/tbs.inc
@@ -70,12 +70,3 @@
 .equ	CnFET_port	= PORTD
 .equ	CpFET_port	= PORTD
 .equ	BnFET_port	= PORTD
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tbs_hv.inc b/tbs_hv.inc
index 10d00e7..8a89522 100644
--- a/tbs_hv.inc
+++ b/tbs_hv.inc
@@ -71,12 +71,3 @@
 .equ	CnFET_port	= PORTD
 .equ	CpFET_port	= PORTD
 .equ	BnFET_port	= PORTD
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tgy.asm b/tgy.asm
index c89f4a7..de98b6e 100644
--- a/tgy.asm
+++ b/tgy.asm
@@ -609,6 +609,29 @@ eeprom_defaults_w:
 	.endif
 .endmacro
 
+;-- LED macros -----------------------------------------------------------
+
+.if !defined(red_led)
+	.macro RED_on
+	.endmacro
+	.macro RED_off
+	.endmacro
+.endif
+
+.if !defined(green_led)
+	.macro GRN_on
+	.endmacro
+	.macro GRN_off
+	.endmacro
+.endif
+
+.if !defined(blue_led)
+	.macro BLUE_on
+	.endmacro
+	.macro BLUE_off
+	.endmacro
+.endif
+
 ;-- FET driving macros ---------------------------------------------------
 ; Careful: "if" conditions split over multiple lines (with backslashes)
 ; work with arva, but avrasm2.exe silently produces wrong results.
diff --git a/tgy.inc b/tgy.inc
index c6aca7b..bf16592 100644
--- a/tgy.inc
+++ b/tgy.inc
@@ -69,12 +69,3 @@
 .equ	AnFET_port	= PORTB
 .equ	BnFET_port	= PORTB
 .equ	CnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tgy6a.inc b/tgy6a.inc
index 0cd1c9c..b129f15 100644
--- a/tgy6a.inc
+++ b/tgy6a.inc
@@ -69,12 +69,3 @@
 .equ	AnFET_port	= PORTB
 .equ	BnFET_port	= PORTB
 .equ	CnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tp.inc b/tp.inc
index 1f47217..c183a84 100644
--- a/tp.inc
+++ b/tp.inc
@@ -68,12 +68,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tp70a.inc b/tp70a.inc
index 9e1666a..f94218c 100644
--- a/tp70a.inc
+++ b/tp70a.inc
@@ -64,12 +64,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tp_i2c.inc b/tp_i2c.inc
index 4858093..4eebb33 100644
--- a/tp_i2c.inc
+++ b/tp_i2c.inc
@@ -67,12 +67,3 @@
 
 .equ	INIT_PB		= 0
 .equ	DIR_PB		= 0
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO
diff --git a/tp_nfet.inc b/tp_nfet.inc
index f43dd79..31c6107 100644
--- a/tp_nfet.inc
+++ b/tp_nfet.inc
@@ -63,12 +63,3 @@
 .equ	AnFET_port	= PORTB
 .equ	BnFET_port	= PORTB
 .equ	CnFET_port	= PORTB
-
-.MACRO RED_on
-.ENDMACRO
-.MACRO RED_off
-.ENDMACRO
-.MACRO GRN_on
-.ENDMACRO
-.MACRO GRN_off
-.ENDMACRO