Compare commits
No commits in common. "main" and "v1.1" have entirely different histories.
12
README.md
12
README.md
@ -1,10 +1,16 @@
|
|||||||
# nRF24 touch pad
|
# RF touch switch
|
||||||
|
|
||||||
Touch pad on ATmega328 + nRF24.
|
Touch switch on ATmega168/328 + nRF24.
|
||||||
|
|
||||||
## Features
|
## Features
|
||||||
|
|
||||||
1. Power consumption in sleep mode approximately 10 μA. Up to 2 years of operation on one CR2032 battery (estimated).
|
1. Power consumption in sleep mode approximately 10 μA. Up to 2 years of operation on one CR2032 battery (estimated).
|
||||||
2. When triggered transmits battery level charge.
|
2. When triggered transmits battery level charge.
|
||||||
3. Automatic restart in case of a hang-up.
|
3. Automatic restart in case of a hang-up.
|
||||||
4. Easy installation into any standard touch pad enclosure.
|
4. Easy installation into any standard touch switch enclosure.
|
||||||
|
|
||||||
|
## Note
|
||||||
|
|
||||||
|
A gateway is required. For details see [RF Gateway](https://github.com/aZholtikov/RF-Gateway).
|
||||||
|
|
||||||
|
Any feedback via [e-mail](mailto:github@zh.com.ru) would be appreciated. Or... [Buy me a coffee](https://paypal.me/aZholtikov).
|
||||||
|
Binary file not shown.
Before Width: | Height: | Size: 494 KiB |
Binary file not shown.
Before Width: | Height: | Size: 915 KiB |
@ -1,10 +1,12 @@
|
|||||||
[env:ATmega328]
|
[env:ATmega168]
|
||||||
platform = atmelavr
|
platform = atmelavr
|
||||||
board = ATmega328
|
board = ATmega168
|
||||||
board_build.mcu = atmega328
|
board_build.mcu = atmega168
|
||||||
board_build.f_cpu = 8000000L
|
board_build.f_cpu = 8000000L
|
||||||
framework = arduino
|
framework = arduino
|
||||||
upload_protocol = usbasp
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
board_fuses.hfuse = 0xDE
|
board_fuses.hfuse = 0xDE
|
||||||
board_fuses.lfuse = 0xE2
|
board_fuses.lfuse = 0xE2
|
||||||
board_fuses.efuse = 0x07
|
board_fuses.efuse = 0x07
|
||||||
@ -12,9 +14,69 @@ upload_flags =
|
|||||||
-Pusb
|
-Pusb
|
||||||
-e
|
-e
|
||||||
lib_deps =
|
lib_deps =
|
||||||
http://git.zh.com.ru/alexey.zholtikov/zh_config.git
|
https://github.com/aZholtikov/ZHConfig
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_nrf24.git
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_free_rtos.git
|
https://github.com/nRF24/RF24
|
||||||
|
|
||||||
|
[env:ATmega168P]
|
||||||
|
platform = atmelavr
|
||||||
|
board = ATmega168P
|
||||||
|
board_build.mcu = atmega168p
|
||||||
|
board_build.f_cpu = 8000000L
|
||||||
|
framework = arduino
|
||||||
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
|
board_fuses.hfuse = 0xDE
|
||||||
|
board_fuses.lfuse = 0xE2
|
||||||
|
board_fuses.efuse = 0x07
|
||||||
|
upload_flags =
|
||||||
|
-Pusb
|
||||||
|
-e
|
||||||
|
lib_deps =
|
||||||
|
https://github.com/aZholtikov/ZHConfig
|
||||||
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
|
https://github.com/nRF24/RF24
|
||||||
|
|
||||||
|
[env:ATmega168PB]
|
||||||
|
platform = atmelavr
|
||||||
|
board = ATmega168PB
|
||||||
|
board_build.mcu = atmega168pb
|
||||||
|
board_build.f_cpu = 8000000L
|
||||||
|
framework = arduino
|
||||||
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
|
board_fuses.hfuse = 0xDE
|
||||||
|
board_fuses.lfuse = 0xE2
|
||||||
|
board_fuses.efuse = 0x07
|
||||||
|
upload_flags =
|
||||||
|
-Pusb
|
||||||
|
-e
|
||||||
|
lib_deps =
|
||||||
|
https://github.com/aZholtikov/ZHConfig
|
||||||
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
|
https://github.com/nRF24/RF24
|
||||||
|
|
||||||
|
[env:ATmega328]
|
||||||
|
platform = atmelavr
|
||||||
|
board = ATmega328
|
||||||
|
board_build.mcu = atmega328
|
||||||
|
board_build.f_cpu = 8000000L
|
||||||
|
framework = arduino
|
||||||
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
|
board_fuses.hfuse = 0xDE
|
||||||
|
board_fuses.lfuse = 0xE2
|
||||||
|
board_fuses.efuse = 0x07
|
||||||
|
upload_flags =
|
||||||
|
-Pusb
|
||||||
|
-e
|
||||||
|
lib_deps =
|
||||||
|
https://github.com/aZholtikov/ZHConfig
|
||||||
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
|
https://github.com/nRF24/RF24
|
||||||
|
|
||||||
[env:ATmega328P]
|
[env:ATmega328P]
|
||||||
platform = atmelavr
|
platform = atmelavr
|
||||||
@ -23,6 +85,8 @@ board_build.mcu = atmega328p
|
|||||||
board_build.f_cpu = 8000000L
|
board_build.f_cpu = 8000000L
|
||||||
framework = arduino
|
framework = arduino
|
||||||
upload_protocol = usbasp
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
board_fuses.hfuse = 0xDE
|
board_fuses.hfuse = 0xDE
|
||||||
board_fuses.lfuse = 0xE2
|
board_fuses.lfuse = 0xE2
|
||||||
board_fuses.efuse = 0x07
|
board_fuses.efuse = 0x07
|
||||||
@ -30,9 +94,9 @@ upload_flags =
|
|||||||
-Pusb
|
-Pusb
|
||||||
-e
|
-e
|
||||||
lib_deps =
|
lib_deps =
|
||||||
http://git.zh.com.ru/alexey.zholtikov/zh_config.git
|
https://github.com/aZholtikov/ZHConfig
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_nrf24.git
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_free_rtos.git
|
https://github.com/nRF24/RF24
|
||||||
|
|
||||||
[env:ATmega328PB]
|
[env:ATmega328PB]
|
||||||
platform = atmelavr
|
platform = atmelavr
|
||||||
@ -41,6 +105,8 @@ board_build.mcu = atmega328pb
|
|||||||
board_build.f_cpu = 8000000L
|
board_build.f_cpu = 8000000L
|
||||||
framework = arduino
|
framework = arduino
|
||||||
upload_protocol = usbasp
|
upload_protocol = usbasp
|
||||||
|
build_flags =
|
||||||
|
-D ID=$UNIX_TIME
|
||||||
board_fuses.hfuse = 0xDE
|
board_fuses.hfuse = 0xDE
|
||||||
board_fuses.lfuse = 0xE2
|
board_fuses.lfuse = 0xE2
|
||||||
board_fuses.efuse = 0x07
|
board_fuses.efuse = 0x07
|
||||||
@ -48,6 +114,6 @@ upload_flags =
|
|||||||
-Pusb
|
-Pusb
|
||||||
-e
|
-e
|
||||||
lib_deps =
|
lib_deps =
|
||||||
http://git.zh.com.ru/alexey.zholtikov/zh_config.git
|
https://github.com/aZholtikov/ZHConfig
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_nrf24.git
|
https://github.com/feilipu/Arduino_FreeRTOS_Library
|
||||||
http://git.zh.com.ru/alexey.zholtikov/arduino_free_rtos.git
|
https://github.com/nRF24/RF24
|
91
src/main.cpp
91
src/main.cpp
@ -3,44 +3,22 @@
|
|||||||
#include "RF24.h"
|
#include "RF24.h"
|
||||||
#include "avr/interrupt.h"
|
#include "avr/interrupt.h"
|
||||||
#include "semphr.h"
|
#include "semphr.h"
|
||||||
#include "zh_config.h"
|
#include "EEPROM.h"
|
||||||
|
#include "ZHConfig.h"
|
||||||
|
|
||||||
#define ID 1 // Unique ID of the device on the network.
|
void sendButtonPushing(void *pvParameters);
|
||||||
|
float getBatteryLevelCharge(void);
|
||||||
|
void loadId(void);
|
||||||
|
|
||||||
|
int16_t id{abs((int16_t)ID)};
|
||||||
|
|
||||||
RF24 radio(9, 10);
|
RF24 radio(9, 10);
|
||||||
SemaphoreHandle_t pad_pushing;
|
SemaphoreHandle_t buttonSemaphore;
|
||||||
|
|
||||||
float get_battery_level_charge()
|
|
||||||
{
|
|
||||||
ADMUX = (1 << REFS0) | (1 << MUX3) | (1 << MUX2) | (1 << MUX1);
|
|
||||||
ADCSRA |= (1 << ADEN);
|
|
||||||
delay(10);
|
|
||||||
ADCSRA |= (1 << ADSC);
|
|
||||||
while (bit_is_set(ADCSRA, ADSC))
|
|
||||||
;
|
|
||||||
ADCSRA &= ~(1 << ADEN);
|
|
||||||
return (1024 * 1.1) / (ADCL + ADCH * 256);
|
|
||||||
}
|
|
||||||
|
|
||||||
void send_pad_pushing(void *pvParameters)
|
|
||||||
{
|
|
||||||
(void)pvParameters;
|
|
||||||
for (;;)
|
|
||||||
{
|
|
||||||
xSemaphoreTake(pad_pushing, portMAX_DELAY);
|
|
||||||
rf_transmitted_data_t sensor{ID, RFST_TOUCH_PAD};
|
|
||||||
sensor.value_1 = get_battery_level_charge() * 100;
|
|
||||||
radio.powerUp();
|
|
||||||
radio.flush_tx();
|
|
||||||
radio.write(&sensor, sizeof(rf_transmitted_data_t));
|
|
||||||
radio.powerDown();
|
|
||||||
sei();
|
|
||||||
}
|
|
||||||
vTaskDelete(NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
void setup()
|
void setup()
|
||||||
{
|
{
|
||||||
|
loadId();
|
||||||
|
|
||||||
EICRA |= (1 << ISC11) | (1 << ISC10);
|
EICRA |= (1 << ISC11) | (1 << ISC10);
|
||||||
EIMSK |= (1 << INT1);
|
EIMSK |= (1 << INT1);
|
||||||
ADCSRA &= ~(1 << ADEN);
|
ADCSRA &= ~(1 << ADEN);
|
||||||
@ -54,8 +32,8 @@ void setup()
|
|||||||
radio.setRetries(15, 15);
|
radio.setRetries(15, 15);
|
||||||
radio.openWritingPipe(0xDDEEFF);
|
radio.openWritingPipe(0xDDEEFF);
|
||||||
radio.powerDown();
|
radio.powerDown();
|
||||||
pad_pushing = xSemaphoreCreateBinary();
|
buttonSemaphore = xSemaphoreCreateBinary();
|
||||||
xTaskCreate(send_pad_pushing, "Send Pad Pushing", configMINIMAL_STACK_SIZE, NULL, 1, NULL);
|
xTaskCreate(sendButtonPushing, "Send Button Pushing", configMINIMAL_STACK_SIZE, NULL, 1, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
void loop()
|
void loop()
|
||||||
@ -68,8 +46,51 @@ void loop()
|
|||||||
sleep_reset();
|
sleep_reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void sendButtonPushing(void *pvParameters)
|
||||||
|
{
|
||||||
|
(void)pvParameters;
|
||||||
|
for (;;)
|
||||||
|
{
|
||||||
|
xSemaphoreTake(buttonSemaphore, portMAX_DELAY);
|
||||||
|
rf_transmitted_data_t sensor{id, RFST_TOUCH_SWITCH};
|
||||||
|
sensor.value_1 = getBatteryLevelCharge() * 100;
|
||||||
|
radio.powerUp();
|
||||||
|
radio.flush_tx();
|
||||||
|
radio.write(&sensor, sizeof(rf_transmitted_data_t));
|
||||||
|
radio.powerDown();
|
||||||
|
sei();
|
||||||
|
}
|
||||||
|
vTaskDelete(NULL);
|
||||||
|
}
|
||||||
|
|
||||||
|
float getBatteryLevelCharge()
|
||||||
|
{
|
||||||
|
ADMUX = (1 << REFS0) | (1 << MUX3) | (1 << MUX2) | (1 << MUX1);
|
||||||
|
ADCSRA |= (1 << ADEN);
|
||||||
|
delay(10);
|
||||||
|
ADCSRA |= (1 << ADSC);
|
||||||
|
while (bit_is_set(ADCSRA, ADSC))
|
||||||
|
;
|
||||||
|
ADCSRA &= ~(1 << ADEN);
|
||||||
|
return (1024 * 1.1) / (ADCL + ADCH * 256);
|
||||||
|
}
|
||||||
|
|
||||||
|
void loadId()
|
||||||
|
{
|
||||||
|
cli();
|
||||||
|
if (EEPROM.read(511) == 254)
|
||||||
|
EEPROM.get(0, id);
|
||||||
|
else
|
||||||
|
{
|
||||||
|
EEPROM.write(511, 254);
|
||||||
|
EEPROM.put(0, id);
|
||||||
|
}
|
||||||
|
delay(50);
|
||||||
|
sei();
|
||||||
|
}
|
||||||
|
|
||||||
ISR(INT1_vect)
|
ISR(INT1_vect)
|
||||||
{
|
{
|
||||||
cli();
|
cli();
|
||||||
xSemaphoreGiveFromISR(pad_pushing, NULL);
|
xSemaphoreGiveFromISR(buttonSemaphore, NULL);
|
||||||
}
|
}
|
Loading…
x
Reference in New Issue
Block a user