refactor names, 3

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 _blue
+  .byte _off
+  .byte _yellow
+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,39 +1,33 @@
   .file "main.S"
 
 #include <msp430g2553.h>
-
+#include "colors.h"
 
 #define PC r0
 #define SP r1
 #define SR r2
 
 
-  .section ".rodata","a"
+#define SIGNAL_REGISTER r4
+#define DATA_NEXT_ADDRESS_REGISTER r7
+#define DATA_END_ADDRESS_REGISTER r8
+#define DATA_REGISTER r5
+#define NEXT_DATA_REGISTER r9
+
+#define BIT_COUNTER_REGISTER r6
+
+
+  .section ".data"
 screendata:
-  .byte   0x01
-  .byte   0x03
-  .byte   0x07
-  .byte   0x0f
+  .rept 3
+  .byte 0
+  .endr
 screendataend:
-  .byte   0xff
-red:
-colors1:
-  .byte   0b01001111
-colors2:
-  .byte   0b01000111
-colors3:
-  .byte   0b01000011
-  .byte   0
-blue:
-  .byte   0b11001111
-  .byte   0b11000111
-  .byte   0b11000011
-  .byte   0
-green:
-  .byte   0b10001111
-  .byte   0b10000111
-  .byte   0b10000011
-  .byte   0
+  .byte 0xff
+
+  .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
@@ -54,8 +48,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
@@ -79,14 +83,14 @@ init:
   mov.w   #OUTMOD_7,&TA1CCTL2
 
   ;; initialize bit-counter for isr
-  mov.b   #0x01,r6
+  mov.b   #0x01, BIT_COUNTER_REGISTER
   ;; initialize isr-sync register, signal BYTE_DONE for the first start
-  mov.b   #0x01,r4
+  mov.b   #0x01, SIGNAL_REGISTER
 
   ;; screen data start/next into r7
-  mov.w   #screendata, r7
+  mov.w   #screendata, DATA_NEXT_ADDRESS_REGISTER
   ;; screen data end into r8
-  mov.w   #screendataend, r8
+  mov.w   #screendataend, DATA_END_ADDRESS_REGISTER
 
   ;; start timer in up mode
   bis.w   #MC0,&TA1CTL
@@ -100,31 +104,51 @@ init:
   ;; r5: data byte to be handled by isr
 mainloop:
   ;; prepare next byte to handle by isr
-  cmp.w   r7,r8
+  cmp.w   DATA_NEXT_ADDRESS_REGISTER, DATA_END_ADDRESS_REGISTER
   jz      mainloop_data_done
 
   ;; load next data byte
-  mov.b   @r7,r9
-  inc.w   r7
+  mov.b   @DATA_NEXT_ADDRESS_REGISTER, NEXT_DATA_REGISTER
+  inc.w   DATA_NEXT_ADDRESS_REGISTER
 
-mainloop_wait_for_isr:
-  ;; check bit0 in sync register
-  bit     #0x01,r4
-  jz      mainloop_wait_for_isr
+  ;; multiple color code by four to get color data
+  rla.b   NEXT_DATA_REGISTER
+  rla.b   NEXT_DATA_REGISTER
 
-  ;; load data
-  mov.b   r9,r5
-  ;; clear BYTE_DONE
-  bic     #0x01, r4
   ;; enable isr
-  bis     #0x02, r4
+  bis     #0x02, SIGNAL_REGISTER
+
+mainloop_wait_for_isr_0:
+  ;; check bit0 in sync register
+  bit     #0x01, SIGNAL_REGISTER
+  jz      mainloop_wait_for_isr_0
+  ;; load data
+  mov.b   colors(NEXT_DATA_REGISTER), DATA_REGISTER
+  ;; clear BYTE_DONE
+  bic     #0x01,  SIGNAL_REGISTER
+mainloop_wait_for_isr_1:
+  ;; check bit0 in sync register
+  bit     #0x01, SIGNAL_REGISTER
+  jz      mainloop_wait_for_isr_1
+  ;; load data
+  mov.b   colors+1(NEXT_DATA_REGISTER), DATA_REGISTER
+  ;; clear BYTE_DONE
+  bic     #0x01,  SIGNAL_REGISTER
+mainloop_wait_for_isr_2:
+  ;; check bit0 in sync register
+  bit     #0x01, SIGNAL_REGISTER
+  jz      mainloop_wait_for_isr_2
+  ;; load data
+  mov.b   colors+2(NEXT_DATA_REGISTER), DATA_REGISTER
+  ;; clear BYTE_DONE
+  bic     #0x01,  SIGNAL_REGISTER
 
   ;; continue
   jmp     mainloop
 
 mainloop_data_done:
   ;; signal all data processed, isr finish
-  bis     #0x04, r4
+  bis     #0x04,  SIGNAL_REGISTER
   bis     #BIT2, &P1OUT
   ;; continue
   jmp     mainloop
@@ -136,11 +160,11 @@ mainloop_data_done:
   ;; r6: exclusively used by isr as bit-counter
 timer1_a0_isr:
   ;; check isr enable bit
-  bit     #0x02,r4
+  bit     #0x02, SIGNAL_REGISTER
   jz      timer1_a0_isr_exit
 
   ;; shift msb of data register r5 into carry flag and set or reset P1.0 accordingly
-  rla.b   r5
+  rla.b   DATA_REGISTER
   jnc     timer1_a0_isr_false_bit
   bis     #BIT0,&P1OUT
   jmp     timer1_a0_isr_end
@@ -152,18 +176,19 @@ timer1_a0_isr_end:
   bis     #BIT1, &P1OUT
 
   ;; roll bit-counter
-  rla.b   r6
+  rla.b   BIT_COUNTER_REGISTER
   jnc     timer1_a0_isr_exit
 
   ;; reset bit-counter
-  mov.b   #0x01,r6
+  mov.b   #0x01, BIT_COUNTER_REGISTER
   ;; signal byte done
-  bis     #0x01,r4
+  bis     #0x01, SIGNAL_REGISTER
 
-  bit     #0x04, r4
+  ;; check whether all data are processed
+  bit     #0x04,  SIGNAL_REGISTER
   jz      timer1_a0_isr_exit
   ;; disable isr
-  bic     #0x02, r4
+  bic     #0x02,  SIGNAL_REGISTER
   ;; disable output
   bic     #BIT1, &P1OUT
 
@@ -172,12 +197,6 @@ timer1_a0_isr_exit:
 
 
 
-;timer0_a1_isr:
-;  reti
-
-; --- interrupt vectors ---
-;  .section "__interrupt_vector_9","ax",@progbits
-;  .word   timer0_a1_isr
   .section "__interrupt_vector_14","ax",@progbits
   .word   timer1_a0_isr
 

readme.md

@@ -1,5 +1,27 @@
+## Debugging
+
+```
 mspdebug rf2500 gdb
+
 msp430-gdb -x firmware.gdb
+```
 
 Attention: the gdb in the TI toolchain package is broken, use the one from Debian
 
+
+
+## Signals Working Cycler
+
+These signals are related to code under tag `cycler_works_include_output_stage`.
+
+First octets:
+
+![](./docs/cycler_working_first_octets.png)
+
+Last octets:
+
+![](./docs/cycler_working_last_octets.png)
+
+Schematics and legend for signals:
+
+![](./docs/schematics.jpeg)