Revert "merging back to the main truck so I can have a clean place to…

… make more changes from."

This reverts commit 2d4b349.

Firmware/cuff.asm

@@ -1,8 +1,6 @@
 .include "tn4def.inc"
 
-
 .equ    LED = 0				; LED connected to PB0
-.equ DELAYTIME = 50 ; 50 ms between PWM changes
 
 .cseg 
 
@@ -12,25 +10,19 @@
 	rjmp	WDT
 
 .def	temp   		= R16	; general purpose temp
-.def idx = R17			; sine table indexer
-.def delaycnt1 = R18		; counter for 1ms delay loop
-.def delayms = R19		; keeps track of how many ms left in delay
 
 RESET:
 	sbi		DDRB, LED		; LED output
 	sbi		PORTB, LED    	; LED off
 
 	; setting all pullups on unused pins (for power savings)
-	; would having them all be outputs use less power?
 	ldi		temp, (1<<PUEB3)|(1<<PUEB2)|(1<<PUEB1)		
 	out		PUEB, temp
 
-	; changing clock prescale to slow down the processing power 
-	; (for power savings)
+	; changing clock prescale to slow down the processing power (for power savings)
 	ldi		temp, 0xD8		; write signature
 	out		CCP, temp
-	; scale to divide by 256. So 8Mhz -> 312.5KHz
-	ldi temp, (1<<CLKPS3)|(0<<CLKPS2)|(0<<CLKPS1)|(0<<CLKPS0) 
+	ldi		temp, (1<<CLKPS3)|(0<<CLKPS2)|(0<<CLKPS1)|(0<<CLKPS0)	; scale to divide by 256
 	out		CLKPSR, temp
 
 	; set up fast PWM output timer WGM[3:0] = 0101
@@ -47,8 +39,7 @@ RESET:
 	; setup watchdog
 	ldi		temp, 0xD8		; write signature
 	out		CCP, temp
-	; set watchdog in interrupt mode and 4k cycles
-	ldi temp, (0<<WDE)|(1<<WDIE)|(1<<WDP0) 
+	ldi		temp, (0<<WDE)|(1<<WDIE)|(1<<WDP0)	; set watchdog in interrupt mode and 4k cycles
 	out		WDTCSR, temp
 
 	; enable sleep mode
@@ -57,66 +48,28 @@ RESET:
 
 	sei		; enable global interrupts
 
-	ldi idx, 0
+LOOPSTART:
+   	ldi ZH, high(PULSETAB*2) + 0x40   ; This is start of Code in Tiny4 (0x4000)
+   	ldi ZL, low (PULSETAB*2) 		; init Z-pointer to storage bytes 
 LOOP:
-	; This is start of Code in Tiny10 (0x4000)
-	ldi ZH,	high(SINETAB*2) + 0x40 
-	ldi ZL, low (SINETAB*2) ; init Z-pointer to storage bytes
-
-	add ZL, idx
-	inc idx
-
-	ld temp, Z ; load next led brightness
+	ld		temp, Z+			; load next led brightness
 	cpi		temp, 0			; last entry?
 	brne	NORELOAD
-	ldi idx, 0 ; rewind to the beginning of the table
+	; if temp == 0, means we reached the end, so reload the table index
+    rjmp    LOOPSTART
+
 NORELOAD:
 	out		OCR0AL, temp	; Shove the brightness into the PWM driver
 
 	; reset the watchdog timer to full value and sleep until it pops an interrupt
-
-	; unfortunately we want to sleep 6k cycles to match the timing so sleep twice!
-	ldi temp, 0xD8		; write signature
-	out CCP, temp
-	; set watchdog in interrupt mode and 2k cycles
-	ldi temp, (0<<WDE)|(1<<WDIE)
-	out WDTCSR, temp
-
-	wdr
-	sleep
-
-	ldi temp, 0xD8		; write signature
-	out CCP, temp
-	; set watchdog in interrupt mode and 4k cycles
-	ldi temp, (0<<WDE)|(1<<WDIE)|(1<<WDP0) 
-	out WDTCSR, temp
-
 	wdr
 	sleep
 
-
 	rjmp	LOOP
 
-
-	; delay!
-;	ldi delayms, DELAYTIME ; delay 10 ms
-;DELAY:
-;	ldi delaycnt1, 0xFF
-;DELAY1MS: ; this loop takes about 1ms (with 1 MHz clock)
-;	dec delaycnt1 ; 1 clock
-;	cpi delaycnt1, 0 ; 1 clock
-;	brne DELAY1MS ; 2 clocks (on avg)
-;	dec delayms
-;	cpi delayms, 0
-;	brne DELAY
-;	rjmp LOOP
-
-
 ; this is a do nothing interrupt handler for the watchdog interrupt
 WDT:
 	reti
 
-SINETAB:
-.db 1, 1, 2, 3, 5, 8, 11, 15, 20, 25, 30, 36, 43, 49, 56, 64, 72, 80, 88, 97, 105, 114, 123, 132, 141, 150, 158, 167, 175, 183, 191, 199, 206, 212, 219, 225, 230, 235, 240, 244, 247, 250, 252, 253, 254, 255, 254, 253, 252, 250, 247, 244, 240, 235, 230, 225, 219, 212, 206, 199, 191, 183, 175, 167, 158, 150, 141, 132, 123, 114, 105, 97, 88, 80, 72, 64, 56, 49, 43, 36, 30, 25, 20, 15, 11, 8, 5, 3, 2, 1, 0
-
-
+PULSETAB:
+.db 255, 255, 255, 255, 250, 235, 228, 216, 207, 194, 185, 180, 171, 164, 153, 145, 143, 138, 131, 121, 116, 112, 110, 106, 96, 92, 88, 88, 82, 75, 73, 72, 71, 66, 60, 57, 56, 55, 52, 47, 44, 42, 40, 38, 36, 33, 31, 30, 27, 26, 25, 23, 21, 20, 19, 16, 16, 14, 14, 12, 12, 11, 9, 9, 8, 7, 7, 6, 4, 4, 4, 4, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 4, 4, 5, 7, 7, 8, 9, 12, 13, 15, 16, 18, 21, 22, 25, 28, 30, 33, 36, 40, 43, 46, 53, 55, 59, 63, 69, 76, 83, 86, 90, 97, 106, 116, 125, 129, 138, 146, 162, 172, 186, 196, 210, 228, 248, 255, 255, 255, 0