refactor

Makefile

@@ -10,7 +10,7 @@ ASFLAGS=$(COMMON) -D__ASSEMBLER__
 
 LDFLAGS=-L $(TOOLCHAIN_PREFIX)/include -Wl,-Map,firmware.map -nostdlib -nostartfiles -T $(MCU).ld
 
-$(ARTIFACT).elf:	main.o
+$(ARTIFACT).elf:	colors.o main.o
 	$(CC) -o $@ $(LDFLAGS) $^
 	$(OBJDUMP) -D $(ARTIFACT).elf > $(ARTIFACT).txt
   

colors.S

@@ -0,0 +1,44 @@
+#include "colors.h"
+
+  .section ".rodata","a"
+screendata_tmpl:
+  .global screendata_tmpl
+  .byte _red
+  .byte _off
+  .byte _white
+screendataend_tmpl:
+  .byte   0xff
+
+;; color definitions according to https://learn.sparkfun.com/tutorials/lilypad-protosnap-plus-activity-guide/3-custom-color-mixing
+colors:
+  .global colors
+  ;;      red, green, blue, padding
+red:
+  .byte   0xff, 0x00, 0x00, 0
+blue:
+  .byte   0x00, 0x00, 0xff, 0
+green:
+  .byte   0x00, 0xff, 0x00, 0
+orange:
+  .byte   0xff, 0x80, 0x00, 0
+rose:
+  .byte   0xff, 0x00, 0x80, 0
+magenta:
+  .byte   0xff, 0x00, 0xff, 0
+violet:
+  .byte   0x80, 0x00, 0xff, 0
+azure:
+  .byte   0x00, 0x80, 0xff, 0
+cyan:
+  .byte   0x00, 0xff, 0xff, 0
+springgreen:
+  .byte   0x00, 0xff, 0x80, 0
+chartreuse:
+  .byte   0x80, 0xff, 0x00, 0
+yellow:
+  .byte   0xff, 0xff, 0x00, 0
+white:
+  .byte   0xff, 0xff, 0xff, 0
+off:
+  .byte   0x00, 0x00, 0x00, 0
+

colors.h

@@ -0,0 +1,22 @@
+#ifndef _COLORS_H_
+#define _COLORS_H_
+
+
+#define _red 0x00
+#define _blue 0x01
+#define _green 0x02
+#define _orange 0x03
+#define _rose 0x04
+#define _magenta 0x05
+#define _violet 0x06
+#define _azure 0x07
+#define _cyan 0x08
+#define _springgreen 0x09
+#define _chartreuse 0x0a
+#define _yellow 0x0b
+#define _white 0x0c
+#define _off 0x0d
+
+
+
+#endif

main.S

@@ -1,42 +1,24 @@
   .file "main.S"
 
 #include <msp430g2553.h>
-
+#include "colors.h"
 
 #define PC r0
 #define SP r1
 #define SR r2
 
-#define _red 0x00
-#define _blue 0x01
-#define _green 0x02
 
-  .section ".rodata","a"
+  .section ".data"
 screendata:
-  .byte   _red
-  .byte   _blue
-  .byte   _green
+  .rept 3
+  .byte 0
+  .endr
 screendataend:
-  .byte   0xff
+  .byte 0xff
 
-red:
-colors1:
-  .byte   0b11111111
-colors2:
-  .byte   0b00000000
-colors3:
-  .byte   0b00000000
-  .byte   0
-blue:
-  .byte   0b00000000
-  .byte   0b00000000
-  .byte   0b11111111
-  .byte   0
-green:
-  .byte   0b00000000
-  .byte   0b11111111
-  .byte   0b00000000
-  .byte   0
+  .section ".rodata"
+  .extern screendata_tmpl
+  .extern colors
 
   ;; .text is the name of the section, it is a hint for the linker to
   ;; allocate the section
@@ -57,8 +39,18 @@ _start:
   ;; initialize stack pointer with value from linker
   mov.w   #__stack, SP
 
-  mov.w   #0xaaaa, r7
-  mov.w   #0x5555, r8
+  ;; ----------------------------------------------
+  ;; load data from template area in rom into ram
+  mov.w   #screendata, r7
+  mov.w   #screendataend, r8
+  mov.w   #screendata_tmpl, r9
+_start_load_next:
+  mov.b   @r9, @r7
+  inc.w   r7
+  inc.w   r9
+  cmp.w   r7, r8
+  jnz _start_load_next
+  ;; ----------------------------------------------
 
 init:
   ;; configuration of GPIO Ports
@@ -114,22 +106,6 @@ mainloop:
   rla.b   r9
   rla.b   r9
 
-; This code already works
-;mainloop_wait_for_isr:
-;  ;; check bit0 in sync register
-;  bit     #0x01,r4
-;  jz      mainloop_wait_for_isr
-;
-;  ;; load data
-;  mov.b   r9,r5
-;  ;; clear BYTE_DONE
-;  bic     #0x01, r4
-;  ;; enable isr
-;  bis     #0x02, r4
-;
-;  ;; continue
-;  jmp     mainloop
-
   ;; enable isr
   bis     #0x02, r4
 
@@ -138,7 +114,7 @@ mainloop_wait_for_isr_0:
   bit     #0x01,r4
   jz      mainloop_wait_for_isr_0
   ;; load data
-  mov.b   colors1(r9), r5
+  mov.b   colors(r9), r5
   ;; clear BYTE_DONE
   bic     #0x01, r4
 mainloop_wait_for_isr_1:
@@ -146,7 +122,7 @@ mainloop_wait_for_isr_1:
   bit     #0x01,r4
   jz      mainloop_wait_for_isr_1
   ;; load data
-  mov.b   colors2(r9), r5
+  mov.b   colors+1(r9), r5
   ;; clear BYTE_DONE
   bic     #0x01, r4
 mainloop_wait_for_isr_2:
@@ -154,7 +130,7 @@ mainloop_wait_for_isr_2:
   bit     #0x01,r4
   jz      mainloop_wait_for_isr_2
   ;; load data
-  mov.b   colors3(r9), r5
+  mov.b   colors+2(r9), r5
   ;; clear BYTE_DONE
   bic     #0x01, r4