Somewhat working

programs/project.prog

@@ -30,7 +30,7 @@ scrolling_count_addr: .word 0x000F00A4
 priority_mask: .word 0xFFFFFF03
 write_mask: .word 0x1000000
 clear_mask: .word 0x100
-scrolling_cnt_value: .word 0x20FC000 // for real board
+scrolling_cnt_value: .word 0x10FC000 // for real board
 // scrolling_cnt_value: .word 0x500 // for simulation
 
 // CAN
@@ -46,10 +46,10 @@ can_output_control_addr: .word 0x000F0108
 // CAN Constants
 acceptance_code: .word 0x00
 acceptance_mask: .word 0xFF
-btr0: .word 0x45 // for Real board
-btr1: .word 0x16 // for Real board
-// btr0: .word 0x80
-// btr1: .word 0x48
+// btr0: .word 0x45 // for Real board
+// btr1: .word 0x16 // for Real board
+btr0: .word 0x80
+btr1: .word 0x48
 output_control: .word 0x02
 control: .word 0xFE
 rx_interrupt_mask: .word 0x01
@@ -63,11 +63,6 @@ main:
     ldr r0, >priority_mask
     and r14, r0, r14
 
-    // (Re)set scrolling speed
-    ldr r5, >scrolling_count_addr
-    ldr r4, >scrolling_cnt_value
-    st32 r5, r4
-
     // --- CAN init ---
     ldr r0, >can_acceptance_code_addr
     ldr r3, >acceptance_code
@@ -99,6 +94,11 @@ main:
     addi r3, 0x01
     st32 r0, r3
 
+    // (Re)set scrolling speed
+    ldr r5, >scrolling_count_addr
+    ldr r4, >scrolling_cnt_value
+    st32 r5, r4
+
     // Set LED to state
     ldr r0, >led_addr
     clr r3
@@ -255,8 +255,6 @@ can_send_data_add_frame:
 
 .align
 can_rx_data0_addr: .word 0x000F0116
-can_rx_data1_addr: .word 0x000F0117
-can_rx_data2_addr: .word 0x000F0118
 
 can_rx_handler:
     // Dispatch CAN frame
@@ -372,6 +370,8 @@ handle_data_clear_frame:
 scrolling_addr_ptr: .word =scrolling_addr
 write_mask_ptr: .word =write_mask
 can_command_addr_ptr0: .word =can_command_addr
+can_rx_data1_addr: .word 0x000F0117
+can_rx_data2_addr: .word 0x000F0118
 
 can_handle_data_add_frame:
     ldr r0, >can_rx_data1_addr