rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2026-01-02 16:10:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

release 0.0.3 alpha posted

Browse Source
This commit is contained in:
geeksville
2020-02-20 12:49:34 -08:00
parent 4dc8af3a1b
commit 6ade723caa
7 changed files with 108 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/MeshRadio.h
View File

@@ -19,12 +19,12 @@
#define NUM_CHANNELS_EU 10
// CN channel settings
#define CH0_CN 470f // MHz
#define CH0_CN 470.0f // MHz
#define CH_SPACING_CN 2.0f // MHz FIXME, this is just a guess for 470-510
#define NUM_CHANNELS_CN 20
// CN channel settings
#define CH0_JP 920f // MHz
#define CH0_JP 920.0f // MHz
#define CH_SPACING_JP 0.5f // MHz FIXME, this is just a guess for 920-925
#define NUM_CHANNELS_JP 10

7
src/main.ino
View File

@@ -53,6 +53,9 @@ bool packetSent, packetQueued;
RTC_DATA_ATTR int bootCount = 0;
esp_sleep_source_t wakeCause; // the reason we booted this time
#define xstr(s) str(s)
#define str(s) #s
// -----------------------------------------------------------------------------
// Application
// -----------------------------------------------------------------------------
@@ -382,7 +385,7 @@ void setup()
#endif
// Hello
DEBUG_MSG(APP_NAME " " APP_VERSION "\n");
DEBUG_MSG("%s %s\n", xstr(APP_NAME), str(APP_VERSION));
// Don't init display if we don't have one or we are waking headless due to a timer event
if (wakeCause == ESP_SLEEP_WAKEUP_TIMER)
@@ -402,7 +405,7 @@ void setup()
if (useBluetooth)
{
DEBUG_MSG("Starting bluetooth\n");
BLEServer *serve = initBLE(getDeviceName(), HW_VENDOR, APP_VERSION); // FIXME, use a real name based on the macaddr
BLEServer *serve = initBLE(getDeviceName(), HW_VENDOR, str(APP_VERSION)); // FIXME, use a real name based on the macaddr
createMeshBluetoothService(serve);
// Start advertising - this must be done _after_ creating all services