diff --git a/Layouts/A.inc b/Layouts/A.inc index 7809d85..cd02f56 100644 --- a/Layouts/A.inc +++ b/Layouts/A.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/B.inc b/Layouts/B.inc index c77ad0f..3b8a2e4 100644 --- a/Layouts/B.inc +++ b/Layouts/B.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/Base.inc b/Layouts/Base.inc index 12f4deb..ddd2ee4 100644 --- a/Layouts/Base.inc +++ b/Layouts/Base.inc @@ -25,7 +25,7 @@ ; Base layout ; ; The inheriting layout should -; - Specify PWM_ACTIVE_HIGH, COMPWM_ACTIVE_HIGH and COMPARATOR_PORT +; - Specify PWM_ACTIVE_HIGH, COM_ACTIVE_HIGH and COMPARATOR_PORT ; - Set CUSTOM_* flags to override default implementation ; ;**** **** **** **** **** @@ -54,9 +54,9 @@ ENDM Set_Pwm_Polarity MACRO IF PCA0CPM_POWER == PCA0CPM0 - mov PCA0POL, #((COMPWM_ACTIVE_HIGH SHL 1) + (1 - PWM_ACTIVE_HIGH)) + mov PCA0POL, #((COM_ACTIVE_HIGH SHL 1) + (1 - PWM_ACTIVE_HIGH)) ELSE - mov PCA0POL, #(((1 - PWM_ACTIVE_HIGH) SHL 1) + COMPWM_ACTIVE_HIGH) + mov PCA0POL, #(((1 - PWM_ACTIVE_HIGH) SHL 1) + COM_ACTIVE_HIGH) ENDIF ENDM @@ -154,7 +154,7 @@ pON LIT 'clr' pOFF LIT 'setb' ENDIF -IF COMPWM_ACTIVE_HIGH == 1 ; COM FET active high +IF COM_ACTIVE_HIGH == 1 ; COM FET active high cON LIT 'setb' cOFF LIT 'clr' ELSE ; COM FET active low diff --git a/Layouts/C.inc b/Layouts/C.inc index 80b8e3c..d9468ca 100644 --- a/Layouts/C.inc +++ b/Layouts/C.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/D.inc b/Layouts/D.inc index 3706040..773efb2 100644 --- a/Layouts/D.inc +++ b/Layouts/D.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 0 ; Damping non-inverted +COM_ACTIVE_HIGH EQU 0 ; Damping non-inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/E.inc b/Layouts/E.inc index bba70b9..6e0cf96 100644 --- a/Layouts/E.inc +++ b/Layouts/E.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port @@ -115,9 +115,9 @@ ENDM Set_Pwm_Polarity MACRO IF PCA0CPM_POWER == PCA0CPM0 - mov PCA0POL, #((COMPWM_ACTIVE_HIGH SHL 1) + (1 - PWM_ACTIVE_HIGH)) + mov PCA0POL, #((COM_ACTIVE_HIGH SHL 1) + (1 - PWM_ACTIVE_HIGH)) ELSE - mov PCA0POL, #(((1 - PWM_ACTIVE_HIGH) SHL 1) + COMPWM_ACTIVE_HIGH) + mov PCA0POL, #(((1 - PWM_ACTIVE_HIGH) SHL 1) + COM_ACTIVE_HIGH) ENDIF ENDM diff --git a/Layouts/F.inc b/Layouts/F.inc index 344137b..33c1601 100644 --- a/Layouts/F.inc +++ b/Layouts/F.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/G.inc b/Layouts/G.inc index 3488b19..7c681de 100644 --- a/Layouts/G.inc +++ b/Layouts/G.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/H.inc b/Layouts/H.inc index c38a051..720a9ef 100644 --- a/Layouts/H.inc +++ b/Layouts/H.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/I.inc b/Layouts/I.inc index 4022faa..5f6e9d5 100644 --- a/Layouts/I.inc +++ b/Layouts/I.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/J.inc b/Layouts/J.inc index 28f7941..9809b8b 100644 --- a/Layouts/J.inc +++ b/Layouts/J.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/K.inc b/Layouts/K.inc index 1efea22..1d2b250 100644 --- a/Layouts/K.inc +++ b/Layouts/K.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 0 ; Damping non-inverted +COM_ACTIVE_HIGH EQU 0 ; Damping non-inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/L.inc b/Layouts/L.inc index fe92acd..81687ac 100644 --- a/Layouts/L.inc +++ b/Layouts/L.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/M.inc b/Layouts/M.inc index 6c533d6..4a618db 100644 --- a/Layouts/M.inc +++ b/Layouts/M.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/N.inc b/Layouts/N.inc index 7c56f26..67db9ec 100644 --- a/Layouts/N.inc +++ b/Layouts/N.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/O.inc b/Layouts/O.inc index 0b13124..071e66e 100644 --- a/Layouts/O.inc +++ b/Layouts/O.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 0 ; Damping non-inverted +COM_ACTIVE_HIGH EQU 0 ; Damping non-inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/P.inc b/Layouts/P.inc index fbb02f7..d7891f1 100644 --- a/Layouts/P.inc +++ b/Layouts/P.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/Q.inc b/Layouts/Q.inc index 63878f7..1b04cc9 100644 --- a/Layouts/Q.inc +++ b/Layouts/Q.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 1 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/R.inc b/Layouts/R.inc index 4f9afd3..57687fc 100644 --- a/Layouts/R.inc +++ b/Layouts/R.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/S.inc b/Layouts/S.inc index fe9f32a..e6dff2f 100644 --- a/Layouts/S.inc +++ b/Layouts/S.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/T.inc b/Layouts/T.inc index 503d870..8cfce49 100644 --- a/Layouts/T.inc +++ b/Layouts/T.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/U.inc b/Layouts/U.inc index e5de6ee..2f3d7ed 100644 --- a/Layouts/U.inc +++ b/Layouts/U.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/V.inc b/Layouts/V.inc index 8df8337..68aa93a 100644 --- a/Layouts/V.inc +++ b/Layouts/V.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/W.inc b/Layouts/W.inc index f5d22e3..0b41208 100644 --- a/Layouts/W.inc +++ b/Layouts/W.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 1 ; Pwm non-inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port diff --git a/Layouts/Z.inc b/Layouts/Z.inc index 8d47325..2138509 100644 --- a/Layouts/Z.inc +++ b/Layouts/Z.inc @@ -28,7 +28,7 @@ ;**** **** **** **** **** PWM_ACTIVE_HIGH EQU 0 ; Pwm inverted -COMPWM_ACTIVE_HIGH EQU 1 ; Damping inverted +COM_ACTIVE_HIGH EQU 1 ; Damping inverted COMPARATOR_PORT EQU 0 ; All comparator (mux) pins must be on the same port