aw/pentabug
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

really ignore ignored worsd

Browse Source
This commit is contained in:
bigalex 2012-08-06 00:31:04 +02:00
parent e854e40974
commit cdb59f596d
1 changed files with 10 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
firmware/main.c
View File

@ -8,6 +8,11 @@
volatile uint8_t sample_pending; volatile uint8_t sample_pending;
uint8_t counter = 0;
uint8_t pulsewidth = 0;
uint16_t pulsecounter = 0;
uint16_t pwmwidth = 0xFF;
uint16_t maxcounter = 0x90;
// sample rate is 8M / (5 * 64) = 25000 // sample rate is 8M / (5 * 64) = 25000
@ -29,10 +34,7 @@ typedef struct {
static synth_t synth; static synth_t synth;
uint8_t counter = 0;
uint8_t pulsewidth = 0;
uint16_t maxcounter = 0xFF;
uint16_t pulsecounter = 0;
static void synth_init(void) static void synth_init(void)
{ {
@ -74,8 +76,8 @@ static inline void init_pwm(void)
{ {
//PB2 set to output: //PB2 set to output:
DDRB |= (1 << PORTB2); DDRB |= (1 << PORTB2);
OCR1B = 0x001F; //preselect some default OCR1B = 0x0001; //preselect some default
ICR1 = 0x00FF; // TOP-wert ICR1 = pwmwidth; // TOP-wert
TCCR1A = (1 << COM1B1) | (1 << WGM11); // only b-chan , fastpwm (mode 14) TCCR1A = (1 << COM1B1) | (1 << WGM11); // only b-chan , fastpwm (mode 14)
TCCR1B = (1 << WGM13) | (1 << WGM12) | (1 << CS10); //Fastpwm, no prescale TCCR1B = (1 << WGM13) | (1 << WGM12) | (1 << CS10); //Fastpwm, no prescale
@ -153,7 +155,7 @@ ISR(TIMER0_COMPA_vect)
pulsecounter++; pulsecounter++;
if (pulsecounter > 0x0200){ if (pulsecounter > 0x0300){
pulsecounter = 0; pulsecounter = 0;
pulsewidth++; pulsewidth++;
if (pulsewidth > maxcounter){ if (pulsewidth > maxcounter){
@ -163,14 +165,9 @@ ISR(TIMER0_COMPA_vect)
OCR1B = ((counter > pulsewidth) ? maxcounter : 0x00); OCR1B = ((counter > pulsewidth) ? pwmwidth : 0);
//OCR1B = counter;
//OCR1B = OCR1B + 4;
if (OCR1B > 0x007F) {
// OCR1B = 0x00F;
}
PORTC ^= 0b01; PORTC ^= 0b01;
//ICR1 = synth.output; //ICR1 = synth.output;