Compare commits
No commits in common. "4af6f7690e1bb803aae6692db556ae976eb734bc" and "1a91fa60d8dcdec7320f1b9201c502e8f391a034" have entirely different histories.
4af6f7690e
...
1a91fa60d8
@ -361,7 +361,7 @@ bool bt_setup_hw() {
|
|||||||
#endif
|
#endif
|
||||||
unsigned char *hash = MD5::make_hash(data, BT_DEV_ADDR_LEN);
|
unsigned char *hash = MD5::make_hash(data, BT_DEV_ADDR_LEN);
|
||||||
memcpy(bt_dh, hash, BT_DEV_HASH_LEN);
|
memcpy(bt_dh, hash, BT_DEV_HASH_LEN);
|
||||||
sprintf(bt_devname, "openCom XL %02X%02X", bt_dh[14], bt_dh[15]);
|
sprintf(bt_devname, "RNode %02X%02X", bt_dh[14], bt_dh[15]);
|
||||||
free(data);
|
free(data);
|
||||||
|
|
||||||
bt_ready = true;
|
bt_ready = true;
|
||||||
|
2
Input.h
2
Input.h
@ -20,8 +20,6 @@
|
|||||||
#define RELEASED HIGH
|
#define RELEASED HIGH
|
||||||
|
|
||||||
#define BUTTON_MIN_DURATION 50
|
#define BUTTON_MIN_DURATION 50
|
||||||
#define BUTTON_3S_DURATION 3000
|
|
||||||
#define BUTTON_6S_DURATION 6000
|
|
||||||
|
|
||||||
#define EVENT_ALL 0x00
|
#define EVENT_ALL 0x00
|
||||||
#define EVENT_CLICKS 0x01
|
#define EVENT_CLICKS 0x01
|
||||||
|
@ -1316,15 +1316,9 @@ void process_serial() {
|
|||||||
#if HAS_INPUT
|
#if HAS_INPUT
|
||||||
void button_event(uint8_t event, unsigned long duration) {
|
void button_event(uint8_t event, unsigned long duration) {
|
||||||
if (duration > BUTTON_MIN_DURATION) {
|
if (duration > BUTTON_MIN_DURATION) {
|
||||||
if (duration > BUTTON_6S_DURATION) {
|
|
||||||
bt_stop();
|
|
||||||
} else if (duration > BUTTON_3S_DURATION) {
|
|
||||||
bt_enable_pairing();
|
|
||||||
} else {
|
|
||||||
#if HAS_BUZZER_CTRL
|
#if HAS_BUZZER_CTRL
|
||||||
toggle_buzzer_enable();
|
toggle_buzzer_enable();
|
||||||
#endif
|
#endif
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
Loading…
Reference in New Issue
Block a user