neale
/
hw-rollerderby-scoreboard
mirror of https://github.com/nealey/hw-rollerderby-scoreboard
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix right score, implement points removal

This commit is contained in:
Neale Pickett 2013-03-31 21:54:31 -06:00
parent 19c1c4bb76
commit dccbe8a47e
1 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
main.c
View File

@ -105,8 +105,6 @@ draw()
//XXX testing //XXX testing
write_num(score_a, 3);
if ((state == TIMEOUT) && (jam_clock % 8 == 0)) { if ((state == TIMEOUT) && (jam_clock % 8 == 0)) {
for (clk = 0; clk < 4; clk += 1) { for (clk = 0; clk < 4; clk += 1) {
write(0); write(0);
@ -117,6 +115,8 @@ draw()
write_num(clk, 4); write_num(clk, 4);
} }
write_num(score_b, 2);
if (state == SETUP) { if (state == SETUP) {
write(setup_digits[2]); write(setup_digits[2]);
write(setup_digits[1]); write(setup_digits[1]);
@ -128,7 +128,7 @@ draw()
write_num(clk, 4); write_num(clk, 4);
} }
//write_num(score_b, 2); write_num(score_a, 2);
latch(); latch();
pulse(); pulse();
@ -142,8 +142,6 @@ nesprobe()
{ {
int i; int i;
uint8_t state = 0; uint8_t state = 0;
uint8_t ret = 0;
static uint8_t last_controller = 0;
nesltch(true); nesltch(true);
nesltch(false); nesltch(false);
@ -160,44 +158,47 @@ nesprobe()
} }
// Only report button down events. // Only report button down events.
ret = (last_controller ^ state) & state; return state;
last_controller = state;
return ret;
} }
void void
update_controller() update_controller()
{ {
uint8_t val = nesprobe(); static uint8_t last_val = 0;
uint8_t cur;
uint8_t pressed;
int inc = 1; int inc = 1;
if ((val & BTN_A) && ((state != JAM) || (jam_clock == 0))) { cur = nesprobe();
pressed = (last_val ^ cur) & cur;
last_val = cur;
if ((pressed & BTN_A) && ((state != JAM) || (jam_clock == 0))) {
state = JAM; state = JAM;
jam_clock = jam_duration; jam_clock = jam_duration;
} }
if ((val & BTN_B) && ((state != LINEUP) || (jam_clock == 0))) { if ((pressed & BTN_B) && ((state != LINEUP) || (jam_clock == 0))) {
state = LINEUP; state = LINEUP;
jam_clock = lineup_duration; jam_clock = lineup_duration;
} }
if ((val & BTN_START) && (state != TIMEOUT)) { if ((pressed & BTN_START) && (state != TIMEOUT)) {
state = TIMEOUT; state = TIMEOUT;
jam_clock = 1; jam_clock = 1;
} }
if (val & BTN_SELECT) { if (cur & BTN_SELECT) {
inc = -1; inc = -1;
// XXX: if in timeout, select digit to adjust // XXX: if in timeout, select digit to adjust
} }
if (val & BTN_LEFT) { if (pressed & BTN_LEFT) {
score_a += inc; score_a += inc;
} }
if (val & BTN_RIGHT) { if (pressed & BTN_RIGHT) {
score_b += inc; score_b += inc;
} }
} }