Browse Source

style: Clean up formatting, style and comments

main
Mathias Rasmussen 4 years ago
parent
commit
345bb0f5a8
  1. 32
      Bluejay.asm
  2. 2
      Common.inc

32
Bluejay.asm

@ -140,9 +140,8 @@ Temp7 EQU R6
Temp8 EQU R7
;**** **** **** **** ****
; Register definitions
DSEG AT 20h ; Variables segment
; RAM definitions
DSEG AT 20h ; Ram data segment, bit-addressable
Bit_Access: DS 1 ; MUST BE AT THIS ADDRESS. Variable at bit accessible address (for non interrupt routines)
Bit_Access_Int: DS 1 ; Variable at bit accessible address (for interrupts)
@ -192,8 +191,6 @@ CLOCK_SET_AT_48MHZ EQU 4 ; Set if 48MHz MCUs run at 48MHz
Tlm_Data_L: DS 1 ; DShot telemetry data low byte
Tlm_Data_H: DS 1 ; DShot telemetry data high byte
;**** **** **** **** ****
; RAM definitions
DSEG AT 30h ; Ram data segment, direct addressing
Power_On_Wait_Cnt_L: DS 1 ; Power on wait counter (lo byte)
Power_On_Wait_Cnt_H: DS 1 ; Power on wait counter (hi byte)
@ -1008,15 +1005,15 @@ IF FETON_DELAY != 0 ; HI/LO enable style drivers
mov A, Current_Power_Pwm_Reg_H
jnb ACC.PWR_H_BIT, pca_int_hi_pwm
mov A, PCA0H
jb ACC.PCA_BIT, pca_int_exit ; Power below 50%, update pca in the 0x00-0x0F range
mov A, PCA0H ; Power below 50%, update pca in the 0x00-0x0F range
jb ACC.PCA_BIT, pca_int_exit ; PWM edge selection bit (continue if up edge)
jb ACC.(PCA_BIT-1), pca_int_exit
sjmp pca_int_set_pwm
pca_int_hi_pwm:
mov A, PCA0H
jnb ACC.PCA_BIT, pca_int_exit ; Power above 50%, update pca in the 0x20-0x2F range
mov A, PCA0H ; Power above 50%, update pca in the 0x20-0x2F range
jnb ACC.PCA_BIT, pca_int_exit ; PWM edge selection bit (continue if down edge)
jb ACC.(PCA_BIT-1), pca_int_exit
pca_int_set_pwm:
@ -1098,6 +1095,7 @@ dshot_gcr_encode_0_11001:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_1_11011:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
@ -1105,18 +1103,21 @@ dshot_gcr_encode_1_11011:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_2_10010:
DShot_GCR_Get_Time
Push_Reg Temp1, A
Push_Reg Temp1, DShot_GCR_Pulse_Time_3
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_3_10011:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
Push_Reg Temp1, DShot_GCR_Pulse_Time_3
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_4_11101:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
@ -1124,12 +1125,14 @@ dshot_gcr_encode_4_11101:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_5_10101:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_6_10110:
DShot_GCR_Get_Time
Push_Reg Temp1, A
@ -1137,6 +1140,7 @@ dshot_gcr_encode_6_10110:
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_7_10111:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
@ -1144,6 +1148,7 @@ dshot_gcr_encode_7_10111:
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_8_11010:
DShot_GCR_Get_Time
Push_Reg Temp1, A
@ -1151,23 +1156,27 @@ dshot_gcr_encode_8_11010:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_9_01001:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_3
mov B, DShot_GCR_Pulse_Time_2
ret
dshot_gcr_encode_A_01010:
DShot_GCR_Get_Time
Push_Reg Temp1, A
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
mov B, DShot_GCR_Pulse_Time_2
ret
dshot_gcr_encode_B_01011:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
mov B, DShot_GCR_Pulse_Time_2
ret
dshot_gcr_encode_C_11110:
DShot_GCR_Get_Time
Push_Reg Temp1, A
@ -1176,12 +1185,14 @@ dshot_gcr_encode_C_11110:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_1
ret
dshot_gcr_encode_D_01101:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_2
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_2
ret
dshot_gcr_encode_E_01110:
DShot_GCR_Get_Time
Push_Reg Temp1, A
@ -1189,6 +1200,7 @@ dshot_gcr_encode_E_01110:
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
mov B, DShot_GCR_Pulse_Time_2
ret
dshot_gcr_encode_F_01111:
Push_Reg Temp1, B
Push_Reg Temp1, DShot_GCR_Pulse_Time_1
@ -1304,8 +1316,8 @@ dshot_12bit_encode:
dshot_packet_stage_1:
; Read commutation period
clr IE_EA
mov Tlm_Data_H, Comm_Period4x_H
mov Tlm_Data_L, Comm_Period4x_L
mov Tlm_Data_H, Comm_Period4x_H
setb IE_EA
; Multiply period by 3/4 (1/2 + 1/4)

2
Common.inc

@ -167,8 +167,8 @@ Decode_DShot_2Bit MACRO dest, decode_fail
mov A, dest ; Shift bit into data byte
rlc A
mov dest, A
inc Temp1 ; Next bit
movx A, @Temp1
mov Temp6, A
clr C

Loading…
Cancel
Save