diff options
| author |   Romain Forlot <romain.forlot@iot.bzh> | 2017-09-19 01:17:28 +0200 |
|---|---|---|
| committer | Romain Forlot <romain.forlot@iot.bzh> | 2017-12-14 11:00:25 +0100 |
| commit | f4fba8a2744991ff8c5cb8af4a67c7d9456f1057 (patch) | |
| tree | 352231c9342344599ec2af08ef82495deefb238f /signal-composer-binding/signal-composer.hpp | |
| parent | 9f61a83961cdbf133fdeb80cb978e6c79f4a9547 (diff) | |
Modification about conf definition
- Argument for each signal subscription. (getSignalsArgs)
- differentiation between Signal as raw signal from another API
and virtual signal depending upon other signals
- changing way to specify function with uri that specify everythings
that could be needed to invoke a function.
Change-Id: I8917c5ae3c2c1e3fa48ddfdda41fc75eaba32bb7
Signed-off-by: Romain Forlot <romain.forlot@iot.bzh>
Diffstat (limited to 'signal-composer-binding/signal-composer.hpp')
| -rw-r--r-- | signal-composer-binding/signal-composer.hpp | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/signal-composer-binding/signal-composer.hpp b/signal-composer-binding/signal-composer.hpp index 341eaab..4050700 100644 --- a/signal-composer-binding/signal-composer.hpp +++ b/signal-composer-binding/signal-composer.hpp @@ -28,7 +28,7 @@ private: CtlConfigT* ctlConfig_; static CtlSectionT ctlSections_[]; ///< Config Section definition (note: controls section index should match handle retrieval in) - std::vector<SourceAPI> sourcesList_; + std::vector<SourceAPI> sourcesListV_; explicit bindingApp(const std::string& filepath); bindingApp(); @@ -37,15 +37,16 @@ private: CtlActionT* convert2Action(const std::string& name, json_object* action); int loadOneSourceAPI(json_object* sourcesJ); - static int loadSourcesAPI(CtlSectionT* section, json_object *sectionJ); + static int loadSourcesAPI(CtlSectionT* section, json_object *signalsJ); int loadOneSignal(json_object* signalsJ); - static int loadSignals(CtlSectionT* section, json_object *sectionJ); + static int loadSignals(CtlSectionT* section, json_object *signalsJ); public: static bindingApp& instance(); + static std::vector<std::string> parseURI(const std::string& uri); int loadConfig(const std::string& filepath); - //void loadSignalsFile(std::string signalsFile); + int loadSignals(json_object* signalsJ); CtlConfigT* ctlConfig(); std::vector<std::shared_ptr<Signal>> getAllSignals(); @@ -53,7 +54,7 @@ public: std::shared_ptr<Signal> searchSignal(const std::string& aName); json_object* getSignalValue(const std::string& sig, json_object* options); - int execSubscription() const; + int execSubscription(); }; struct pluginCBT |