fix: Make inverted comparator output work on BB1

This bug made the O-L-* ESC layouts not work
mathiasvr · Aug 21, 2021 · 3ffc6b4 · 3ffc6b4
1 parent 0f54d76
commit 3ffc6b4
Show file tree

Hide file tree

Showing 24 changed files with 29 additions and 14 deletions.
diff --git a/Layouts/A.inc b/Layouts/A.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/B.inc b/Layouts/B.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/Base.inc b/Layouts/Base.inc
@@ -117,17 +117,19 @@ CMP_MD		EQU	CMP1MD
 CMP_MX		EQU	CMP1MX
 ENDIF
 
-$if NOT CUSTOM_COMPARATOR_SETUP
-
 Initialize_Comparator MACRO
 	mov	CMP_CN0, #80h				;; Comparator enabled, no hysteresis
 	mov	CMP_MD, #00h				;; Comparator response time 100ns
+IF COMPARATOR_INVERT == 1 AND MCU_48MHZ == 1
+	mov	CMP_MD, #40h				;; Output polarity inverted (Only supported on BB2)
+ENDIF
 ENDM
 
-$endif
-
 Read_Comparator_Output MACRO
 	mov	A, CMP_CN0				;; Read comparator output
+IF COMPARATOR_INVERT == 1 AND MCU_48MHZ == 0
+	cpl	A						;; Invert output polarity manually on BB1
+ENDIF
 ENDM
 
 ; Set comparator multiplexer to phase A

diff --git a/Layouts/C.inc b/Layouts/C.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/D.inc b/Layouts/D.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	0		; Damping non-inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/E.inc b/Layouts/E.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/F.inc b/Layouts/F.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/G.inc b/Layouts/G.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/H.inc b/Layouts/H.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/I.inc b/Layouts/I.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/J.inc b/Layouts/J.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/K.inc b/Layouts/K.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	0		; Damping non-inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/L.inc b/Layouts/L.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/M.inc b/Layouts/M.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/N.inc b/Layouts/N.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/O.inc b/Layouts/O.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	0		; Damping non-inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	1		; Comparator output inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0
@@ -97,17 +98,7 @@ P2_PUSHPULL	EQU	(1 SHL DebugPin)
 P2_SKIP		EQU	(1 SHL DebugPin)
 
 
-;**** **** **** **** ****
-; Comparator setup
-;**** **** **** **** ****
-Initialize_Comparator MACRO
-	mov	CMP_CN0, #80h			;; Comparator enabled, no hysteresis
-	mov	CMP_MD, #40h			;; Comparator response time 100ns, Output polarity inverted
-ENDM
-
-
 ;**** **** **** **** ****
 ; Inherit base layout
 ;**** **** **** **** ****
-$set(CUSTOM_COMPARATOR_SETUP)
 $include (Base.inc)
diff --git a/Layouts/P.inc b/Layouts/P.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/R.inc b/Layouts/R.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/S.inc b/Layouts/S.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/T.inc b/Layouts/T.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/U.inc b/Layouts/U.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/V.inc b/Layouts/V.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/W.inc b/Layouts/W.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	1		; Pwm non-inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0

diff --git a/Layouts/Z.inc b/Layouts/Z.inc
@@ -31,6 +31,7 @@ PWM_ACTIVE_HIGH	EQU	0		; Pwm inverted
 COM_ACTIVE_HIGH	EQU	1		; Damping inverted
 
 COMPARATOR_PORT	EQU	0		; All comparator (mux) pins must be on the same port
+COMPARATOR_INVERT	EQU	0		; Comparator output non-inverted
 
 IF DEADTIME == 0
 	PCA0CPM_POWER	EQU	PCA0CPM0