From b550994effff6eccbabd6cf9f9c97acdd0f6e54e Mon Sep 17 00:00:00 2001 From: Amy Gale Ruth Bowersox Date: Sun, 1 Dec 2019 15:45:46 -0700 Subject: [PATCH] corrected compilation errors --- src/gpio.c | 8 ++++---- src/main.c | 2 +- src/time_func.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gpio.c b/src/gpio.c index f6b5d98..8042f3b 100644 --- a/src/gpio.c +++ b/src/gpio.c @@ -66,13 +66,13 @@ int Gpio_read_buttons(void) int rc = 0; if (bcm2835_gpio_lev(GLINE_BUTTON1) == LOW) - rc |= STATE_BUTTON1; + rc |= GRB_STATE_BUTTON1; if (bcm2835_gpio_lev(GLINE_BUTTON2) == LOW) - rc |= STATE_BUTTON2; + rc |= GRB_STATE_BUTTON2; if (bcm2835_gpio_lev(GLINE_BUTTON3) == LOW) - rc |= STATE_BUTTON3; + rc |= GRB_STATE_BUTTON3; if (bcm2835_gpio_lev(GLINE_BUTTON4) == LOW) - rc |= STATE_BUTTON4; + rc |= GRB_STATE_BUTTON4; return rc; } diff --git a/src/main.c b/src/main.c index 03a10dd..868fbee 100644 --- a/src/main.c +++ b/src/main.c @@ -34,7 +34,7 @@ int main(int argc, char *argv[]) if (msg.attrs[0] == 1) { Log(LINFO, "Backlight ON."); - Gpio_set_backlight(GRB_BACKLIGHT_MAX); + Gpio_set_backlight(GSB_BACKLIGHT_MAX); } if (msg.attrs[0] == 2) { diff --git a/src/time_func.c b/src/time_func.c index bce148a..8bdda09 100644 --- a/src/time_func.c +++ b/src/time_func.c @@ -16,10 +16,10 @@ TIMESTAMP Time_since_epoch(void) TIMESTAMP Time_since_start(void) { - return TimeSinceEpoch() - start_timestamp; + return Time_since_epoch() - start_timestamp; } void Time_init(void) { - start_timestamp = TimeSinceEpoch(); + start_timestamp = Time_since_epoch(); }