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

Yay, it works again

This commit is contained in:
Neale Pickett 2014-01-12 11:05:18 -07:00
parent 6b7bc46b7c
commit 5b2a7017b4
3 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
avr.h
View File

@ -7,13 +7,12 @@
#define bit(pin, bit, on) pin = (on ? (pin | bit) : (pin & ~bit)) #define bit(pin, bit, on) pin = (on ? (pin | bit) : (pin & ~bit))
#define sin(on) bit(PORTA, _BV(3), on) #define sin(on) bit(PORTA, _BV(SIN), on)
#define sclk(on) bit(PORTA, _BV(4), on) #define sclk(on) bit(PORTA, _BV(SCLK), on)
#define sltch(on) bit(PORTA, _BV(5), on) #define sltch(on) bit(PORTA, _BV(SLTCH), on)
#define nesclk(on) bit(PORTA, _BV(0), on) #define nesclk(on) bit(PORTA, _BV(NESCLK), on)
#define nesltch(on) bit(PORTA, _BV(1), on) #define nesltch(on) bit(PORTA, _BV(NESLTCH), on)
#define NESOUT 2
#define nesout() ((PINA & _BV(NESOUT)) << NESOUT) #define nesout() ((PINA & _BV(NESOUT)) << NESOUT)
void init(void); void init(void);

8
config.h
View File

@ -8,4 +8,12 @@
#define JAM_INDICATOR 1 #define JAM_INDICATOR 1
#define JAM_DIGITS 3 #define JAM_DIGITS 3
// Set these to the PORTA pins you use
#define SIN 0
#define SCLK 1
#define SLTCH 2
#define NESCLK 3
#define NESLTCH 4
#define NESOUT 5
#endif #endif

48
main.c
View File

@ -126,6 +126,22 @@ write_num(uint16_t number, int digits)
} }
} }
uint16_t
clock_of_jiffies(int16_t jiffies)
{
uint16_t seconds;
uint16_t ret;
// People read "0:00" as the time being out.
// Add 0.9 seconds to make the ALU's truncation be a "round up"
seconds = (abs(jiffies) + 9) / 10;
ret = (seconds / 60) * 100; // Minutes
ret += seconds % 60; // Seconds
return ret;
}
/* /*
* Update all the digits * Update all the digits
*/ */
@ -133,12 +149,12 @@ void
draw() draw()
{ {
uint16_t jclk; uint16_t jclk = clock_of_jiffies(jam_clock);
uint16_t pclk; uint16_t pclk = clock_of_jiffies(period_clock);
bool blank = ((state == TIMEOUT) && (jiffies % 8 == 0)); bool blank = ((state == TIMEOUT) && (jiffies % 8 == 0));
// Segments test mode // Segments test mode
if (1 || (KONAMI == state)) { if (KONAMI == state) {
int i; int i;
for (i = 0; i < 12; i += 1) { for (i = 0; i < 12; i += 1) {
@ -150,30 +166,6 @@ draw()
return; return;
} }
jclk = (abs(jam_clock / 600) % 10) * 1000;
jclk += abs(jam_clock) % 600;
pclk = (abs(period_clock / 10) / 60) * 100;
pclk += abs(period_clock / 10) % 60;
#ifdef DEMO
if (jam_clock == 0) {
if (state == LINEUP) {
state = JAM;
jam_clock = jam_duration;
} else {
state = LINEUP;
jam_clock = lineup_duration;
}
}
if (period_clock == 0) {
period_clock = -(30 * 60 * 10);
jam_clock = jam_duration;
state = JAM;
}
#endif
// Score A // Score A
write_num(score_b, SCORE_DIGITS); write_num(score_b, SCORE_DIGITS);
@ -329,7 +321,7 @@ setup()
void void
loop() loop()
{ {
// update_controller(); update_controller();
if (tick) { if (tick) {
tick = false; tick = false;