-
Notifications
You must be signed in to change notification settings - Fork 59
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Plugins: Allow view specific config #201
Draft
nhjschulz
wants to merge
1
commit into
BlueAndi:Development
Choose a base branch
from
nhjschulz:feature/view_config
base: Development
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Draft
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,109 @@ | ||
/* MIT License | ||
* | ||
* Copyright (c) 2024 - 2024 Andreas Merkle <web@blue-andi.de> | ||
* | ||
* Permission is hereby granted, free of charge, to any person obtaining a copy | ||
* of this software and associated documentation files (the "Software"), to deal | ||
* in the Software without restriction, including without limitation the rights | ||
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
* copies of the Software, and to permit persons to whom the Software is | ||
* furnished to do so, subject to the following conditions: | ||
* | ||
* The above copyright notice and this permission notice shall be included in all | ||
* copies or substantial portions of the Software. | ||
* | ||
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE | ||
* SOFTWARE. | ||
*/ | ||
|
||
/******************************************************************************* | ||
DESCRIPTION | ||
*******************************************************************************/ | ||
/** | ||
* @brief Json Configuration interface | ||
* @author Andreas Merkle <web@blue-andi.de> | ||
* | ||
* @addtogroup hal | ||
* | ||
* @{ | ||
*/ | ||
|
||
#ifndef IJSON_CONFIG_H | ||
#define IJSON_CONFIG_H | ||
|
||
/****************************************************************************** | ||
* Compile Switches | ||
*****************************************************************************/ | ||
|
||
/****************************************************************************** | ||
* Includes | ||
*****************************************************************************/ | ||
#include <ArduinoJson.h> | ||
|
||
/****************************************************************************** | ||
* Macros | ||
*****************************************************************************/ | ||
|
||
/****************************************************************************** | ||
* Types and Classes | ||
*****************************************************************************/ | ||
|
||
/** | ||
* This interface defines the functions required for JSON bases configuration | ||
* updates. It is used to provide and apply configuration settings to and from | ||
* a REST API. | ||
*/ | ||
class IJsonConfig | ||
{ | ||
public: | ||
|
||
/** | ||
* Destroys the interface object | ||
*/ | ||
virtual ~IJsonConfig() | ||
{ | ||
} | ||
|
||
/** | ||
* Get current active configuration in JSON format. | ||
* | ||
* @param[out] cfg Configuration | ||
*/ | ||
virtual void getConfiguration(JsonObject& jsonCfg) const = 0; | ||
|
||
/** | ||
* Apply configuration from JSON. | ||
* | ||
* @param[in] cfg Configuration | ||
* | ||
* @return If successful set, it will return true otherwise false. | ||
*/ | ||
virtual bool setConfiguration(const JsonObjectConst& jsonCfg) = 0; | ||
|
||
/** | ||
* Merge JSON configuration with local settings to create a complete set. | ||
* | ||
* The received configuration may not contain all single key/value pair. | ||
* Therefore create a complete internal configuration and overwrite it | ||
* with the received one. | ||
* | ||
* @param[out] jsonMerged The complete config set with merge content from jsonSource. | ||
* @param[in] jsonSource The recevied congi set, which may not cover all keys. | ||
* @return true Keys needed merging. | ||
* @return false Nothing needed merging. | ||
*/ | ||
virtual bool mergeConfiguration(JsonObject& jsonMerged, const JsonObjectConst& jsonSource) = 0; | ||
}; | ||
|
||
/****************************************************************************** | ||
* Functions | ||
*****************************************************************************/ | ||
|
||
#endif /* IJSON_CONFIG_H */ | ||
|
||
/** @} */ |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Not sure whether the interface class is necessary, see my comment in PluginWithConfig.hpp
mergeConfiguration() is only required between plugin main class and its view. The other two methods are in general required for configuration file handling in PluginWithConfig.
Additional it increases the dependency from plugin library to common library. But could live in plugin library.