stuartl/atinysynth
1
0
Fork 0
mirror of https://github.com/sjlongland/atinysynth.git synced 2025-09-26 02:13:29 +10:00
Code Issues Releases Wiki Activity

attiny861 main: Fix adjacent light channel bleed.

Browse Source 
Move to a 3-state machine for PWMing lights so that we don't get bleed
from one channel into the next due to propagation delay in the 74HC574.
This commit is contained in:
Stuart Longland 2017-07-15 15:41:20 +10:00
parent 7bb914755c
commit 0ef982d463
Signed by: stuartl
GPG Key ID: F954BBBB7948D546
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ports/attiny861/main.c
View File

@ -229,8 +229,15 @@ int main(void) {
return 0;
}
#define GPIO_STATE_READ (0)
#define GPIO_STATE_SELECT (1)
#define GPIO_STATE_PWM (2)
ISR(TIMER0_COMPA_vect) {
if (PORTB & GPIO_EN) {
static uint8_t gpio_state = GPIO_STATE_READ;
static uint8_t cur_light = 0;
if (gpio_state == GPIO_STATE_READ) {
/* We are reading inputs */
static uint8_t last = 0;
static uint8_t delay = DEBOUNCE_DELAY;
@ -258,22 +265,27 @@ ISR(TIMER0_COMPA_vect) {
button_hit |= button_state & diff;
button_release |= (~button_state) & diff;
}
/* Turn off lights */
OCR1D = 0;
/* Switch to setting outputs */
PORTB &= ~GPIO_EN;
DDRA = 0xff;
} else {
gpio_state = GPIO_STATE_SELECT;
} else if (gpio_state == GPIO_STATE_SELECT) {
/* We are setting outputs */
static uint8_t cur_light = 0;
OCR1D = light_output[cur_light];
PORTA = (1 << cur_light);
/* Switch on input MUXes */
PORTB |= GPIO_EN;
/* Switch to PWM */
PORTA = 0xff;
DDRA = 0x00;
gpio_state = GPIO_STATE_PWM;
} else if (gpio_state == GPIO_STATE_PWM) {
OCR1D = light_output[cur_light];
/* Increment the light for later (modulo 8) */
cur_light++;
cur_light &= 0x07;
/* Switch on input MUXes */
PORTB |= GPIO_EN;
/* Switch to reading inputs */
PORTA = 0xff;
DDRA = 0x00;
gpio_state = GPIO_STATE_READ;
}
/* Tick down the one-second timer */