Browse Source

refactor: Reorganize pca interrupt and macros

main
Mathias Rasmussen 4 years ago
parent
commit
67e4f96742
  1. 20
      Bluejay.asm
  2. 10
      Common.inc

20
Bluejay.asm

@ -1020,19 +1020,27 @@ pca_int_hi_pwm:
jb ACC.(PCA_BIT-1), pca_int_exit jb ACC.(PCA_BIT-1), pca_int_exit
pca_int_set_pwm: pca_int_set_pwm:
Set_Power_Pwm_Regs
Set_Damp_Pwm_Regs
mov Current_Power_Pwm_Reg_H, Power_Pwm_Reg_H
Disable_COVF_Interrupt
ENDIF
; Set power pwm registers
mov PCA0_POWER_L, Power_Pwm_Reg_L
mov PCA0_POWER_H, Power_Pwm_Reg_H
IF FETON_DELAY != 0
; Set damp pwm registers
mov PCA0_DAMP_L, Damp_Pwm_Reg_L
mov PCA0_DAMP_H, Damp_Pwm_Reg_H
ENDIF
ELSE ; EN/PWM style drivers
Set_Power_Pwm_Regs
mov Current_Power_Pwm_Reg_H, Power_Pwm_Reg_H mov Current_Power_Pwm_Reg_H, Power_Pwm_Reg_H
Disable_COVF_Interrupt Disable_COVF_Interrupt
IF FETON_DELAY == 0 ; EN/PWM style drivers
Disable_CCF_Interrupt Disable_CCF_Interrupt
ENDIF ENDIF
anl EIE1, #0EFh ; Pwm updated, disable pca interrupts anl EIE1, #0EFh ; Pwm updated, disable pca interrupts
pca_int_exit: pca_int_exit:
Clear_COVF_Interrupt Clear_COVF_Interrupt
IF FETON_DELAY == 0 IF FETON_DELAY == 0

10
Common.inc

@ -220,16 +220,6 @@ ELSE
ENDIF ENDIF
ENDM ENDM
Set_Power_Pwm_Regs MACRO
mov PCA0_POWER_L, Power_Pwm_Reg_L
mov PCA0_POWER_H, Power_Pwm_Reg_H
ENDM
Set_Damp_Pwm_Regs MACRO
mov PCA0_DAMP_L, Damp_Pwm_Reg_L
mov PCA0_DAMP_H, Damp_Pwm_Reg_H
ENDM
Clear_COVF_Interrupt MACRO Clear_COVF_Interrupt MACRO
anl PCA0PWM, #0DFh anl PCA0PWM, #0DFh
ENDM ENDM

Loading…
Cancel
Save