localhorst/ttn-esp32
1
0
Fork 0
mirror of https://github.com/manuelbl/ttn-esp32.git synced 2025-06-15 12:24:27 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove TTNProvisioning.h

Browse Source
This commit is contained in:
Manuel Bleichenbacher 2021-07-25 22:15:21 +02:00
parent f421db44d7
commit 36edf92944
4 changed files with 31 additions and 66 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/TTNProvisioning.h
View File

@ -1,35 +0,0 @@
/*******************************************************************************
*
* ttn-esp32 - The Things Network device library for ESP-IDF / SX127x
*
* Copyright (c) 2018-2021 Manuel Bleichenbacher
*
* Licensed under MIT License
* https://opensource.org/licenses/MIT
*
* Task listening on a UART port for provisioning commands.
*******************************************************************************/
#ifndef _ttnprovisioning_h_
#define _ttnprovisioning_h_
#include "ttn_provisioning.h"
class TTNProvisioning
{
public:
TTNProvisioning() { ttn_provision_init(); }
bool haveKeys() { return ttn_provision_have_keys(); }
bool decodeKeys(const char *dev_eui, const char *app_eui, const char *app_key) { return ttn_provision_decode_keys(dev_eui, app_eui, app_key); }
bool fromMAC(const char *app_eui, const char *app_key) { return ttn_provision_from_mac(app_eui, app_key); }
bool saveKeys() { return ttn_provision_save_keys(); }
bool restoreKeys(bool silent) { return ttn_provision_restore_keys(silent); }
#if defined(TTN_HAS_AT_COMMANDS)
void startTask() { ttn_provision_start_task(); }
#endif
};
#endif

26
src/TheThingsNetwork.cpp
View File

@ -134,25 +134,25 @@ void TheThingsNetwork::startup()
bool TheThingsNetwork::provision(const char *devEui, const char *appEui, const char *appKey) bool TheThingsNetwork::provision(const char *devEui, const char *appEui, const char *appKey)
{ {
if (!ttn_provision_decode_keys(devEui, appEui, appKey)) if (!ttn_provisioning_decode_keys(devEui, appEui, appKey))
return false; return false;
return ttn_provision_save_keys(); return ttn_provisioning_save_keys();
} }
bool TheThingsNetwork::provisionWithMAC(const char *appEui, const char *appKey) bool TheThingsNetwork::provisionWithMAC(const char *appEui, const char *appKey)
{ {
if (!ttn_provision_from_mac(appEui, appKey)) if (!ttn_provisioning_from_mac(appEui, appKey))
return false; return false;
return ttn_provision_save_keys(); return ttn_provisioning_save_keys();
} }
void TheThingsNetwork::startProvisioningTask() void TheThingsNetwork::startProvisioningTask()
{ {
#if defined(TTN_HAS_AT_COMMANDS) #if defined(TTN_HAS_AT_COMMANDS)
ttn_provision_start_task(); ttn_provisioning_start_task();
#else #else
ESP_LOGE(TAG, "AT commands are disabled. Change the configuration using 'make menuconfig'"); ESP_LOGE(TAG, "AT commands are disabled. Change the configuration using 'make menuconfig'");
ASSERT(0); ASSERT(0);
@ -169,7 +169,7 @@ void TheThingsNetwork::waitForProvisioning()
return; return;
} }
while (!ttn_provision_have_keys()) while (!ttn_provisioning_have_keys())
vTaskDelay(pdMS_TO_TICKS(1000)); vTaskDelay(pdMS_TO_TICKS(1000));
ESP_LOGI(TAG, "Device successfully provisioned"); ESP_LOGI(TAG, "Device successfully provisioned");
@ -182,7 +182,7 @@ void TheThingsNetwork::waitForProvisioning()
bool TheThingsNetwork::join(const char *devEui, const char *appEui, const char *appKey) bool TheThingsNetwork::join(const char *devEui, const char *appEui, const char *appKey)
{ {
if (!ttn_provision_decode_keys(devEui, appEui, appKey)) if (!ttn_provisioning_decode_keys(devEui, appEui, appKey))
return false; return false;
return joinCore(); return joinCore();
@ -190,9 +190,9 @@ bool TheThingsNetwork::join(const char *devEui, const char *appEui, const char *
bool TheThingsNetwork::join() bool TheThingsNetwork::join()
{ {
if (!ttn_provision_have_keys()) if (!ttn_provisioning_have_keys())
{ {
if (!ttn_provision_restore_keys(false)) if (!ttn_provisioning_restore_keys(false))
return false; return false;
} }
@ -201,7 +201,7 @@ bool TheThingsNetwork::join()
bool TheThingsNetwork::joinCore() bool TheThingsNetwork::joinCore()
{ {
if (!ttn_provision_have_keys()) if (!ttn_provisioning_have_keys())
{ {
ESP_LOGW(TAG, "Device EUI, App EUI and/or App key have not been provided"); ESP_LOGW(TAG, "Device EUI, App EUI and/or App key have not been provided");
return false; return false;
@ -267,12 +267,12 @@ void TheThingsNetwork::onMessage(TTNMessageCallback callback)
bool TheThingsNetwork::isProvisioned() bool TheThingsNetwork::isProvisioned()
{ {
if (ttn_provision_have_keys()) if (ttn_provisioning_have_keys())
return true; return true;
ttn_provision_restore_keys(true); ttn_provisioning_restore_keys(true);
return ttn_provision_have_keys(); return ttn_provisioning_have_keys();
} }
void TheThingsNetwork::setRSSICal(int8_t rssiCal) void TheThingsNetwork::setRSSICal(int8_t rssiCal)

22
src/ttn_provisioning.c
View File

@ -96,7 +96,7 @@ void os_getDevKey (u1_t* buf)
// --- Constructor // --- Constructor
void ttn_provision_init(void) void ttn_provisioning_init(void)
{ {
} }
@ -105,7 +105,7 @@ void ttn_provision_init(void)
#if defined(TTN_HAS_AT_COMMANDS) #if defined(TTN_HAS_AT_COMMANDS)
void ttn_provision_start_task(void) void ttn_provisioning_start_task(void)
{ {
#if defined(TTN_CONFIG_UART) #if defined(TTN_CONFIG_UART)
config_uart(); config_uart();
@ -244,9 +244,9 @@ void process_line(void)
{ {
line_buf[24] = 0; line_buf[24] = 0;
line_buf[41] = 0; line_buf[41] = 0;
is_ok = ttn_provision_decode_keys(line_buf + 8, line_buf + 25, line_buf + 42); is_ok = ttn_provisioning_decode_keys(line_buf + 8, line_buf + 25, line_buf + 42);
if (is_ok) if (is_ok)
is_ok = ttn_provision_save_keys(); is_ok = ttn_provisioning_save_keys();
reset_needed = is_ok; reset_needed = is_ok;
} }
} }
@ -256,9 +256,9 @@ void process_line(void)
if (is_ok) if (is_ok)
{ {
line_buf[25] = 0; line_buf[25] = 0;
is_ok = ttn_provision_from_mac(line_buf + 9, line_buf + 26); is_ok = ttn_provisioning_from_mac(line_buf + 9, line_buf + 26);
if (is_ok) if (is_ok)
is_ok = ttn_provision_save_keys(); is_ok = ttn_provisioning_save_keys();
reset_needed = is_ok; reset_needed = is_ok;
} }
} }
@ -342,17 +342,17 @@ void config_uart(void)
// --- Key handling // --- Key handling
bool ttn_provision_have_keys(void) bool ttn_provisioning_have_keys(void)
{ {
return have_keys; return have_keys;
} }
bool ttn_provision_decode_keys(const char *dev_eui, const char *app_eui, const char *app_key) bool ttn_provisioning_decode_keys(const char *dev_eui, const char *app_eui, const char *app_key)
{ {
return decode(true, dev_eui, app_eui, app_key); return decode(true, dev_eui, app_eui, app_key);
} }
bool ttn_provision_from_mac(const char *app_eui, const char *app_key) bool ttn_provisioning_from_mac(const char *app_eui, const char *app_key)
{ {
uint8_t mac[6]; uint8_t mac[6];
esp_err_t err = esp_efuse_mac_get_default(mac); esp_err_t err = esp_efuse_mac_get_default(mac);
@ -414,7 +414,7 @@ bool decode(bool incl_dev_eui, const char *dev_eui, const char *app_eui, const c
// --- Non-volatile storage // --- Non-volatile storage
bool ttn_provision_save_keys() bool ttn_provisioning_save_keys()
{ {
bool result = false; bool result = false;
@ -449,7 +449,7 @@ done:
return result; return result;
} }
bool ttn_provision_restore_keys(bool silent) bool ttn_provisioning_restore_keys(bool silent)
{ {
uint8_t buf_dev_eui[8]; uint8_t buf_dev_eui[8];
uint8_t buf_app_eui[8]; uint8_t buf_app_eui[8];

14
src/ttn_provisioning.h
View File

@ -19,17 +19,17 @@
extern "C" { extern "C" {
#endif #endif
void ttn_provision_init(void); void ttn_provisioning_init(void);
bool ttn_provision_have_keys(void); bool ttn_provisioning_have_keys(void);
bool ttn_provision_decode_keys(const char *dev_eui, const char *app_eui, const char *app_key); bool ttn_provisioning_decode_keys(const char *dev_eui, const char *app_eui, const char *app_key);
bool ttn_provision_from_mac(const char *app_eui, const char *app_key); bool ttn_provisioning_from_mac(const char *app_eui, const char *app_key);
bool ttn_provision_save_keys(void); bool ttn_provisioning_save_keys(void);
bool ttn_provision_restore_keys(bool silent); bool ttn_provisioning_restore_keys(bool silent);
#if defined(TTN_HAS_AT_COMMANDS) #if defined(TTN_HAS_AT_COMMANDS)
void ttn_provision_start_task(void); void ttn_provisioning_start_task(void);
#endif #endif
#ifdef __cplusplus #ifdef __cplusplus