Compare commits
No commits in common. "3fc29bee2e90f1df37e1db5b6aafb1a537b0b51f" and "542351e05e910b5d5aec1f759b69810dca60ac96" have entirely different histories.
3fc29bee2e
...
542351e05e
|
|
@ -18,7 +18,6 @@ board_build.filesystem = littlefs
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
upload_speed = 921600
|
upload_speed = 921600
|
||||||
;monitor_filters = send_on_enter
|
;monitor_filters = send_on_enter
|
||||||
extra_scripts = pre:scripts/git_version.py
|
|
||||||
build_src_filter =
|
build_src_filter =
|
||||||
+<meshberry/>
|
+<meshberry/>
|
||||||
-<chat-relay/>
|
-<chat-relay/>
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
Import("env")
|
|
||||||
|
|
||||||
import subprocess
|
|
||||||
|
|
||||||
|
|
||||||
def git(*args):
|
|
||||||
try:
|
|
||||||
return subprocess.check_output(
|
|
||||||
["git"] + list(args), stderr=subprocess.DEVNULL
|
|
||||||
).strip().decode("ascii")
|
|
||||||
except Exception:
|
|
||||||
return None
|
|
||||||
|
|
||||||
# count number of commits.
|
|
||||||
build_number = git("rev-list", "--count", "HEAD") or "0"
|
|
||||||
|
|
||||||
env.Append(BUILD_FLAGS=[
|
|
||||||
"-DBUILD_NUMBER=%s" % build_number
|
|
||||||
])
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
#include <array>
|
#include <array>
|
||||||
|
|
||||||
#define MAX_MSG_LEN 100
|
#define MAX_MSG_LEN 100
|
||||||
#define MAX_HISTORY 128
|
#define MAX_HISTORY 32
|
||||||
#define MAX_NODES 30
|
#define MAX_NODES 30
|
||||||
|
|
||||||
struct NodePresence {
|
struct NodePresence {
|
||||||
|
|
@ -35,8 +35,8 @@ extern int nodesCount;
|
||||||
extern uint8_t broadcastAddressEspNow[6];
|
extern uint8_t broadcastAddressEspNow[6];
|
||||||
|
|
||||||
/* Timings */
|
/* Timings */
|
||||||
#define TIMEOUT_PRESENCE 3000
|
#define TIMEOUT_PRESENCE 2000
|
||||||
#define PING_INTERVAL 1000
|
#define PING_INTERVAL 500
|
||||||
extern unsigned long lastPing;
|
extern unsigned long lastPing;
|
||||||
|
|
||||||
/* ---------- BUFFER SÉCURISÉ POUR LE CALLBACK ---------- */
|
/* ---------- BUFFER SÉCURISÉ POUR LE CALLBACK ---------- */
|
||||||
|
|
|
||||||
|
|
@ -11,14 +11,8 @@
|
||||||
|
|
||||||
BleKeyboard bleKeyboard;
|
BleKeyboard bleKeyboard;
|
||||||
|
|
||||||
#ifndef BUILD_NUMBER
|
|
||||||
#define BUILD_NUMBER 0
|
|
||||||
#endif
|
|
||||||
|
|
||||||
void setup() {
|
void setup() {
|
||||||
Serial.begin(SERIAL_BAUD);
|
Serial.begin(SERIAL_BAUD);
|
||||||
Serial.printf("Build #%d\n", BUILD_NUMBER);
|
|
||||||
|
|
||||||
esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
|
esp_sleep_wakeup_cause_t cause = esp_sleep_get_wakeup_cause();
|
||||||
if (cause == ESP_SLEEP_WAKEUP_EXT1 || cause == ESP_SLEEP_WAKEUP_TOUCHPAD) {
|
if (cause == ESP_SLEEP_WAKEUP_EXT1 || cause == ESP_SLEEP_WAKEUP_TOUCHPAD) {
|
||||||
Serial.println("[wake] resumed from deep sleep");
|
Serial.println("[wake] resumed from deep sleep");
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue