add new layout D_X,E_X for BB51.

src/Layouts/BB51/D.inc

@@ -0,0 +1,93 @@
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; Bluejay digital ESC firmware for controlling brushless motors in multirotors
+;
+; Copyright 2022-2022 Chris Landa
+; Copyright 2011-2017 Steffen Skaug
+;
+; This file is part of Bluejay.
+;
+; Bluejay is free software: you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
+;
+; Bluejay is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with Bluejay.  If not, see <http://www.gnu.org/licenses/>.
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; Hardware definition file "D" for BB51.
+;
+; PORT 0                   |  PORT 1                   |  PWM    COM    PWM    LED
+; P0 P1 P2 P3 P4 P5 P6 P7  |  P0 P1 P2 P3 P4 P5 P6 P7  |  inv    inv    side    n
+; -----------------------  |  -----------------------  |  -------------------------
+; __ Bm Cm Am Vn RX __ __  |  Ap Ac Bp Bc Cp Cc __ __  |  no    yes    high   _
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+
+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 1                 ; Comparator output inverted
+
+PCA0CPM_POWER EQU PCA0CPM0
+PCA0CPL_POWER EQU PCA0CPL0
+PCA0CPH_POWER EQU PCA0CPH0
+
+PCA0CPM_DAMP EQU PCA0CPM1
+PCA0CPL_DAMP EQU PCA0CPL1
+PCA0CPH_DAMP EQU PCA0CPH1
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 0 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;     EQU 7
+;     EQU 6
+RTX_PIN EQU 5
+V_Mux EQU 4
+A_Mux EQU 3
+C_Mux EQU 2
+B_Mux EQU 1
+;     EQU 0
+
+P0_DIGITAL EQU NOT((1 SHL A_Mux) + (1 SHL B_Mux) + (1 SHL C_Mux) + (1 SHL V_Mux))
+P0_INIT EQU 0FFh
+P0_PUSHPULL EQU 0
+P0_SKIP EQU 0FFh
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 1 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;     EQU 7
+;     EQU 6
+C_Com EQU 5
+C_Pwm EQU 4
+B_Com EQU 3
+B_Pwm EQU 2
+A_Com EQU 1
+A_Pwm EQU 0
+
+P1_DIGITAL EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm) + (1 SHL A_Com) + (1 SHL B_Com) + (1 SHL C_Com)
+P1_INIT EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm)
+P1_PUSHPULL EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm) + (1 SHL A_Com) + (1 SHL B_Com) + (1 SHL C_Com)
+P1_SKIP EQU 0FFh
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 2 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+DebugPin EQU 0
+
+P2_DIGITAL EQU (1 SHL DebugPin)
+P2_PUSHPULL EQU (1 SHL DebugPin)
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; Inherit base layout
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+$include (../Base.inc)

src/Layouts/BB51/E.inc

@@ -0,0 +1,94 @@
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; Bluejay digital ESC firmware for controlling brushless motors in multirotors
+;
+; Copyright 2022-2022 Chris Landa
+; Copyright 2011-2017 Steffen Skaug
+;
+; This file is part of Bluejay.
+;
+; Bluejay is free software: you can redistribute it and/or modify
+; it under the terms of the GNU General Public License as published by
+; the Free Software Foundation, either version 3 of the License, or
+; (at your option) any later version.
+;
+; Bluejay is distributed in the hope that it will be useful,
+; but WITHOUT ANY WARRANTY; without even the implied warranty of
+; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+; GNU General Public License for more details.
+;
+; You should have received a copy of the GNU General Public License
+; along with Bluejay.  If not, see <http://www.gnu.org/licenses/>.
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; Hardware definition file "E" for BB51.
+;
+; PORT 0                   |  PORT 1                   |  PWM    COM    PWM    LED
+; P0 P1 P2 P3 P4 P5 P6 P7  |  P0 P1 P2 P3 P4 P5 P6 P7  |  inv    inv    side    n
+; -----------------------  |  -----------------------  |  -------------------------
+; __ Cm Bm Am Vn RX __ __  |  Cp Bp Ap Cc Bc Cc __ __  |  no    yes    high   _
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+
+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 1                 ; Comparator output inverted
+
+PCA0CPM_POWER EQU PCA0CPM0
+PCA0CPL_POWER EQU PCA0CPL0
+PCA0CPH_POWER EQU PCA0CPH0
+
+PCA0CPM_DAMP EQU PCA0CPM1
+PCA0CPL_DAMP EQU PCA0CPL1
+PCA0CPH_DAMP EQU PCA0CPH1
+
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 0 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;     EQU 7
+;     EQU 6
+RTX_PIN EQU 5
+V_Mux EQU 4
+A_Mux EQU 3
+B_Mux EQU 2
+C_Mux EQU 1
+;     EQU 0
+
+P0_DIGITAL EQU NOT((1 SHL A_Mux) + (1 SHL B_Mux) + (1 SHL C_Mux) + (1 SHL V_Mux))
+P0_INIT EQU 0FFh
+P0_PUSHPULL EQU 0
+P0_SKIP EQU 0FFh
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 1 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;     EQU 7
+;     EQU 6
+A_Com EQU 5
+B_Com EQU 4
+C_Com EQU 3
+A_Pwm EQU 2
+B_Pwm EQU 1
+C_Pwm EQU 0
+
+P1_DIGITAL EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm) + (1 SHL A_Com) + (1 SHL B_Com) + (1 SHL C_Com)
+P1_INIT EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm)
+P1_PUSHPULL EQU (1 SHL A_Pwm) + (1 SHL B_Pwm) + (1 SHL C_Pwm) + (1 SHL A_Com) + (1 SHL B_Com) + (1 SHL C_Com)
+P1_SKIP EQU 0FFh
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; PORT 2 definitions
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+DebugPin EQU 0
+
+P2_DIGITAL EQU (1 SHL DebugPin)
+P2_PUSHPULL EQU (1 SHL DebugPin)
+
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+; Inherit base layout
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+$include (../Base.inc)

src/Layouts/Base.inc

@@ -133,7 +133,7 @@ Set_Comparator_Phase_A MACRO
 IF MCU_TYPE == MCU_BB1 or MCU_TYPE == MCU_BB2
     mov  CMP_MX, #((A_Mux SHL 4) + V_Mux)
 ELSEIF MCU_TYPE == MCU_BB51
-    mov  CMP_MX, #12h
+    mov  CMP_MX, #(10h+A_Mux-1)
 ENDIF
 ENDM
 
@@ -142,7 +142,7 @@ Set_Comparator_Phase_B MACRO
 IF MCU_TYPE == MCU_BB1 or MCU_TYPE == MCU_BB2
     mov  CMP_MX, #((B_Mux SHL 4) + V_Mux)
 ELSEIF MCU_TYPE == MCU_BB51
-    mov  CMP_MX, #10h
+	mov  CMP_MX, #(10h+B_Mux-1)
 ENDIF
 ENDM
 
@@ -151,7 +151,7 @@ Set_Comparator_Phase_C MACRO
 IF MCU_TYPE == MCU_BB1 or MCU_TYPE == MCU_BB2
     mov  CMP_MX, #((C_Mux SHL 4) + V_Mux)
 ELSEIF MCU_TYPE == MCU_BB51
-    mov  CMP_MX, #11h
+    mov  CMP_MX, #(10h+C_Mux-1)
 ENDIF
 ENDM
 

src/Modules/Common.asm

@@ -135,6 +135,10 @@ ELSEIF ESCNO == B_
     $include (Layouts/BB51/B.inc)       ; Select pinout B
 ELSEIF ESCNO == C_
     $include (Layouts/BB51/C.inc)       ; Select pinout C
+ELSEIF ESCNO == D_
+	$include (Layouts/BB51/D.inc)       ; Select pinout D
+ELSEIF ESCNO == E_
+	$include (Layouts/BB51/E.inc)		; Select pinout E
 ENDIF
 ENDIF