Refactored MCU specific offsets to separate module (#116)

bird-sanctuary · Jun 15, 2023 · 38cc961 · 38cc961
1 parent 0b286d9
commit 38cc961
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/src/BLHeliBootLoad.inc b/src/BLHeliBootLoad.inc
@@ -259,11 +259,7 @@ pro4:
 pro5:
     clr  C
     mov  A, DPH                         ; Check that address is not in bootloader area
-IF MCU_TYPE == MCU_BB1 or MCU_TYPE = MCU_BB2
-    subb A, #1Ch
-ELSEIF MCU_TYPE == MCU_BB51
-    subb A, #0F0h
-ENDIF
+    subb A, #BOOTLOADER_OFFSET
     jc   ($+5)
 
     inc  DPTR                           ; Increment flash address

diff --git a/src/Bluejay.asm b/src/Bluejay.asm
@@ -141,6 +141,7 @@ IF PWM_FREQ == PWM_24 or PWM_FREQ == PWM_48 or PWM_FREQ == PWM_96
     PWM_BITS_H EQU (2 + IS_MCU_48MHZ - PWM_CENTERED - PWM_FREQ)
 ENDIF
 
+$include (Modules\McuOffsets.asm)
 $include (Modules\Codespace.asm)
 $include (Modules\Common.asm)
 $include (Modules\Macros.asm)
@@ -507,11 +508,7 @@ input_high_check:
 
     call beep_enter_bootloader
 
-IF MCU_TYPE == MCU_BB51
-    ljmp 0F000h                         ; Jump to bootloader
-ELSE
-    ljmp 1C00h                          ; Jump to bootloader
-ENDIF
+    ljmp CSEG_BOOT_START                ; Jump to bootloader
 
 bootloader_done:
     jnb  Flag_Had_Signal, setup_dshot   ; Check if DShot signal was lost

diff --git a/src/Modules/Eeprom.asm b/src/Modules/Eeprom.asm
@@ -166,11 +166,7 @@ write_eeprom_byte_from_acc:
     mov  Temp8, A
     clr  C
     mov  A, DPH                         ; Check that address is not in bootloader area
-IF MCU_TYPE == MCU_BB51
-    subb A, #0F0h
-ELSE
-    subb A, #1Ch
-ENDIF
+    subb A, #BOOTLOADER_OFFSET
     jc   ($+3)
 
     ret

diff --git a/src/Modules/McuOffsets.asm b/src/Modules/McuOffsets.asm
@@ -0,0 +1,34 @@
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; Bluejay digital ESC firmware for controlling brushless motors in multirotors
+;
+; Copyleft  2023 Chris Landa
+;
+; 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/>.
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+;
+; MCU Offsets
+;
+; Offsets for memory space based on MCU
+;
+;**** **** **** **** **** **** **** **** **** **** **** **** ****
+
+IF MCU_TYPE == MCU_BB51
+    BOOTLOADER_OFFSET EQU 0F0h
+ELSE
+    BOOTLOADER_OFFSET EQU 1Ch
+ENDIF