Jm Casler
|
227c6fc27e
|
Merge pull request #494 from meshtastic/dev-https
Added the x-protobuf-schema, initial integration of javascript library, tuning of the CPU throttle timer.
|
2020-10-18 22:03:46 -07:00 |
Jm Casler
|
a37844d7e5
|
Merge pull request #493 from mc-hamster/master
update case of meshhttpStatic.h
|
2020-10-18 21:55:25 -07:00 |
Jm Casler
|
ff20b29c3c
|
update case of meshhttpStatic.h
|
2020-10-18 21:44:55 -07:00 |
Jm Casler
|
64c29c4a35
|
Merge pull request #490 from mc-hamster/master
Update filename, cpu clock timer, add more debug info on the web server startup
|
2020-10-18 21:41:34 -07:00 |
Jm Casler
|
d4df3f8a7e
|
mDNS server http://meshtastic.local
|
2020-10-18 21:39:02 -07:00 |
Jm Casler
|
a16c3af30a
|
Clarified debug message regardding the Web Server startup status.
|
2020-10-18 18:44:08 -07:00 |
Jm Casler
|
3061860dab
|
Update sleep timer for the CPU clock
|
2020-10-18 18:30:19 -07:00 |
Jm Casler
|
2450d98b59
|
Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device
|
2020-10-18 18:08:03 -07:00 |
Jm Casler
|
a371592ad9
|
Added instructions for David
|
2020-10-18 18:07:44 -07:00 |
Jm Casler
|
f7aaf48ae9
|
Merge pull request #20 from meshtastic/dev-https
Update my branch from dev-https
|
2020-10-18 18:04:49 -07:00 |
Jm Casler
|
1fb604ebc8
|
Merge pull request #488 from mc-hamster/master
Update dev-https from my fork.
|
2020-10-18 16:44:01 -07:00 |
Jm Casler
|
df2733a3b5
|
readded nodeScriptScriptsJS. it got lost in the transition to the new webserver
|
2020-10-17 20:28:19 -07:00 |
Kevin Hester
|
8fd3cb1aac
|
add crude charging detection for 'dumb' voltage based battery sensors
|
2020-10-18 09:44:29 +08:00 |
Kevin Hester
|
485c476f17
|
cleaner battery debug messages
|
2020-10-18 09:32:12 +08:00 |
Jm Casler
|
7dd4ce32d2
|
Moved style.css into meshhttpStatic.h
Also created /data to store static files before they go into meshhttpStatic.h
|
2020-10-17 17:33:29 -07:00 |
Jm Casler
|
7f12af73d4
|
Updated to be host and protocol agnostic
|
2020-10-17 12:00:21 -07:00 |
Jm Casler
|
63113d57b3
|
Initial integration of meshtastic.js and sample code
|
2020-10-17 11:30:59 -07:00 |
Jm Casler
|
32850ff39d
|
Merge pull request #487 from mc-hamster/master
Some cleanup and implement the X-Protobuf-Schema header
|
2020-10-16 23:40:48 -07:00 |
Jm Casler
|
2901f773a4
|
Some cleanup and implement the X-Protobuf-Schema header
|
2020-10-16 23:33:50 -07:00 |
Kevin Hester
|
a7c54e4ad7
|
Merge remote-tracking branch 'root/master' into dev
|
2020-10-17 13:41:51 +08:00 |
Kevin Hester
|
e1f0e11cb8
|
ppr1 WIP DO NOT MERGE - will break other clients
|
2020-10-17 13:15:12 +08:00 |
Kevin Hester
|
c73ee98739
|
Merge branch 'master' into ppr1
|
2020-10-17 11:00:28 +08:00 |
Jm Casler
|
c2a1141dfa
|
Merge pull request #485 from mc-hamster/master
update class case of HttpAPI
|
2020-10-16 19:40:32 -07:00 |
Jm Casler
|
5b4472ab56
|
fix case of HttpAPI class
|
2020-10-16 19:38:59 -07:00 |
Jm Casler
|
3262f732d8
|
Merge pull request #19 from meshtastic/master
update my branch from master
|
2020-10-16 19:31:59 -07:00 |
Jm Casler
|
cff21ca130
|
Merge pull request #484 from meshtastic/dev-https
Functional protobuf/rest interface.
|
2020-10-16 19:28:40 -07:00 |
Jm Casler
|
81ce04d3da
|
Merge branch 'master' into dev-https
|
2020-10-16 19:21:06 -07:00 |
Jm Casler
|
f4d2b10840
|
Merge pull request #483 from mc-hamster/master
Update for interface with the JS client.
|
2020-10-16 19:18:31 -07:00 |
Jm Casler
|
2370cb8aac
|
Merge pull request #482 from meshtastic/dev-https
Merge from dev-https to master.
|
2020-10-16 19:10:04 -07:00 |
Kevin Hester
|
59ec87f5b0
|
oops tbeam was inheriting from arduino, it should inherit from esp32
|
2020-10-17 09:58:34 +08:00 |
Jm Casler
|
0d9481b6ea
|
add allow-headers
|
2020-10-16 18:00:28 -07:00 |
Jm Casler
|
8f0105ccd9
|
don't send content-type when options is set
|
2020-10-16 17:46:22 -07:00 |
Kevin Hester
|
05ca3c3d56
|
Update to work with my font size change
|
2020-10-17 08:44:04 +08:00 |
Jm Casler
|
ba549d8fcd
|
Return OPTIONS when requested for toradio
|
2020-10-16 17:41:08 -07:00 |
Jm Casler
|
b9df2c00fa
|
fromradio all option
requesting fromradio will return one protobuf
4:56
requesting fromradio?all=true will give you all of them.
|
2020-10-16 17:07:35 -07:00 |
Kevin Hester
|
d9dcb33576
|
Merge branch 'master' into dev-https
|
2020-10-16 17:05:06 -07:00 |
Jm Casler
|
f698231be7
|
Merge branch 'master' of https://github.com/mc-hamster/Meshtastic-device
|
2020-10-16 16:36:55 -07:00 |
Jm Casler
|
8414f4a6a3
|
Added access-control-allow headers
|
2020-10-16 16:36:52 -07:00 |
Kevin Hester
|
8505020be5
|
Merge branch 'dev' into ppr1
|
2020-10-16 17:03:30 +08:00 |
Kevin Hester
|
f3b93d55fb
|
oops fix for esp32
|
2020-10-16 17:03:04 +08:00 |
Kevin Hester
|
9e0731a956
|
Merge branch 'dev' into ppr1
|
2020-10-16 17:01:42 +08:00 |
Kevin Hester
|
2b373048c6
|
fix battery voltage sensing on NRF52 boards
|
2020-10-16 17:00:27 +08:00 |
Kevin Hester
|
22f23bb07d
|
Merge branch 'dev' into ppr1
# Conflicts:
# src/gps/NMEAGPS.cpp
|
2020-10-16 15:59:55 +08:00 |
Kevin Hester
|
b32e3f1269
|
Merge pull request #479 from geeksville/dev
minor eink things
|
2020-10-15 23:44:15 -07:00 |
Kevin Hester
|
68ddb712f5
|
properly keep nrf52s from sleeping
|
2020-10-16 14:00:56 +08:00 |
Kevin Hester
|
2fb5cd8c1c
|
work with more NMEA gps sentences
|
2020-10-16 14:00:17 +08:00 |
Kevin Hester
|
79aea8231f
|
make screen positions less hardwired wrt font size
|
2020-10-16 11:22:07 +08:00 |
Kevin Hester
|
b0837c10c6
|
eink display improvements
|
2020-10-16 10:53:55 +08:00 |
Jm Casler
|
cd811951b1
|
Merge pull request #481 from mc-hamster/master
Update from mchamster to dev-https
|
2020-10-15 19:53:03 -07:00 |
Jm Casler
|
df2976dad0
|
Merge pull request #18 from meshtastic/dev-https
From Dev https to mc-hamster master
|
2020-10-15 19:40:49 -07:00 |