X-Git-Url: https://www.fi.muni.cz/~kas/git//home/kas/public_html/git/?p=bike-lights.git;a=blobdiff_plain;f=firmware%2Fpwm.c;fp=firmware%2Fpwm.c;h=da9fe3df679b9feb1faede1ed11205773890a824;hp=201770f8152f440fe7ef21a219c336fb9f382b5f;hb=64a3d3a699cd60b7a6b4b06c5c38689975a3d460;hpb=68424ad19806bd6f0b857e878bf632cf5851e7c5

diff --git a/firmware/pwm.c b/firmware/pwm.c
index 201770f..da9fe3d 100644
--- a/firmware/pwm.c
+++ b/firmware/pwm.c
@@ -4,8 +4,18 @@
 
 #include "lights.h"
 
+static uint16_t pwm[N_PWMLEDS];
+static volatile unsigned char step;
+
 void init_pwm()
 {
+	int i;
+
+	step = 0;
+
+	for (i = 0; i < N_PWMLEDS; i++)
+		pwm[n] = 0;
+
 	/* Async clock */
 	PLLCSR = _BV(PLLE);
 
@@ -37,6 +47,11 @@ void init_pwm()
 
 void susp_pwm()
 {
+	unsigned char i;
+
+	for (i = 0; i < N_PWMLEDS; i++)
+		pwm[i] = 0;
+
 	DDRB &= ~(_BV( PB1 ) | _BV( PB3 ) | _BV( PB5 ));
 	TCCR1D = TCCR1C = TCCR1B = TCCR1A = 0;
 	TIMSK = 0;
@@ -45,6 +60,8 @@ void susp_pwm()
 
 void pwm_off(unsigned char n)
 {
+	pwm[n] = 0;
+
 	switch (n) {
 	case 0: DDRB &= ~_BV(PB1); break;
 	case 1: DDRB &= ~_BV(PB3); break;
@@ -52,12 +69,10 @@ void pwm_off(unsigned char n)
 	}
 }
 
-void pwm_set(unsigned char n, uint16_t stride)
+static void pwm_update_hw(unsigned char n)
 {
 	unsigned char hi, lo;
-
-	if (stride > PWM_MAX)
-		stride = PWM_MAX;
+	uint16_t stride = (pwm[n] + step) >> PWM_STEP_SHIFT;
 
 	if (n == 2)
 		stride = PWM_MAX - stride;
@@ -84,6 +99,27 @@ void pwm_set(unsigned char n, uint16_t stride)
 	}
 }
 
+void pwm_set(unsigned char n, uint16_t stride)
+{
+	if (((stride + (1 << PWM_STEP_SHIFT)) >> PWM_STEP_SHIFT) >= PWM_MAX)
+		stride = PWM_MAX << PWM_STEP_SHIFT;
+
+	pwm[n] = stride;
+	pwm_update_hw(n);
+}
+
+void pwm_timer()
+{
+	unsigned char i;
+
+	if (++step >= (1 << PWM_STEP_SHIFT))
+		step = 0;
+
+	for (i = 0; i < N_PWMLEDS; i++)
+		if (pwm[n])
+			pwm_update_hw(n);
+}
+
 #if 0
 static void inline pwm_handler()
 {