Old animation cycle removed.
Prepared to support V-USB.
This commit is contained in:
Aaron Mueller
parent
b1b9c93fe8
commit
35cf5ba2e9
3 changed files with 303 additions and 239 deletions
126
firmware/main.c
126
firmware/main.c
|
|
@ -1,122 +1,28 @@
|
||||||
// Mini-LED-Cube 1.0
|
/*
|
||||||
//
|
* Based on the code of the Mini-LED-Cube 1.0
|
||||||
// Copyright (C) 2009 Paul Wilhelm <paul@mosfetkiller.de>
|
*
|
||||||
// http://mosfetkiller.de/?s=miniledcube
|
* Copyright (C) 2009 Paul Wilhelm <paul@mosfetkiller.de>
|
||||||
|
* http: *mosfetkiller.de/?s=miniledcube
|
||||||
// Interner RC-Oszillator, CKDIV8 Disabled
|
*
|
||||||
#define F_CPU 8000000UL
|
* Changed by Kai Lauterbach (klaute at web dot de)
|
||||||
|
*/
|
||||||
// Includes
|
|
||||||
#include <util/delay.h>
|
|
||||||
#include <avr/interrupt.h>
|
|
||||||
#include <avr/io.h>
|
|
||||||
#include <avr/pgmspace.h>
|
|
||||||
|
|
||||||
// Bitpopelei
|
|
||||||
#define set_bit(var, bit) ((var) |= (1 << (bit)))
|
|
||||||
#define clear_bit(var, bit) ((var) &= (unsigned)~(1 << (bit)))
|
|
||||||
|
|
||||||
// Bool
|
|
||||||
#define FALSE 0
|
|
||||||
#define TRUE 1
|
|
||||||
|
|
||||||
// Definitionen
|
|
||||||
#define PIXEL_TON 30
|
|
||||||
#define PIXEL_TOFF 10
|
|
||||||
|
|
||||||
// Cube-Array
|
|
||||||
unsigned char cube[3][3][3];
|
|
||||||
unsigned char buffer[3][3][3]; // Framebuffer
|
|
||||||
|
|
||||||
// Prototypen
|
|
||||||
void init();
|
|
||||||
|
|
||||||
// Programmzähler
|
|
||||||
unsigned int program_counter = 0;
|
|
||||||
|
|
||||||
// Framezähler
|
|
||||||
volatile unsigned char frame_counter = 0, fps = 0;
|
|
||||||
|
|
||||||
|
|
||||||
// Pixelmakros
|
|
||||||
#define PSET(x,y,z) (0b01000000 | ((z * 3 + x) + y * 9))
|
|
||||||
#define PCLEAR(x,y,z) (0b00000000 | ((z * 3 + x) + y * 9))
|
|
||||||
|
|
||||||
// Instructions
|
|
||||||
#define CLEAR 0b10000000
|
|
||||||
#define SET 0b10010000
|
|
||||||
#define FPS 0b10110000
|
|
||||||
#define NEXT 0b11110000
|
|
||||||
|
|
||||||
// Variablen
|
|
||||||
#define VAR_FPS 0
|
|
||||||
|
|
||||||
// Für CLEAR und SET
|
|
||||||
#define CLEAR_ALL 0
|
|
||||||
#define SET_ALL 0
|
|
||||||
|
|
||||||
// Für NEXT
|
|
||||||
#define JUMP_FORWARD 1
|
|
||||||
#define JUMP_BACKWARD 2
|
|
||||||
|
|
||||||
|
|
||||||
// Programmcode
|
|
||||||
const prog_char program_1[] =
|
|
||||||
{
|
|
||||||
FPS, 10,
|
|
||||||
|
|
||||||
CLEAR, SET + 12, NEXT, CLEAR, SET + 14, NEXT, // Vor- und zurück tanzen
|
|
||||||
CLEAR, SET + 12, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
CLEAR, SET + 12, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
CLEAR, SET + 12, NEXT, CLEAR, SET + 15,
|
|
||||||
|
|
||||||
FPS, 5, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT, // Umdrehung
|
|
||||||
FPS, 5, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
FPS, 6, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
FPS, 6, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
FPS, 7, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
FPS, 7, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
FPS, 8, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
FPS, 8, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
FPS, 9, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
FPS, 9, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
FPS, 10, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
|
||||||
FPS, 10, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
|
||||||
CLEAR, SET + 8, NEXT, CLEAR, SET + 12, NEXT, // Umfallen
|
|
||||||
CLEAR, SET + 4, NEXT, CLEAR, SET + 5, NEXT, CLEAR, SET + 6, NEXT, // Ebenen
|
|
||||||
CLEAR, SET + 1, NEXT, CLEAR, SET + 2, NEXT, CLEAR, SET + 3, NEXT,
|
|
||||||
CLEAR, SET + 7, NEXT, CLEAR, SET + 8, NEXT, CLEAR, SET + 9, NEXT,
|
|
||||||
|
|
||||||
FPS, 10, // Außen langlaufen
|
|
||||||
|
|
||||||
CLEAR,
|
|
||||||
PSET(0,0,0), PSET(1,0,0), PSET(0,1,0), PSET(1,1,0), PSET(0,2,0), PSET(1,2,0), NEXT,
|
|
||||||
PCLEAR(0,0,0), PSET(2,0,0), PCLEAR(0,1,0), PSET(2,1,0), PCLEAR(0,2,0), PSET(2,2,0), NEXT,
|
|
||||||
PCLEAR(1,0,0), PSET(2,0,1), PCLEAR(1,1,0), PSET(2,1,1), PCLEAR(1,2,0), PSET(2,2,1), NEXT,
|
|
||||||
PCLEAR(2,0,0), PSET(2,0,2), PCLEAR(2,1,0), PSET(2,1,2), PCLEAR(2,2,0), PSET(2,2,2), NEXT,
|
|
||||||
PCLEAR(2,0,1), PSET(1,0,2), PCLEAR(2,1,1), PSET(1,1,2), PCLEAR(2,2,1), PSET(1,2,2), NEXT,
|
|
||||||
PCLEAR(2,0,2), PSET(0,0,2), PCLEAR(2,1,2), PSET(0,1,2), PCLEAR(2,2,2), PSET(0,2,2), NEXT,
|
|
||||||
PCLEAR(1,0,2), PSET(0,0,1), PCLEAR(1,1,2), PSET(0,1,1), PCLEAR(1,2,2), PSET(0,2,1), NEXT,
|
|
||||||
PCLEAR(0,0,2), PSET(0,0,0), PCLEAR(0,1,2), PSET(0,1,0), PCLEAR(0,2,2), PSET(0,2,0), NEXT,
|
|
||||||
PCLEAR(0,0,1), PCLEAR(0,1,1), PCLEAR(0,2,1),
|
|
||||||
|
|
||||||
SET + 7, NEXT, CLEAR, SET + 8, NEXT, CLEAR, SET + 9, NEXT,
|
|
||||||
CLEAR, SET + 8, NEXT, CLEAR, SET + 7, NEXT,
|
|
||||||
};
|
|
||||||
|
|
||||||
const prog_char *program_pointer = program_1;
|
|
||||||
unsigned int program_length = sizeof(program_1);
|
|
||||||
|
|
||||||
|
#include "main.h"
|
||||||
|
|
||||||
// Main
|
// Main
|
||||||
int main(void)
|
int main(void)
|
||||||
{
|
{
|
||||||
// Initialisierung
|
// Initialisierung
|
||||||
init();
|
init();
|
||||||
|
init_usb();
|
||||||
|
|
||||||
// Hauptschleife
|
// Hauptschleife
|
||||||
while (1)
|
while (1)
|
||||||
{
|
{
|
||||||
|
//wdt_reset(); // we are alive, so don't reset the µC
|
||||||
|
usbPoll(); // keep connected
|
||||||
|
|
||||||
|
/*
|
||||||
unsigned char instruction = pgm_read_byte(&(program_pointer[program_counter]));
|
unsigned char instruction = pgm_read_byte(&(program_pointer[program_counter]));
|
||||||
|
|
||||||
if ((instruction & 0b10000000) == 0)
|
if ((instruction & 0b10000000) == 0)
|
||||||
|
|
@ -213,6 +119,8 @@ int main(void)
|
||||||
|
|
||||||
// Programmzähler erhöhen, bzw. bei Erreichen des Programmendes wieder von vorn beginnen
|
// Programmzähler erhöhen, bzw. bei Erreichen des Programmendes wieder von vorn beginnen
|
||||||
if (program_counter + 1 < program_length) program_counter++; else program_counter = 0;
|
if (program_counter + 1 < program_length) program_counter++; else program_counter = 0;
|
||||||
|
*/
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
@ -249,6 +157,7 @@ void init()
|
||||||
SIGNAL(SIG_OUTPUT_COMPARE1A)
|
SIGNAL(SIG_OUTPUT_COMPARE1A)
|
||||||
{
|
{
|
||||||
// Pixel multiplexen
|
// Pixel multiplexen
|
||||||
|
/**/
|
||||||
for (unsigned char z = 0; z < 3; z++)
|
for (unsigned char z = 0; z < 3; z++)
|
||||||
{
|
{
|
||||||
for (unsigned char y = 0; y < 3; y++)
|
for (unsigned char y = 0; y < 3; y++)
|
||||||
|
|
@ -277,4 +186,5 @@ SIGNAL(SIG_OUTPUT_COMPARE1A)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
/**/
|
||||||
}
|
}
|
||||||
|
|
|
||||||
122
firmware/main.h
Normal file
122
firmware/main.h
Normal file
|
|
@ -0,0 +1,122 @@
|
||||||
|
// Mini-LED-Cube 1.0
|
||||||
|
//
|
||||||
|
// Copyright (C) 2009 Paul Wilhelm <paul@mosfetkiller.de>
|
||||||
|
// http://mosfetkiller.de/?s=miniledcube
|
||||||
|
//
|
||||||
|
// Changed by Kai Lauterbach (klaute at web dot de)
|
||||||
|
|
||||||
|
// Interner RC-Oszillator, CKDIV8 Disabled
|
||||||
|
|
||||||
|
#ifndef __main_h__
|
||||||
|
#define __main_h__
|
||||||
|
|
||||||
|
#define F_CPU 12000000UL
|
||||||
|
|
||||||
|
// Includes
|
||||||
|
#include <util/delay.h>
|
||||||
|
#include <avr/interrupt.h>
|
||||||
|
#include <avr/io.h>
|
||||||
|
#include <avr/pgmspace.h>
|
||||||
|
//#include <avr/wdt.h>
|
||||||
|
|
||||||
|
// Bitpopelei
|
||||||
|
#define set_bit(var, bit) ((var) |= (1 << (bit)))
|
||||||
|
#define clear_bit(var, bit) ((var) &= (unsigned)~(1 << (bit)))
|
||||||
|
|
||||||
|
// Bool
|
||||||
|
#define FALSE 0
|
||||||
|
#define TRUE 1
|
||||||
|
|
||||||
|
// Definitionen
|
||||||
|
#define PIXEL_TON 30
|
||||||
|
#define PIXEL_TOFF 10
|
||||||
|
|
||||||
|
// Cube-Array
|
||||||
|
unsigned char cube[3][3][3];
|
||||||
|
unsigned char buffer[3][3][3]; // Framebuffer
|
||||||
|
|
||||||
|
// Prototypen
|
||||||
|
void init(void);
|
||||||
|
|
||||||
|
extern void init_usb(void);
|
||||||
|
extern void usbPoll(void);
|
||||||
|
|
||||||
|
/*
|
||||||
|
// Programmzähler
|
||||||
|
unsigned int program_counter = 0;
|
||||||
|
|
||||||
|
// Framezähler
|
||||||
|
volatile unsigned char frame_counter = 0, fps = 0;
|
||||||
|
|
||||||
|
|
||||||
|
// Pixelmakros
|
||||||
|
#define PSET(x,y,z) (0b01000000 | ((z * 3 + x) + y * 9))
|
||||||
|
#define PCLEAR(x,y,z) (0b00000000 | ((z * 3 + x) + y * 9))
|
||||||
|
|
||||||
|
// Instructions
|
||||||
|
#define CLEAR 0b10000000
|
||||||
|
#define SET 0b10010000
|
||||||
|
#define FPS 0b10110000
|
||||||
|
#define NEXT 0b11110000
|
||||||
|
|
||||||
|
// Variablen
|
||||||
|
#define VAR_FPS 0
|
||||||
|
|
||||||
|
// Für CLEAR und SET
|
||||||
|
#define CLEAR_ALL 0
|
||||||
|
#define SET_ALL 0
|
||||||
|
|
||||||
|
// Für NEXT
|
||||||
|
#define JUMP_FORWARD 1
|
||||||
|
#define JUMP_BACKWARD 2
|
||||||
|
|
||||||
|
|
||||||
|
// Animation in pgmspace
|
||||||
|
const prog_char program_1[] =
|
||||||
|
{
|
||||||
|
FPS, 10,
|
||||||
|
|
||||||
|
CLEAR, SET + 12, NEXT, CLEAR, SET + 14, NEXT, // Vor- und zurück tanzen
|
||||||
|
CLEAR, SET + 12, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
CLEAR, SET + 12, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
CLEAR, SET + 12, NEXT, CLEAR, SET + 15,
|
||||||
|
|
||||||
|
FPS, 5, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT, // Umdrehung
|
||||||
|
FPS, 5, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
FPS, 6, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
FPS, 6, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
FPS, 7, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
FPS, 7, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
FPS, 8, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
FPS, 8, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
FPS, 9, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
FPS, 9, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
FPS, 10, CLEAR, SET + 8, NEXT, CLEAR, SET + 14, NEXT,
|
||||||
|
FPS, 10, CLEAR, SET + 2, NEXT, CLEAR, SET + 15, NEXT,
|
||||||
|
CLEAR, SET + 8, NEXT, CLEAR, SET + 12, NEXT, // Umfallen
|
||||||
|
CLEAR, SET + 4, NEXT, CLEAR, SET + 5, NEXT, CLEAR, SET + 6, NEXT, // Ebenen
|
||||||
|
CLEAR, SET + 1, NEXT, CLEAR, SET + 2, NEXT, CLEAR, SET + 3, NEXT,
|
||||||
|
CLEAR, SET + 7, NEXT, CLEAR, SET + 8, NEXT, CLEAR, SET + 9, NEXT,
|
||||||
|
|
||||||
|
FPS, 10, // Außen langlaufen
|
||||||
|
|
||||||
|
CLEAR,
|
||||||
|
PSET(0,0,0), PSET(1,0,0), PSET(0,1,0), PSET(1,1,0), PSET(0,2,0), PSET(1,2,0), NEXT,
|
||||||
|
PCLEAR(0,0,0), PSET(2,0,0), PCLEAR(0,1,0), PSET(2,1,0), PCLEAR(0,2,0), PSET(2,2,0), NEXT,
|
||||||
|
PCLEAR(1,0,0), PSET(2,0,1), PCLEAR(1,1,0), PSET(2,1,1), PCLEAR(1,2,0), PSET(2,2,1), NEXT,
|
||||||
|
PCLEAR(2,0,0), PSET(2,0,2), PCLEAR(2,1,0), PSET(2,1,2), PCLEAR(2,2,0), PSET(2,2,2), NEXT,
|
||||||
|
PCLEAR(2,0,1), PSET(1,0,2), PCLEAR(2,1,1), PSET(1,1,2), PCLEAR(2,2,1), PSET(1,2,2), NEXT,
|
||||||
|
PCLEAR(2,0,2), PSET(0,0,2), PCLEAR(2,1,2), PSET(0,1,2), PCLEAR(2,2,2), PSET(0,2,2), NEXT,
|
||||||
|
PCLEAR(1,0,2), PSET(0,0,1), PCLEAR(1,1,2), PSET(0,1,1), PCLEAR(1,2,2), PSET(0,2,1), NEXT,
|
||||||
|
PCLEAR(0,0,2), PSET(0,0,0), PCLEAR(0,1,2), PSET(0,1,0), PCLEAR(0,2,2), PSET(0,2,0), NEXT,
|
||||||
|
PCLEAR(0,0,1), PCLEAR(0,1,1), PCLEAR(0,2,1),
|
||||||
|
|
||||||
|
SET + 7, NEXT, CLEAR, SET + 8, NEXT, CLEAR, SET + 9, NEXT,
|
||||||
|
CLEAR, SET + 8, NEXT, CLEAR, SET + 7, NEXT,
|
||||||
|
};
|
||||||
|
|
||||||
|
const prog_char *program_pointer = program_1;
|
||||||
|
unsigned int program_length = sizeof(program_1);
|
||||||
|
*/
|
||||||
|
#endif // __main_h__
|
||||||
|
|
||||||
32
firmware/requests.h
Normal file
32
firmware/requests.h
Normal file
|
|
@ -0,0 +1,32 @@
|
||||||
|
/* Name: requests.h
|
||||||
|
* Project: custom-class, a basic USB example
|
||||||
|
* Author: Christian Starkjohann
|
||||||
|
* Creation Date: 2008-04-09
|
||||||
|
* Tabsize: 4
|
||||||
|
* Copyright: (c) 2008 by OBJECTIVE DEVELOPMENT Software GmbH
|
||||||
|
* License: GNU GPL v2 (see License.txt), GNU GPL v3 or proprietary (CommercialLicense.txt)
|
||||||
|
* This Revision: $Id: requests.h 692 2008-11-07 15:07:40Z cs $
|
||||||
|
*/
|
||||||
|
|
||||||
|
/* This header is shared between the firmware and the host software. It
|
||||||
|
* defines the USB request numbers (and optionally data types) used to
|
||||||
|
* communicate between the host and the device.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#ifndef __REQUESTS_H_INCLUDED__
|
||||||
|
#define __REQUESTS_H_INCLUDED__
|
||||||
|
|
||||||
|
#define CUSTOM_RQ_SET_STATUS 1
|
||||||
|
/* Set the LED status. Control-OUT.
|
||||||
|
* The requested status is passed in the "wValue" field of the control
|
||||||
|
* transfer. No OUT data is sent. Bit 0 of the low byte of wValue controls
|
||||||
|
* the LED.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#define CUSTOM_RQ_GET_STATUS 2
|
||||||
|
/* Get the current LED status. Control-IN.
|
||||||
|
* This control transfer involves a 1 byte data phase where the device sends
|
||||||
|
* the current status to the host. The status is in bit 0 of the byte.
|
||||||
|
*/
|
||||||
|
|
||||||
|
#endif /* __REQUESTS_H_INCLUDED__ */
|
||||||
Loading…
Reference in a new issue