diff options
| author | Sadeep Madurange <sadeep@asciimx.com> | 2025-05-23 17:30:30 +0800 |
|---|---|---|
| committer | Sadeep Madurange <sadeep@asciimx.com> | 2025-05-23 17:30:30 +0800 |
| commit | 2881c78ee9342a9e4c2a79bb9026e5aa88b9f0f3 (patch) | |
| tree | 1c26fce7656eabf1e77ad01d966b3d7e2ff0c8f7 /lock | |
| parent | eaa109ca3be63d263d64dc672de8d49569df3fea (diff) | |
| download | smart-home-2881c78ee9342a9e4c2a79bb9026e5aa88b9f0f3.tar.gz | |
wip: update pin changes, rfm not working.
Diffstat (limited to 'lock')
| -rw-r--r-- | lock/client.c | 24 | ||||
| -rw-r--r-- | lock/nrfm.c | 2 | ||||
| -rw-r--r-- | lock/server.c | 4 |
3 files changed, 19 insertions, 11 deletions
diff --git a/lock/client.c b/lock/client.c index 1d1fe12..ff0c7cf 100644 --- a/lock/client.c +++ b/lock/client.c @@ -12,15 +12,16 @@ #include "nrfm.h" #include "util.h" -#define LOCK_PIN PD2 -#define UNLOCK_PIN PD3 +#define LOCK_PIN PD3 +#define UNLOCK_PIN PD2 +#define ENROLL_PIN PD4 -#define RX_IRQ_PIN PC1 +#define RX_IRQ_PIN PC0 #define RX_DDR DDRC #define RX_PIN PINC #define RX_ICR PCICR #define RX_IE PCIE1 -#define RX_INT PCINT9 +#define RX_INT PCINT8 #define RX_MSK PCMSK1 #define RX_INTVEC PCINT1_vect @@ -90,6 +91,7 @@ int main(void) do { sync = radio_sendto(txaddr, buf, WDLEN); retries++; + led_bat(); _delay_ms(50); } while (!sync && retries < 40); @@ -145,16 +147,22 @@ ISR(RX_INTVEC) ISR(INT0_vect) { + sync = 0; + isunlock = 1; +} + +ISR(INT1_vect) +{ if (is_btn_pressed(PIND, LOCK_PIN)) { sync = 0; islock = 1; } } -ISR(INT1_vect) +ISR(PCINT2_vect) { - if (is_btn_pressed(PIND, UNLOCK_PIN)) { - sync = 0; - isunlock = 1; + if (is_btn_pressed(PIND, ENROLL_PIN)) { + // enroll } } + diff --git a/lock/nrfm.c b/lock/nrfm.c index 3795fd2..c6769fb 100644 --- a/lock/nrfm.c +++ b/lock/nrfm.c @@ -15,7 +15,7 @@ #define SPI_DDR DDRB #define SPI_PORT PORTB -#define NRF_CE PC0 +#define NRF_CE PC1 #define NRF_CE_DDR DDRC #define NRF_CE_PORT PORTC diff --git a/lock/server.c b/lock/server.c index f06b420..12c5569 100644 --- a/lock/server.c +++ b/lock/server.c @@ -21,12 +21,12 @@ #define LOCK_PIN PD3 #define UNLOCK_PIN PD4 -#define RX_IRQ_PIN PC1 +#define RX_IRQ_PIN PC0 #define RX_DDR DDRC #define RX_PIN PINC #define RX_ICR PCICR #define RX_IE PCIE1 -#define RX_INT PCINT9 +#define RX_INT PCINT8 #define RX_MSK PCMSK1 #define RX_INTVEC PCINT1_vect |