Commit Graph
100 Commits
Author SHA1 Message Date
Kevin Hester aba05ba5ce Merge pull request #324 from geeksville/master
merge from dev
2020-08-17 17:20:16 -07:00
Kevin Hester 99882a675b Merge pull request #323 from geeksville/post1
Post1
2020-08-17 15:28:26 -07:00
geeksville 9c9347df23 don't reference tft libs on devices that don't have it 2020-08-17 14:06:31 -07:00
geeksville b66856c53f default back to tbeam 2020-08-17 14:01:53 -07:00
geeksville 285069703c add missing button 2020-08-17 14:01:03 -07:00
geeksville d91ab5480f begin support for TFT displays 2020-08-17 13:47:05 -07:00
geeksville e3b74ece74 use the lora-relay board for CI builds 2020-08-17 12:38:53 -07:00
geeksville 66557241f3 Generate UF2 files for NRF52 release builds 2020-08-17 12:29:45 -07:00
geeksville 3c09c3e520 show NRF52840 debug output via the USB CDC-ACM device 2020-08-17 11:50:50 -07:00
geeksville 781077e799 Turn on buck converter for @BigCorvus board, now radio works 2020-08-17 11:42:19 -07:00
geeksville 22946b5e51 @BigCorvus board now kinda boots
###RTT Client: -----------------------------------------------
###RTT Client: Connecting to J-Link RTT Server via localhost:19021 ...
###RTT Client: Connected.

SEGGER J-Link V6.70c - Real time terminal output
SEGGER J-Link ARM V9.6, SN=69663845
Process: JLinkGDBServerCLExe
Emitting reboot packet for serial shell
I2C device found at address 0x55
done
Meshtastic swver=unset, hwver=unset
Reset reason: 0x0
FIXME, call randomSeed
ERROR: No UBLOX GPS found
Hoping that NEMA might work
RadioConfig reset!
Initial packet id 1481765933, numPacketId 4294967295
No saved preferences found
NODENUM=0xB18C3A4E, dbsize=1
Starting meshradio init...
Set radio: name=Default, config=3, ch=6, power=17
SX1262 init result 0
sending owner !df5db18c3a4e/Unknown 3a4e/?4E
Update DB node 0xB18C3A4E, rx_time=0
old user !df5db18c3a4e/Unknown 3a4e/?4E
updating changed=0 user !df5db18c3a4e/Unknown 3a4e/?4E
Adding packet record (id=0x5851F430 Fr0x4E To0xFF, WantAck0, HopLim3 Payload:User)
enqueuing for send (id=0x5851F430 Fr0x4E To0xFF, WantAck0, HopLim3 encrypted)
txGood=0,rxGood=0,rxBad=0
Starting low level send (id=0x5851F430 Fr0x4E To0xFF, WantAck0, HopLim3 encrypted)
assert failed src/mesh/SX1262Interface.cpp: 102, virtual void SX1262Interface::setStandby(), test=err == ERR_NONE
2020-08-17 11:29:00 -07:00
geeksville c0307cbcb0 a cleaner way to add variants - no longer need symlinks in adafruit proj 2020-08-17 10:23:21 -07:00
geeksville 6b568ab2fb add powerhold for @bigcorvus board 2020-08-16 14:50:04 -07:00
geeksville 67bad9a689 Add SX1262 to @BigCorvus board 2020-08-16 14:20:05 -07:00
geeksville 559a790286 Add @BigCorvus board support to build 2020-08-16 14:08:31 -07:00
geeksville 08e5bd728b lorarelay wip 2020-08-16 14:07:01 -07:00
geeksville 0cfeeba2e2 add variant files by @BigCorvus 2020-08-16 13:25:24 -07:00
geeksville 5007624ba5 Merge remote-tracking branch 'root/post1' into post1 2020-08-16 13:21:54 -07:00
Kevin Hester bba4677915 Merge pull request #318 from geeksville/master
fix 279
2020-08-13 20:08:13 -07:00
geeksville ac969cdb26 Merge remote-tracking branch 'root/master' 2020-08-13 19:56:41 -07:00
geeksville 1c3eff0ee5 turn on fix #279 for tbeam0.7 and ttgo lora32-1.6 battery levels 2020-08-13 19:55:57 -07:00
Kevin Hester cba9546a4d Merge pull request #316 from geeksville/master
for bug #279
2020-08-13 11:30:25 -07:00
geeksville ceae60cf13 Merge remote-tracking branch 'root/master' 2020-08-13 11:25:11 -07:00
geeksville 3de1607cea bug #279 change battery voltage to millivolts 2020-08-13 11:23:27 -07:00
Kevin Hester 029b2f3139 Merge pull request #313 from geeksville/post1
Post1
2020-08-12 21:35:42 -07:00
Kevin Hester ab6c97bfef Merge pull request #315 from geeksville/master
misc bug fixes
2020-08-12 21:35:31 -07:00
Kevin Hester a61b15e861 Merge branch 'post1' into post1 2020-08-12 17:24:58 -07:00
geeksville 8c7aa07c70 Only do AXP debugging on ESP32 targets 2020-08-12 17:10:59 -07:00
geeksville 6a402b13fa Add battery sensing (mostly) for TBEAM0.7
However, disabled until someone with suitable hardware can test and report
back.

@slavino and @tschundler would you be willing to try it with your boards?

You'll need to uncomment the following line in configuration.h

// #define BATTERY_PIN 35 // A battery voltage measurement pin, voltage divider connected here to measure battery voltage
2020-08-12 17:03:36 -07:00
geeksville c30b570e16 Merge remote-tracking branch 'root/master' 2020-08-12 15:53:23 -07:00
geeksville 9b25818a50 fix #249: report battery levels even if no GPS lock
@professr I noticed you added a "newStatus" observable to the GPS class.
Do you remember why you didn't remove the old GPS status (which seemed
to be dumber).  Is it just because you didn't want to risk breaking
MeshService?  (I assume) In this change I removed the old Observable
and all seems well (just using newStatus everywhere).
2020-08-12 15:51:57 -07:00
Kevin Hester 5311e44660 Merge pull request #314 from geeksville/master
my bug queue
2020-08-12 11:11:01 -07:00
geeksville 55dafcbecb fix #269 see below
/**
 * Generate a short suffix used to disambiguate channels that might have the same "name" entered by the human but different PSKs.
 * The ideas is that the PSK changing should be visible to the user so that they see they probably messed up and that's why they
their nodes
 * aren't talking to each other.
 *
 * This string is of the form "#name-XY".
 *
 * Where X is a letter from A to Z (base26), and formed by xoring all the bytes of the PSK together.
 * Y is not yet used but should eventually indicate 'speed/range' of the link
 *
 * This function will also need to be implemented in GUI apps that talk to the radio.
 *
 * https://github.com/meshtastic/Meshtastic-device/issues/269
 */
const char *getChannelName();
2020-08-12 11:04:03 -07:00
geeksville 178958c165 allow advanced users to specify channel numbers if they wish 2020-08-12 10:46:44 -07:00
geeksville d7cf7e2eb4 Allow advanced users to set arbitrary spreadfactor/codingrate/bandwidth 2020-08-12 10:42:25 -07:00
geeksville fce8c16d52 Merge remote-tracking branch 'mine/post1' into post1 2020-08-11 19:21:07 -07:00
geeksville b690868bb1 Merge branch 'master' into post1 2020-08-11 19:20:46 -07:00
geeksville dec88a368b First attempt at better protocol docs. Bug #308
@cyclomies thank you for the prodding and help.  I'm happy to add more
detail, can you insert a few questions inline?  Then I'll answer and
hopefully that will be enough to be useful for others.
2020-08-11 17:34:49 -07:00
Kevin Hester 17394d8c1c Merge pull request #307 from geeksville/post1
Add accidentally lost support for the PPR nrf52 board - so Corvus can use it as a reference
2020-08-10 09:20:53 -07:00
Kevin Hester a7da7cd32e Merge branch 'post1' into post1 2020-08-10 09:15:49 -07:00
Kevin Hester f37dc9c776 Merge pull request #310 from Dafeman/PlatformIO-build-guide-update
PlatformIO build guide update
2020-08-10 09:12:11 -07:00
Kevin Hester d6658dbb2e Merge branch 'master' into PlatformIO-build-guide-update 2020-08-10 08:56:15 -07:00
geeksville 047141eb34 make TXEN/RXEN immediately low once changed to be outputs 2020-08-03 11:29:26 -07:00
geeksville cb1053850d Oops - I mismerged at somepoint, restore correct PPR variant.h defs 2020-08-03 11:05:24 -07:00
Kevin Hester 7652331e8c Merge pull request #306 from geeksville/master
less logspam
2020-08-02 13:38:23 -07:00
geeksville 12bf3795ea less logspam when debugging the serial API 2020-08-02 12:55:22 -07:00
geeksville 829763af2c remove stale comment 2020-07-30 09:35:07 -07:00
geeksville 75806ee666 clarify build instructions 2020-07-29 10:25:20 -07:00
Kevin Hester 91ec29db03 Merge pull request #301 from ColPanic/flash_improvements
Adding port/help flags and error checking
2020-07-27 11:33:06 -07:00
Kevin Hester e0d6456618 Merge pull request #299 from jasonfish/add-new-case-to-readme
Adding new case URL to Readme
2020-07-26 09:15:38 -07:00
geeksville 7c4eb3eddd add amazon appstore link 2020-07-24 15:08:10 -07:00
Kevin Hester 661a75d796 Merge pull request #298 from geeksville/master
oops - I missed some 0.9.1 files in the last merge into master
2020-07-24 13:35:25 -07:00
geeksville b617010a46 Merge branch 'post1'
# Conflicts:
#	docs/software/TODO.md
#	docs/software/nrf52-TODO.md
2020-07-24 13:07:33 -07:00
Kevin Hester 5a70c45a3e Merge pull request #297 from geeksville/master
Pull in NimBLE changes into master
2020-07-24 12:59:06 -07:00
geeksville cb2b36811a Merge remote-tracking branch 'root/master' 2020-07-24 12:50:39 -07:00
geeksville 92edcb97ed Merge remote-tracking branch 'origin/post1'
# Conflicts:
#	docs/software/TODO.md
#	docs/software/nrf52-TODO.md
2020-07-24 12:49:24 -07:00
Kevin Hester 7f1ec15cab Merge pull request #296 from geeksville/nimble
Change BLE implementation to NimBLE rather than Bluedroid
2020-07-24 12:46:37 -07:00
geeksville 1aa7451866 0.9.1 2020-07-24 12:41:14 -07:00
geeksville d5c46dc114 use max mtusize for speed 2020-07-24 12:39:48 -07:00
geeksville 5bab16636d Switch to NimBLE from Bluedroid
Meshtastic patched version esp-idf commit #e7f316d5a4eb64ca52d40575cb20815d456a9c4f
    used.

    In support of: https://github.com/meshtastic/Meshtastic-device/issues/266
2020-07-24 12:39:35 -07:00
geeksville 204f2c1a68 software update service now registered with NimBLE 2020-07-24 11:39:48 -07:00
geeksville a5b7501a4e nimble add debug output 2020-07-24 10:12:25 -07:00
geeksville b0e2c81666 nimble software update WIP builds 2020-07-23 15:57:31 -07:00
geeksville 00ca351169 WIP begin changing software update service over to nimble 2020-07-23 13:01:31 -07:00
geeksville 0415a3c369 Clean up nimble files 2020-07-23 08:10:36 -07:00
geeksville 4eb27b637d Nimble sleep now works nicely 2020-07-22 22:18:47 -07:00
geeksville 107b56a346 move bluetooth enable 2020-07-22 21:41:56 -07:00
geeksville abdc4dfae8 remove old mesh ble service 2020-07-22 21:29:32 -07:00
geeksville 014eea2f56 Nimble sleep almost works 2020-07-22 21:26:32 -07:00
geeksville 9b4ca95660 nimble basically works now. Started long bake for bug #266 2020-07-22 18:00:56 -07:00
geeksville 78ff9a8116 Nimble WIP - make notify work 2020-07-22 16:40:00 -07:00
geeksville 66b147fb31 Nimble WIP fix bluetooth pairing screen 2020-07-22 16:16:28 -07:00
geeksville c5df1bc885 Nimble WIP - woot! basic device API works now 2020-07-22 15:44:45 -07:00
geeksville 00cf3a768e nimble WIP turn on bonding and security 2020-07-22 13:50:30 -07:00
geeksville b6a3deb341 nimble WIP - writes kinda work now 2020-07-22 12:08:54 -07:00
geeksville 531f488fe8 WIP nimble ugly but advertise works 2020-07-22 10:46:01 -07:00
geeksville d674aaaa29 sometimes save config fails on ublox, don't cause a reboot for that 2020-07-22 10:45:38 -07:00
geeksville 7f6dc104f0 nimble WIP - add advertising boilerplate 2020-07-22 09:51:57 -07:00
geeksville 102085808f WIP nimble now builds 2020-07-21 12:42:24 -07:00
geeksville 2645730329 Merge branch 'post1' into nimble
# Conflicts:
#	docs/software/TODO.md
#	docs/software/nrf52-TODO.md
#	platformio.ini
#	src/esp32/MeshBluetoothService.cpp
2020-07-21 11:20:09 -07:00
geeksville 6aa28f55dd WIP stubify to get app building without CONFIG_BLUEDROID (BLE disabled) 2020-07-21 11:16:14 -07:00
geeksville 1e86365167 MITM_BOND supposedly doesn't have the problem mentioned in #266
(and it is good / more secure anyways - the old code was just
based on the example docs)
2020-07-19 15:01:15 -07:00
geeksville 62c20f8ab9 add todo items 2020-07-19 14:59:53 -07:00
Kevin Hester 7706f65921 Merge pull request #294 from geeksville/master
fix build for non tbeams
2020-07-18 17:12:02 -07:00
geeksville 68490336b8 0.8.2 2020-07-18 16:28:14 -07:00
geeksville 20ac8d71fd make PSRAM optional - new flag in ESPIDF - fix #293 2020-07-18 16:26:43 -07:00
geeksville ec082b7c9a 0.8.2 2020-07-18 16:26:03 -07:00
geeksville ece75d1d7f make PSRAM optional - new flag in ESPIDF - fix #293 2020-07-18 16:25:53 -07:00
geeksville 9e10ce487c Merge branch 'master' into post1 2020-07-18 13:32:30 -07:00
Kevin Hester d248c6be4b Merge pull request #290 from geeksville/master
get ready for release 0.8.1
2020-07-18 13:24:11 -07:00
geeksville 39b0a89821 0.8.1 2020-07-18 13:19:35 -07:00
geeksville d9f43d3e2f update protobufs related to https://github.com/meshtastic/Meshtastic-device/issues/269 2020-07-18 09:12:51 -07:00
Kevin Hester 94f03bee01 Merge pull request #289 from geeksville/post1
geeksvilles periodic merging from master
2020-07-18 08:58:13 -07:00
geeksville 08c77caaa9 fix #266 ble forced to re-pair details below
The NVS copies of hte BLE pairing info for clients were getting corrupted
occasionally.  So I went googling and found some plausible bug reports
but nothing that was an exact match.  Then I looked at the arduino-esp32
binaries for the ESP-IDF framework.  They were fairly old (Jan 20).

Looking through the commits on ESP-IDF release3.3 it seems like there have
been a few fixes for mutual exclusion errors wrt bluetooth.  So I punted
and tried updating ESP-IDF to latest and everything seems fairly solid
now.  Currently running a long test run with three nodes.
2020-07-18 08:54:52 -07:00
geeksville cfedc97cd0 Show NVS flash utilization at boot (for debugging ble things?) 2020-07-18 08:49:42 -07:00
geeksville cfad226b2b use new ttgo-lora build names 2020-07-17 14:11:27 -07:00
geeksville 859642d2e4 Merge remote-tracking branch 'root/master' into post1
# Conflicts:
#	src/configuration.h
2020-07-17 12:06:57 -07:00
Kevin Hester 8316419a01 Merge pull request #288 from geeksville/post1
Improvements for NRF52 targets
2020-07-17 11:22:20 -07:00
Kevin Hester 96f5069742 Merge branch 'post1' into post1 2020-07-17 11:17:12 -07:00
geeksville e433249bb1 Default back to tbeam in builds, so it will work for others 2020-07-17 11:14:18 -07:00