Commit Graph

368 Commits (v2.4.3)

Author SHA1 Message Date
Colin Kuebler 85f4bd3fa2 Added python-setuptools for python-pip 2019-09-29 12:34:29 -04:00
Colin Kuebler b427d48741 Typo 2019-09-28 17:24:05 -04:00
Colin Kuebler 5de40b0a70 Warn users if their Tuya device is not ESP based 2019-09-28 17:22:09 -04:00
Colin Kuebler 624b6c44ed
Merge pull request #281 from meingraham/patch-1
Tasmota Recommendations
2019-09-28 08:50:36 -04:00
Michael Ingraham 9a7094f8ba
Tasmota Recommendations 2019-09-28 08:40:36 -04:00
Colin Kuebler 2c023f5b18 Print ID as hex, before calculating PSK 2019-09-26 20:09:58 -04:00
Colin Kuebler 68962299ab Update README to indicate that OTA flashing works once again but remain cautious 2019-09-26 20:08:14 -04:00
Colin Kuebler 99a936768c Added python-pip, thanks @AlphaSierraHotel 2019-09-26 16:39:19 -04:00
Colin Kuebler f2d20de93e Python2 friendly print 2019-09-26 16:37:43 -04:00
Colin Kuebler 6983f67f92 Pretty print IP and port 2019-09-26 14:44:08 -04:00
Colin Kuebler cba1111814 Simplify schema expression 2019-09-26 14:43:32 -04:00
Colin Kuebler df06f2b24d
Merge pull request #277 from digiblur/master
Change thirdparty.bin to WiFi Manager default Tasmota
2019-09-26 14:07:29 -04:00
Colin Kuebler 4195c53daf Experimental workaround, some users are reporting better luck with python vs python3 for psk-frontend 2019-09-26 13:55:01 -04:00
Colin Kuebler 153c8ed842 Start dnsmasq with command line options rather than a config file
No need to backup or restore dnsmasq.conf
Use wildcard to resolve all dns queries to 10.42.42.1
Write hostapd.conf locally so we don't need to backup/restore
Use sudo when writing NetworkManager.conf
Added and tweaked some log messages
Use pkill to stop hostapd so the cleanup portion of setup_ap is run
2019-09-26 12:47:39 -04:00
Colin Kuebler bb39283d95 Do not imply that payload decryption failure is an issue, it is expected for .active endpoints 2019-09-25 16:56:44 -04:00
Colin Kuebler ec453412de Activation workaround by extending dummy schema - some devices crash if schema is shorter than expected
Added missing URLs in activation response
Readded .updatestatus to avoid .upgrade from catching this endpoint
Verify payload decryption is JSON
2019-09-25 10:25:40 -04:00
digiblur d0f9a1330f
Update bin to WiFi Manager as default of Tasmota 2019-09-24 20:33:16 -05:00
digiblur 4ebfd4be38
Delete thirdparty.bin 2019-09-24 20:32:20 -05:00
Colin Kuebler 97ecf0e305 Log SSL exceptions for debugging 2019-09-24 21:07:40 -04:00
Colin Kuebler c0e57847a9 Fix variable rename missed 2019-09-23 16:39:31 -04:00
Colin Kuebler ac19da4d83 Revert python to python3 as per discussion in #273 2019-09-23 16:36:20 -04:00
Colin Kuebler 5df7637452 Combined reply_encrypted in reply with encrypted flag
Tidying up by removing some redundant endpoints and adding comments
Now all but the activation endpoints use encryption when requested
2019-09-23 00:01:31 -04:00
Colin Kuebler 2a83af3d29 Set defaults for query params to prevent exceptions when missing 2019-09-22 18:50:24 -04:00
Colin Kuebler a88db23ee4 Reorganized imports and made secKey configurable via command line option 2019-09-22 18:49:43 -04:00
Colin Kuebler 2104d47be5 Redirect GET requests to our POST handler 2019-09-22 18:29:02 -04:00
Colin Kuebler da42236a1d Implemented encrypted response support
Removed additional config.get payload, does not appear to be necessary and in some cases was causing problems
Revert upgrade type to 0 since we are trying to update the firmware on the main ESP82xx, not an external MCU
2019-09-22 18:25:30 -04:00
Colin Kuebler 27f1a33605 Enhance logging
Print request details, method, headers, and decrypted payload
Print response payload
2019-09-22 18:19:04 -04:00
Colin Kuebler 60c7ccbba7 Print out PSK identity for debugging purposes 2019-09-22 18:13:14 -04:00
Colin Kuebler 769901a673 Added endpoint for /d.json based on reports in #273 2019-09-21 18:32:47 -04:00
Colin Kuebler 5fe523aafe Merge branch 'master' into new-api
Attempted to integrate new API responses with old ones, based on et=1 param
**Untested**
2019-09-21 18:27:31 -04:00
Colin Kuebler 30a0b9197e Merge branch 'repeat-smartconfig' into improve-flow 2019-09-21 17:35:35 -04:00
Colin Kuebler 2039394c17 Pass the protocol version from trigger_upgrade to mq_pub_15 2019-09-21 17:34:52 -04:00
Colin Kuebler 5114b1ef7d
Merge branch 'master' into fix-net-inf 2019-09-21 17:28:55 -04:00
Colin Kuebler 95632b143f
Merge pull request #226 from kueblc/enhance-api
Server enhancements, API additions
2019-09-21 17:22:44 -04:00
Colin Kuebler 41ac947ce7 Readded old protocol 2.1 encoding back into mq_pub_15
Added optional argument "--protocol" which specifies whether to use the old or new MQTT encoding
Cleaned up a bit, adding some descriptive variable names and reducing code clutter
2019-09-21 17:08:46 -04:00
Colin Kuebler 468a976d05 Added libssl-dev as prereq for py sslpsk 2019-09-21 16:10:44 -04:00
Colin Kuebler 2903bd286e Added python3-dev and pycrypto as per #274 2019-09-21 16:06:16 -04:00
Colin Kuebler 8291ced3da Tidy PSK generation, only define PSK hint in one location 2019-09-21 16:04:10 -04:00
Madmartigan ea815b7d62 fix: gwId was not parsed 2019-09-19 08:33:28 +02:00
Madmartigan ed4fcaf8a4 fix typo 2019-09-18 22:15:27 +02:00
Madmartigan f1b27e4dc2 Add dependancy on fixed sslpsk 2019-09-18 21:43:32 +02:00
Madmartigan 7d588cda4e Circumvent new tuya sdk protection 2019-09-18 21:38:11 +02:00
Colin Kuebler 41df188dde Ignore "flag files" from git 2019-08-07 17:12:30 -04:00
Colin Kuebler 4c3fba4f91 Increased timeout for devices to appear to ~60s 2019-08-07 17:10:30 -04:00
Colin Kuebler a81da2b85e Added backups folder to gitignore 2019-08-07 17:10:14 -04:00
Colin Kuebler 4b9b1a0e1e Download backups and info to a backup directory with timestamped subdirectories
This allows us to do multiple backups without overwriting, as seen in #162 #182 and others
2019-08-07 16:54:35 -04:00
Colin Kuebler b55299d4bb Clean up smartconfig and prompt user to retry if device fails to appear online 2019-08-07 15:34:23 -04:00
Colin Kuebler f345e1843d Only print out smart config parameters once 2019-08-07 13:52:47 -04:00
Colin Kuebler 497bedbcfb Add a delay after starting the AP to allow time for the network interface to come up
This quick fix avoids issues where we want to bind to a specific address offered on the new AP
2019-08-07 13:27:13 -04:00
Colin Kuebler e3b49824f6 Start and stop smart-config as a fork instead of a screen
Allows smart-config to run as long as start_flash determines it necessary
2019-08-07 13:20:49 -04:00