1660 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
geeksville	f847e30a3c	Merge remote-tracking branch 'root/master'	2020-09-16 09:04:27 -07:00
geeksville	7050ae4ba1	Merge branch 'master' into portduino	2020-09-15 21:14:42 -07:00
geeksville	3e64d8439d	Merge branch 'master' into dev	2020-09-15 21:13:24 -07:00
geeksville	435c955acd	make hash prototype a bit stricter	2020-09-15 21:05:57 -07:00
Jm Casler	c656a95a84	Merge pull request #3 from meshtastic/master ... Update from meshtastic main	2020-09-15 20:34:30 -07:00
Jm Casler	27ad8472c1	remove ssid info from configuration.h	2020-09-15 20:24:58 -07:00
Jm Casler	3fcd4a61aa	commenting out the strcpy to manually set the wifi info.	2020-09-15 20:24:03 -07:00
geeksville	c6d93d1a28	fix #346 limit tx power in japan	2020-09-15 18:54:50 -07:00
Kevin Hester	b0c82dcb5b	Merge pull request #394 from geeksville/master ... misc bug fixes	2020-09-15 18:19:58 -07:00
geeksville	7d4058f49d	let users set 20 dBm if they wish	2020-09-15 18:00:21 -07:00
geeksville	31fc8fafec	make default power level radio chipset specific	2020-09-15 17:55:33 -07:00
geeksville	313cee9a3f	update webpage	2020-09-15 17:54:55 -07:00
Jm Casler	066d9d48a4	New method to deinit the wifi stack.	2020-09-14 20:27:49 -07:00
geeksville	16de4a0d2e	Merge remote-tracking branch 'root/master'	2020-09-14 09:25:31 -07:00
geeksville	621fcb598e	Declare 1.0	2020-09-14 09:25:14 -07:00
Jm Casler	b2a6a4000b	Merge pull request #2 from meshtastic/master ... Updating from head	2020-09-14 00:05:21 -07:00
Jm Casler	f5c939fb10	Fix to turn WiFi back on after the bluetooth radio is reenabled.	2020-09-13 22:22:49 -07:00
Jm Casler	e508306395	Refactoring to break out HTTP from WiFi	2020-09-13 16:58:36 -07:00
Kevin Hester	cc6b500029	Merge pull request #388 from geeksville/master ... 1.0.0	2020-09-13 12:11:32 -07:00
geeksville	887b1b5dcd	Merge remote-tracking branch 'root/master'	2020-09-13 11:58:31 -07:00
geeksville	62e333b235	1.0.0	2020-09-13 11:53:31 -07:00
Jm Casler	d859700497	Merge branch 'master' into master	2020-09-12 21:55:01 -07:00
Jm Casler	f129b458ad	Initial Checkin for WiFi and HTTP Server Framework	2020-09-12 21:43:41 -07:00
Kevin Hester	bf68ad7cf5	Merge pull request #382 from geeksville/master ... 0.9.7	2020-09-12 10:31:19 -07:00
geeksville	6d9bdbb628	0.9.7	2020-09-12 10:21:44 -07:00
Kevin Hester	6782c2d3d1	Merge pull request #380 from mc-hamster/master ... Fix for screen crashing after GPS lock.	2020-09-12 10:20:13 -07:00
Jm Casler	b6f71ca1db	Update screen.cpp for for crash when gps gets lock ... Update screen.cpp for for crash when gps gets a lock	2020-09-11 22:17:45 -07:00
geeksville	92df77f228	Merge remote-tracking branch 'root/master' into dev	2020-09-11 18:15:13 -07:00
Jm Casler	caeea41867	Merge pull request #1 from meshtastic/master ... Merge from original repo	2020-09-11 17:59:02 -07:00
Kevin Hester	bc17dd1a0f	Merge pull request #378 from geeksville/master ... 0.9.6	2020-09-11 13:41:09 -07:00
geeksville	2a3175470b	merge remote-tracking branch 'root/master'	2020-09-11 13:31:28 -07:00
geeksville	8ca6bbfb78	0.9.6	2020-09-11 13:30:44 -07:00
Kevin Hester	9777762052	Merge pull request #368 from geeksville/master ... misc bug fixes	2020-09-11 11:42:51 -07:00
geeksville	da01f0ab7f	Merge remote-tracking branch 'mine/master'	2020-09-10 10:11:53 -07:00
geeksville	1cd81208c0	Merge remote-tracking branch 'root/master'	2020-09-10 10:11:15 -07:00
Kevin Hester	2394075d94	Merge branch 'master' into master	2020-09-10 10:11:04 -07:00
geeksville	de7b9877f9	remove auto-inserted whitespace that might confuse platformio	2020-09-10 09:51:53 -07:00
geeksville	ee27c15c2c	likely fix for bug #373. fix #339. great gps fixes from @a-f-G-U-C ... fixes described in bug #376	2020-09-10 09:25:10 -07:00
geeksville	076f8bd77b	fix #370 by pulling in my bugfix to ESP32-Nimble	2020-09-09 14:15:43 -07:00
Kevin Hester	288363b3a6	Merge pull request #369 from gkelly/fix-no-button ... Fix compilation without a BUTTON_PIN definition	2020-09-08 12:49:24 -07:00
Garret Kelly	48256d6e9e	Fix compilation without a BUTTON_PIN definition	2020-09-08 15:22:49 -04:00
geeksville	c007302564	fix #363 gps altitude - based on tip by @a-f-G-U-C	2020-09-08 10:28:53 -07:00
geeksville	0a9f7147f3	probably fix #341 enable internal pullup on lora-v2 button	2020-09-08 10:25:37 -07:00
geeksville	46ba36511a	Merge branch 'portduino' into dev ... # Conflicts: # platformio.ini	2020-09-07 16:31:17 -07:00
Kevin Hester	170f0693c6	Merge pull request #366 from mc-hamster/master ... New screen to fix issue #352	2020-09-07 15:31:16 -07:00
Kevin Hester	d900509fbc	Merge branch 'master' into master	2020-09-07 15:26:35 -07:00
Kevin Hester	8018c27dcd	Merge pull request #367 from geeksville/master ... test fixing CI build	2020-09-07 15:26:24 -07:00
geeksville	8df5ac9d3f	pull in my fixed nrf52 platform	2020-09-07 15:22:00 -07:00
geeksville	c3196f47ef	Merge remote-tracking branch 'root/master'	2020-09-07 15:13:09 -07:00
geeksville	81a49d4e3c	Merge branch 'post1'	2020-09-07 15:12:14 -07:00