From c7b55411093ab9b46053f4aa8392653316fd697b Mon Sep 17 00:00:00 2001 From: Savanni D'Gerinel Date: Tue, 26 Jul 2022 21:12:11 -0400 Subject: [PATCH] Adjust the LCD display settings --- radio-rx/main.c | 11 ++++++++--- rfm69hcw/rfm.c | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/radio-rx/main.c b/radio-rx/main.c index fccca65..02db2fd 100644 --- a/radio-rx/main.c +++ b/radio-rx/main.c @@ -50,9 +50,9 @@ void status(display_t *display, rfm_t *radio, int clock) { int main(void) { display_t display = { .reg = { - .output = { .ddr = &DDRB, .port = &PORTB, .pin = &PINB, .addr = 7 }, - .shift_clock = { .ddr = &DDRB, .port = &PORTB, .pin = &PINB, .addr = 6 }, - .latch_clock = { .ddr = &DDRB, .port = &PORTB, .pin = &PINB, .addr = 5 }, + .output = { .ddr = &DDRF, .port = &PORTF, .pin = &PINF, .addr = 7 }, + .shift_clock = { .ddr = &DDRF, .port = &PORTF, .pin = &PINF, .addr = 6 }, + .latch_clock = { .ddr = &DDRF, .port = &PORTF, .pin = &PINF, .addr = 5 }, }, }; @@ -132,8 +132,13 @@ int main(void) { char msg[16]; snprintf(msg, 15, "[%d]: %d", length, packet[0]); + char msg_2[16]; + snprintf(msg_2, 15, "RSSI: %d", rfm_rssi(&radio)); + display_clear(&display); display_write_message(&display, msg); + display_set_location(&display, 1, 0); + display_write_message(&display, msg_2); _delay_ms(1000); } diff --git a/rfm69hcw/rfm.c b/rfm69hcw/rfm.c index a89dd42..56f4e4e 100644 --- a/rfm69hcw/rfm.c +++ b/rfm69hcw/rfm.c @@ -327,14 +327,16 @@ interrupt_flags_t rfm_interrupts(rfm_t *rfm) { } uint8_t rfm_rssi(rfm_t *rfm) { - uint8_t rssi_reg; + // uint8_t rssi_reg; uint8_t rssi_value; + /* _rfm_write(rfm, REG_RSSI_CONFIG, (uint8_t [1]){ _BV(0) }, 1); while(!(rssi_reg & _BV(1))) { _rfm_read(rfm, REG_RSSI_CONFIG, &rssi_reg, 1); } + */ _rfm_read(rfm, REG_RSSI_VALUE, &rssi_value, 1);