Browse Source

style: Clean up formatting

main
Mathias Rasmussen 4 years ago
parent
commit
6b5b66bf48
  1. 12
      Bluejay.asm
  2. 90
      Common.inc

12
Bluejay.asm

@ -725,7 +725,6 @@ t1_int_not_bidir:
jb Flag_Motor_Started, t1_int_startup_boosted ; Do not boost when changing direction in bidirectional mode jb Flag_Motor_Started, t1_int_startup_boosted ; Do not boost when changing direction in bidirectional mode
; Add an extra power boost during start ; Add an extra power boost during start
mov Temp6, Stall_Cnt mov Temp6, Stall_Cnt
@ -788,7 +787,7 @@ t1_int_zero_rcp_checked:
; Check against limit ; Check against limit
clr C clr C
mov A, Temp6 mov A, Temp6
subb A, Temp2 ; 8-bit rc pulse
subb A, Temp2 ; 8-bit rc pulse
jnc t1_int_scale_pwm_resolution jnc t1_int_scale_pwm_resolution
IF PWM_BITS_H == 0 ; 8-bit pwm IF PWM_BITS_H == 0 ; 8-bit pwm
@ -2075,7 +2074,6 @@ wait_for_comp_out_start:
mov A, Flags_Startup ; Clear demag detected flag if start phases mov A, Flags_Startup ; Clear demag detected flag if start phases
jz ($+4) jz ($+4)
clr Flag_Demag_Detected clr Flag_Demag_Detected
; Too low value (~<15) causes rough running at pwm harmonics. ; Too low value (~<15) causes rough running at pwm harmonics.
@ -2109,6 +2107,7 @@ IF MCU_48MHZ == 1
rlc A rlc A
mov Temp2, A mov Temp2, A
ENDIF ENDIF
comp_check_timeout: comp_check_timeout:
jb Flag_Timer3_Pending, comp_check_timeout_not_timed_out ; Has zero cross scan timeout elapsed? jb Flag_Timer3_Pending, comp_check_timeout_not_timed_out ; Has zero cross scan timeout elapsed?
@ -3529,7 +3528,7 @@ init_start:
mov Pwm_Limit_Beg, @Temp2 ; Set initial pwm limit mov Pwm_Limit_Beg, @Temp2 ; Set initial pwm limit
mov Pwm_Limit, Pwm_Limit_Beg mov Pwm_Limit, Pwm_Limit_Beg
mov Pwm_Limit_By_Rpm, Pwm_Limit_Beg mov Pwm_Limit_By_Rpm, Pwm_Limit_Beg
setb IE_EA ; Enable interrupts
setb IE_EA ; Enable interrupts
; Begin startup sequence ; Begin startup sequence
IF MCU_48MHZ == 1 IF MCU_48MHZ == 1
@ -3655,7 +3654,7 @@ run5:
; Run 6 = B(p-on) + A(n-pwm) - comparator C evaluated ; Run 6 = B(p-on) + A(n-pwm) - comparator C evaluated
; Out_cC changes from high to low ; Out_cC changes from high to low
run6: run6:
Start_Adc ; Start adc conversion
Start_Adc ; Start adc conversion
call wait_for_comp_out_low call wait_for_comp_out_low
; setup_comm_wait ; setup_comm_wait
; evaluate_comparator_integrity ; evaluate_comparator_integrity
@ -3797,6 +3796,7 @@ run_to_wait_for_power_on_stall_done:
call switch_power_off call switch_power_off
mov Flags1, #0 ; Clear flags1 mov Flags1, #0 ; Clear flags1
mov Flags_Startup, #0 ; Clear startup flags mov Flags_Startup, #0 ; Clear startup flags
IF MCU_48MHZ == 1 IF MCU_48MHZ == 1
Set_MCU_Clk_24MHz Set_MCU_Clk_24MHz
@ -3824,9 +3824,11 @@ IF MCU_48MHZ == 1
mov DShot_GCR_Start_Delay, #DSHOT_TLM_START_DELAY mov DShot_GCR_Start_Delay, #DSHOT_TLM_START_DELAY
ENDIF ENDIF
setb IE_EA setb IE_EA
call wait100ms ; Wait for pwm to be stopped call wait100ms ; Wait for pwm to be stopped
call switch_power_off call switch_power_off
mov Temp1, #Pgm_Brake_On_Stop mov Temp1, #Pgm_Brake_On_Stop
mov A, @Temp1 mov A, @Temp1
jz run_to_wait_for_power_on_brake_done jz run_to_wait_for_power_on_brake_done

90
Common.inc

@ -42,51 +42,51 @@ ENDIF
;**** **** **** **** **** ;**** **** **** **** ****
; ESC selection statements ; ESC selection statements
IF ESCNO == A_ IF ESCNO == A_
$include (targets/A.inc) ; Select pinout A
$include (targets/A.inc) ; Select pinout A
ELSEIF ESCNO == B_ ELSEIF ESCNO == B_
$include (targets/B.inc) ; Select pinout B
$include (targets/B.inc) ; Select pinout B
ELSEIF ESCNO == C_ ELSEIF ESCNO == C_
$include (targets/C.inc) ; Select pinout C
$include (targets/C.inc) ; Select pinout C
ELSEIF ESCNO == D_ ELSEIF ESCNO == D_
$include (targets/D.inc) ; Select pinout D
$include (targets/D.inc) ; Select pinout D
ELSEIF ESCNO == E_ ELSEIF ESCNO == E_
$include (targets/E.inc) ; Select pinout E
$include (targets/E.inc) ; Select pinout E
ELSEIF ESCNO == F_ ELSEIF ESCNO == F_
$include (targets/F.inc) ; Select pinout F
$include (targets/F.inc) ; Select pinout F
ELSEIF ESCNO == G_ ELSEIF ESCNO == G_
$include (targets/G.inc) ; Select pinout G
$include (targets/G.inc) ; Select pinout G
ELSEIF ESCNO == H_ ELSEIF ESCNO == H_
$include (targets/H.inc) ; Select pinout H
$include (targets/H.inc) ; Select pinout H
ELSEIF ESCNO == I_ ELSEIF ESCNO == I_
$include (targets/I.inc) ; Select pinout I
$include (targets/I.inc) ; Select pinout I
ELSEIF ESCNO == J_ ELSEIF ESCNO == J_
$include (targets/J.inc) ; Select pinout J
$include (targets/J.inc) ; Select pinout J
ELSEIF ESCNO == K_ ELSEIF ESCNO == K_
$include (targets/K.inc) ; Select pinout K
$include (targets/K.inc) ; Select pinout K
ELSEIF ESCNO == L_ ELSEIF ESCNO == L_
$include (targets/L.inc) ; Select pinout L
$include (targets/L.inc) ; Select pinout L
ELSEIF ESCNO == M_ ELSEIF ESCNO == M_
$include (targets/M.inc) ; Select pinout M
$include (targets/M.inc) ; Select pinout M
ELSEIF ESCNO == N_ ELSEIF ESCNO == N_
$include (targets/N.inc) ; Select pinout N
$include (targets/N.inc) ; Select pinout N
ELSEIF ESCNO == O_ ELSEIF ESCNO == O_
$include (targets/O.inc) ; Select pinout O
$include (targets/O.inc) ; Select pinout O
ELSEIF ESCNO == P_ ELSEIF ESCNO == P_
$include (targets/P.inc) ; Select pinout P
$include (targets/P.inc) ; Select pinout P
ELSEIF ESCNO == Q_ ELSEIF ESCNO == Q_
$include (targets/Q.inc) ; Select pinout Q
$include (targets/Q.inc) ; Select pinout Q
ELSEIF ESCNO == R_ ELSEIF ESCNO == R_
$include (targets/R.inc) ; Select pinout R
$include (targets/R.inc) ; Select pinout R
ELSEIF ESCNO == S_ ELSEIF ESCNO == S_
$include (targets/S.inc) ; Select pinout S
$include (targets/S.inc) ; Select pinout S
ELSEIF ESCNO == T_ ELSEIF ESCNO == T_
$include (targets/T.inc) ; Select pinout T
$include (targets/T.inc) ; Select pinout T
ELSEIF ESCNO == U_ ELSEIF ESCNO == U_
$include (targets/U.inc) ; Select pinout U
$include (targets/U.inc) ; Select pinout U
ELSEIF ESCNO == V_ ELSEIF ESCNO == V_
$include (targets/V.inc) ; Select pinout V
$include (targets/V.inc) ; Select pinout V
ELSEIF ESCNO == W_ ELSEIF ESCNO == W_
$include (targets/W.inc) ; Select pinout W
$include (targets/W.inc) ; Select pinout W
ENDIF ENDIF
;**** **** **** **** **** ;**** **** **** **** ****
@ -134,50 +134,50 @@ Eep_ESC_MCU: DB "#BLHELI$EFM8B21#" ; Project and MCU tag (16 Bytes)
ENDIF ENDIF
Interrupt_Table_Definition MACRO Interrupt_Table_Definition MACRO
CSEG AT 0 ; Code segment start
CSEG AT 0 ;; Code segment start
jmp reset jmp reset
CSEG AT 03h ; Int0 interrupt
CSEG AT 03h ;; Int0 interrupt
jmp int0_int jmp int0_int
CSEG AT 0Bh ; Timer0 overflow interrupt
CSEG AT 0Bh ;; Timer0 overflow interrupt
jmp t0_int jmp t0_int
CSEG AT 13h ; Int1 interrupt
CSEG AT 13h ;; Int1 interrupt
jmp int1_int jmp int1_int
CSEG AT 1Bh ; Timer1 overflow interrupt
CSEG AT 1Bh ;; Timer1 overflow interrupt
jmp t1_int jmp t1_int
CSEG AT 2Bh ; Timer2 overflow interrupt
CSEG AT 2Bh ;; Timer2 overflow interrupt
jmp t2_int jmp t2_int
CSEG AT 5Bh ; PCA interrupt
CSEG AT 5Bh ;; PCA interrupt
jmp pca_int jmp pca_int
CSEG AT 73h ; Timer3 overflow/compare interrupt
CSEG AT 73h ;; Timer3 overflow/compare interrupt
jmp t3_int jmp t3_int
ENDM ENDM
Initialize_PCA MACRO Initialize_PCA MACRO
mov PCA0CN0, #40h ; PCA enabled
mov PCA0MD, #08h ; PCA clock is system clock
mov PCA0CN0, #40h ;; PCA enabled
mov PCA0MD, #08h ;; PCA clock is system clock
mov PCA0PWM, #(80h + PWM_BITS_H) ; Enable PCA auto-reload registers and set pwm cycle length (8-11 bits)
mov PCA0PWM, #(80h + PWM_BITS_H) ;; Enable PCA auto-reload registers and set pwm cycle length (8-11 bits)
IF PWM_CENTERED == 1 IF PWM_CENTERED == 1
mov PCA0CENT, #03h ; Center aligned pwm
mov PCA0CENT, #03h ;; Center aligned pwm
ELSE ELSE
mov PCA0CENT, #00h ; Edge aligned pwm
mov PCA0CENT, #00h ;; Edge aligned pwm
ENDIF ENDIF
ENDM ENDM
Enable_Power_Pwm_Module MACRO Enable_Power_Pwm_Module MACRO
IF FETON_DELAY == 0 IF FETON_DELAY == 0
mov PCA0_POWER_MODULE, #4Ah ; Enable comparator of module, enable match, set pwm mode
mov PCA0_POWER_MODULE, #4Ah ;; Enable comparator of module, enable match, set pwm mode
ELSE ELSE
mov PCA0_POWER_MODULE, #42h ; Enable comparator of module, set pwm mode
mov PCA0_POWER_MODULE, #42h ;; Enable comparator of module, set pwm mode
ENDIF ENDIF
ENDM ENDM
Enable_Damp_Pwm_Module MACRO Enable_Damp_Pwm_Module MACRO
IF FETON_DELAY == 0 IF FETON_DELAY == 0
mov PCA0_DAMP_MODULE, #00h ; Disable
mov PCA0_DAMP_MODULE, #00h ;; Disable
ELSE ELSE
mov PCA0_DAMP_MODULE, #42h ; Enable comparator of module, set pwm mode
mov PCA0_DAMP_MODULE, #42h ;; Enable comparator of module, set pwm mode
ENDIF ENDIF
ENDM ENDM
@ -216,14 +216,14 @@ set_pca_int_hi_pwm:
Enable_CCF_Interrupt Enable_CCF_Interrupt
pca_enabled: pca_enabled:
ENDIF ENDIF
orl EIE1, #10h ; Enable pca interrupts
orl EIE1, #10h ;; Enable pca interrupts
ENDM ENDM
Set_MCU_Clk_24MHz MACRO Set_MCU_Clk_24MHz MACRO
mov CLKSEL, #13h ; Set clock to 24MHz (Oscillator 1 divided by 2)
mov CLKSEL, #13h ;; Set clock to 24MHz (Oscillator 1 divided by 2)
mov SFRPAGE, #10h mov SFRPAGE, #10h
mov PFE0CN, #00h ; Set flash timing for 24MHz and disable prefetch engine
mov PFE0CN, #00h ;; Set flash timing for 24MHz and disable prefetch engine
mov SFRPAGE, #00h mov SFRPAGE, #00h
clr Flag_Clock_At_48MHz clr Flag_Clock_At_48MHz
@ -231,10 +231,10 @@ ENDM
Set_MCU_Clk_48MHz MACRO Set_MCU_Clk_48MHz MACRO
mov SFRPAGE, #10h mov SFRPAGE, #10h
mov PFE0CN, #30h ; Set flash timing for 48MHz and enable prefetch engine
mov PFE0CN, #30h ;; Set flash timing for 48MHz and enable prefetch engine
mov SFRPAGE, #00h mov SFRPAGE, #00h
mov CLKSEL, #03h ; Set clock to 48MHz (Oscillator 1)
mov CLKSEL, #03h ;; Set clock to 48MHz (Oscillator 1)
setb Flag_Clock_At_48MHz setb Flag_Clock_At_48MHz
ENDM ENDM
Loading…
Cancel
Save