espressif/esp-protocols
1
0
Fork 1
mirror of https://github.com/espressif/esp-protocols.git synced 2025-07-22 06:52:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

Network-DCE: Minor updates per code review

Browse Source
This commit is contained in:
David Cermak
2021-04-06 10:18:23 +02:00
parent 099168e043
commit 527bad0dc0
11 changed files with 3311 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
esp_modem/include/cxx_include/esp_modem_dce_factory.hpp
View File

@ -24,7 +24,7 @@ public:
static std::unique_ptr<PdpContext> create_pdp_context(std::string &apn);
template <typename T, typename ...Args>
static bool make(T* &t, Args&&... args)
static auto make(T* &t, Args&&... args) -> std::remove_reference_t<decltype(t)>
{
t = new T(std::forward<Args>(args)...);
return true;
@ -46,8 +46,9 @@ public:
};
template<typename T>
template<typename Module>
class Builder {
static_assert(std::is_base_of<ModuleIf, Module>::value, "Builder must be used only for Module classes");
public:
explicit Builder(std::shared_ptr<DTE> dte): dte(std::move(dte))
{
@ -61,7 +62,7 @@ public:
throw_if_false(netif != nullptr, "Null netif");
}
Builder(std::shared_ptr<DTE> dte, esp_netif_t* esp_netif, std::shared_ptr<T> dev): dte(std::move(dte)), module(std::move(dev)), netif(esp_netif)
Builder(std::shared_ptr<DTE> dte, esp_netif_t* esp_netif, std::shared_ptr<Module> dev): dte(std::move(dte)), module(std::move(dev)), netif(esp_netif)
{
throw_if_false(netif != nullptr, "Null netif");
}
@ -75,7 +76,7 @@ public:
template<typename Ptr>
bool create_module(Ptr &t, const esp_modem_dce_config *config)
{
return FactoryHelper::make<T>(t, dte, config);
return FactoryHelper::make<Module>(t, dte, config);
}
template<typename DceT, typename Ptr>
@ -93,7 +94,7 @@ public:
private:
std::shared_ptr<DTE> dte;
std::shared_ptr<T> module;
std::shared_ptr<Module> module;
esp_netif_t *netif;
};

14
esp_modem/include/cxx_include/esp_modem_types.hpp
View File

@ -15,6 +15,11 @@
#ifndef _ESP_MODEM_TYPES_HPP_
#define _ESP_MODEM_TYPES_HPP_
#include <functional>
#include <string>
#include <cstddef>
#include <cstdint>
namespace esp_modem {
enum class modem_mode {
@ -33,12 +38,9 @@ enum class command_result {
typedef std::function<command_result(uint8_t *data, size_t len)> got_line_cb;
struct PdpContext {
explicit PdpContext(std::string &apn) : context_id(1), protocol_type("IP"), apn(apn) {}
explicit PdpContext(const char *apn) : context_id(1), protocol_type("IP"), apn(apn) {}
size_t context_id;
std::string protocol_type;
explicit PdpContext(std::string apn) : apn(std::move(apn)) {}
size_t context_id = 1;
std::string protocol_type = "IP";
std::string apn;
};