Avant début piste

pfrison
1 parent b08b30f4
Showing 4 changed files with 33 additions and 22 deletions Show diff stats
tests/atmega2560/ledControl/ledControl.c
tests/atmega2560/ledControl/makefile
tests/atmega2560/ledControl/tlc5947.c
tests/atmega2560/ledControl/tlc5947.h
@@ -2,8 +2,10 @@
 #include <util/delay.h>
 #include <math.h>
  
+#include "tlc5947.h"
+
 #define	NB_DRIVERS 3
-#define MAX_VALUE 85 //TODO tbd !
+#define MAX_VALUE 80 //TODO tbd !
 #define DELAY 100
  
 int main(void){
@@ -16,15 +18,15 @@ int main(void){
 	while(1){
 		// Build animation
 		for(int i=0; i<NB_DRIVERS * DLED_CHANNELS; i++){
-			double sinIn = (double) animTick / 8;
-			unsigned int val = (unsigned int) (0.5 + (sin(sinIn) * 0.5));
-			ledValues[i] = val * MAX_VALUE;
+			double val = (double) (animTick % 21) / 20;
+			ledValues[i] = (unsigned int) (val * MAX_VALUE);
 		}
+
 		animTick++;
 		if(animTick >= 10000)
 			animTick = 0;
  
-		set_LED_Drivers(groupes, NB_DRIVERS);
+		set_LED_Drivers(ledValues, NB_DRIVERS);
 		_delay_ms(100);
 	}
 	return 0;
@@ -21,7 +21,7 @@ clean:
 	rm -f *.o *.hex *.elf
  
 %.o:%.c
-	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@
+	$(CC) -c $(CPPFLAGS) $(CFLAGS) $< -o $@ -lm
  
 $(TARGET).elf: $(OBJS)
 	$(CC) $(LDFLAGS) -o $@ $(OBJS)
 #include <avr/io.h>
+
 #include "tlc5947.h"
  
-#define	DLED_CHANNELS	24
+#define DDR_DLED_CLOCK	DDRE
+#define PORT_DLED_CLOCK	PORTE
+
+#define DDR_DLED_DATA	DDRG
+#define PORT_DLED_DATA	PORTG
  
-#define DDR_DLED	DDRD
-#define PORT_DLED	PORTD
+#define DDR_DLED_LATCH	DDRB
+#define PORT_DLED_LATCH	PORTB
  
-#define PIN_DLED_CLOCK	5
-#define PIN_DLED_DATA	4
-#define PIN_DLED_LATCH	6
+#define PIN_DLED_CLOCK	0x08
+#define PIN_DLED_DATA	0x20
+#define PIN_DLED_LATCH	0x10
  
 void init_LED_Drivers(int nb){
     // LED drivers I/O as outputs
-    DDR_DLED |= (1<<PIN_DLED_CLOCK) | (1<<PIN_DLED_DATA) | (1<<PIN_DLED_LATCH);
+    DDR_DLED_CLOCK |= PIN_DLED_CLOCK;
+    DDR_DLED_DATA |= PIN_DLED_DATA;
+    DDR_DLED_LATCH |= PIN_DLED_LATCH;
     // Set LATCH output low
-    PORT_DLED &= ~(1<<PIN_DLED_LATCH);
+    PORT_DLED_LATCH &= ~PIN_DLED_LATCH;
 }
  
  
 void set_LED_Drivers(unsigned int pwm[], int nb){
     // Set LATCH output low
-    PORT_DLED &= ~(1<<PIN_DLED_LATCH);
+    PORT_DLED_LATCH &= ~PIN_DLED_LATCH;
     // 24 channels per TLC5947
     int i;
     for(i=DLED_CHANNELS*nb-1; i>=0; i--){
@@ -29,24 +36,24 @@ void set_LED_Drivers(unsigned int pwm[], int nb){
         int j;
         for(j=0; j<12; j++){
             // Set CLOCK output low
-            PORT_DLED &= ~(1<<PIN_DLED_CLOCK);
+            PORT_DLED_CLOCK &= ~PIN_DLED_CLOCK;
  
             // Set DATA as stated by bit #j of i
             if(v & 0x0800)
-                PORT_DLED |= (1<<PIN_DLED_DATA);
+                PORT_DLED_DATA |= PIN_DLED_DATA;
             else
-                PORT_DLED &= ~(1<<PIN_DLED_DATA);
+                PORT_DLED_DATA &= ~PIN_DLED_DATA;
  
             // Set CLOCK output HIGH
-            PORT_DLED |= (1<<PIN_DLED_CLOCK);
+            PORT_DLED_CLOCK |= PIN_DLED_CLOCK;
             v <<= 1;
         }
     }
     // Set CLOCK output low
-    PORT_DLED &= ~(1<<PIN_DLED_CLOCK);
+    PORT_DLED_CLOCK &= ~PIN_DLED_CLOCK;
  
     // Set LATCH output high
-    PORT_DLED |= (1<<PIN_DLED_LATCH);
+    PORT_DLED_LATCH |= PIN_DLED_LATCH;
     // Set LATCH output low
-    PORT_DLED &= ~(1<<PIN_DLED_LATCH);
+    PORT_DLED_LATCH &= ~PIN_DLED_LATCH;
 }
 #ifndef TLC5947
 #define TLC5947
  
+#define	DLED_CHANNELS	24
+
 void init_LED_Drivers(int nb);
 void set_LED_Drivers(unsigned int pwm[], int nb);