jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-24 11:16:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Minor changes

Browse Source
This commit is contained in:
Theo Arends 2024-05-06 17:36:39 +02:00
parent c5e122f922
commit 21c7f4c81b
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tasmota/tasmota_xdrv_driver/xdrv_121_gpioviewer.ino
View File

@ -33,11 +33,13 @@
* Note 20240506
* - Tasmota v14.0.0
* - GVRelease 1.5.2
* - Function pinmode is reduced implemented by GPIOViewerVueApplication
* - Function pinmode is not fully implemented by gpio_viewer_1_5:
* Only INPUT_PULLUP and INPUT_PULLDOWN are reported as INPUT
* Only OUTPUT and OUTPUT_OPEN_DRAIN are reported as OUTPUT
* All other pin modes are reported as UNKNOWN
* - This driver is forcing INPUT_PULLUP for ANALOG and INPUT
* - Execute once command GvUrl https://thelastoutpostworkshop.github.io/microcontroller_devkit/gpio_viewer_1_5/
* - Clear browser cache to use new functionality
\*********************************************************************************************/
#define XDRV_121 121
@ -62,11 +64,11 @@ const char *GVRelease = "1.5.2";
/*********************************************************************************************/
// GPIO FUNCTIONS as defined by esp32-hal-gpio.h to be used by ESP8266 too, which uses different numbers
// Also defined in GPIOViewerVueApplication const.ts
#define GV_UNAVAILABLE -2 // Addition by GPIOViewerVueApplication
#define GV_NOT_SET -1 // Addition by GPIOViewerVueApplication
// Also defined in gpio_viewer_1_5 const.ts
#define GV_UNAVAILABLE -2 // Addition by gpio_viewer_1_5
#define GV_NOT_SET -1 // Addition by gpio_viewer_1_5
#define GV_NOT_USED 0 // Addition by this driver
#define GV_INPUT 0x01 // Not defined in GPIOViewerVueApplication !?!
#define GV_INPUT 0x01 // Not defined in gpio_viewer_1_5 !?!
#define GV_OUTPUT 0x03
#define GV_PULLUP 0x04
#define GV_INPUT_PULLUP 0x05

6
tasmota/tasmota_xdrv_driver/xdrv_73_8_lorawan_bridge.ino
View File

@ -92,8 +92,7 @@ bool LoraWanLoadData(void) {
const char* app_key = nullptr;
app_key = root.getStr(PSTR(D_JSON_APPKEY), nullptr);
if (strlen(app_key)) {
size_t out_len = TAS_LORAWAN_AES128_KEY_SIZE;
HexToBytes(app_key, Lora->settings.end_node[n].AppKey, out_len);
HexToBytes(app_key, Lora->settings.end_node[n].AppKey, TAS_LORAWAN_AES128_KEY_SIZE);
}
Lora->settings.end_node[n].DevEUIh = root.getUInt(PSTR(D_JSON_DEVEUI "h"), Lora->settings.end_node[n].DevEUIh);
Lora->settings.end_node[n].DevEUIl = root.getUInt(PSTR(D_JSON_DEVEUI "l"), Lora->settings.end_node[n].DevEUIl);
@ -581,8 +580,7 @@ void CmndLoraWanAppKey(void) {
if ((XdrvMailbox.index > 0) && (XdrvMailbox.index <= TAS_LORAWAN_ENDNODES)) {
uint32_t node = XdrvMailbox.index -1;
if (32 == XdrvMailbox.data_len) {
size_t out_len = TAS_LORAWAN_AES128_KEY_SIZE;
HexToBytes(XdrvMailbox.data, Lora->settings.end_node[node].AppKey, out_len);
HexToBytes(XdrvMailbox.data, Lora->settings.end_node[node].AppKey, TAS_LORAWAN_AES128_KEY_SIZE);
if (0 == Lora->settings.end_node[node].name.length()) {
Lora->settings.end_node[node].name = F("0x0000");
}