comparison code_part1/OSTC_code_asm_part1/pled_outputs.asm @ 77:de8ed3c55db1

FIX branch merging
author JeanDo
date Tue, 07 Dec 2010 18:33:06 +0100
parents cc657f9915d8
children 31fa973a70fd
comparison
equal deleted inserted replaced
76:cc657f9915d8 77:de8ed3c55db1
67 PLED_standard_color_6: 67 PLED_standard_color_6:
68 movf oled1_temp,W ; Color should be OK... 68 movf oled1_temp,W ; Color should be OK...
69 call PLED_set_color 69 call PLED_set_color
70 return 70 return
71 PLED_standard_color2: 71 PLED_standard_color2:
72 movlw color_standard1 ; Reset Color 72 movlw 0xFF ; Force full white.
73 call PLED_set_color 73 call PLED_set_color
74 return 74 return
75 75
76 PLED_color_code macro color_code_temp 76 PLED_color_code macro color_code_temp
77 movlw color_code_temp 77 movlw color_code_temp