This repository has been archived by the owner on Apr 18, 2024. It is now read-only.
-
Notifications
You must be signed in to change notification settings - Fork 141
Port reset function from master branch #64
Merged
Merged
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 |
---|---|---|
|
@@ -3,7 +3,8 @@ _build | |
**/CMakeFiles | ||
**/CMakeCache.txt | ||
*.pyc | ||
sdk/ | ||
**/build | ||
/sdk/ | ||
|
||
# Object files | ||
*.o | ||
|
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
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
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
52 changes: 52 additions & 0 deletions
52
src/sd_api_v2/sdk/components/serialization/application/codecs/common/conn_systemreset_app.c
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,52 @@ | ||
/* | ||
* Copyright (c) 2016 Nordic Semiconductor ASA | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without modification, | ||
* are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, this | ||
* list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form must reproduce the above copyright notice, this | ||
* list of conditions and the following disclaimer in the documentation and/or | ||
* other materials provided with the distribution. | ||
* | ||
* 3. Neither the name of Nordic Semiconductor ASA nor the names of other | ||
* contributors to this software may be used to endorse or promote products | ||
* derived from this software without specific prior written permission. | ||
* | ||
* 4. This software must only be used in or with a processor manufactured by Nordic | ||
* Semiconductor ASA, or in or with a processor manufactured by a third party that | ||
* is used in combination with a processor manufactured by Nordic Semiconductor. | ||
* | ||
* 5. Any software provided in binary or object form under this license must not be | ||
* reverse engineered, decompiled, modified and/or disassembled. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND | ||
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED | ||
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR | ||
* ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES | ||
* (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; | ||
* LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON | ||
* ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS | ||
* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
*/ | ||
|
||
#include "ble_serialization.h" | ||
#include "conn_systemreset_app.h" | ||
|
||
uint32_t conn_systemreset_enc(uint8_t * const p_buf, | ||
uint32_t * const p_buf_len) | ||
{ | ||
SER_ASSERT_NOT_NULL(p_buf); | ||
SER_ASSERT_NOT_NULL(p_buf_len); | ||
SER_ASSERT_LENGTH_LEQ(2, *p_buf_len); | ||
|
||
*p_buf = CONN_SYSTEMRESET; | ||
*p_buf_len = 1; | ||
|
||
return NRF_SUCCESS; | ||
} |
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
52 changes: 0 additions & 52 deletions
52
src/sd_api_v3/sdk/components/serialization/application/codecs/common/conn_systemreset.h
This file was deleted.
Oops, something went wrong.
21 changes: 21 additions & 0 deletions
21
src/sd_api_v3/sdk/components/serialization/application/codecs/common/conn_systemreset_app.c
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,21 @@ | ||
/* Copyright (c) 2014 Nordic Semiconductor. All Rights Reserved. | ||
* | ||
* The information contained herein is property of Nordic Semiconductor ASA. | ||
* Terms and conditions of usage are described in detail in NORDIC | ||
* SEMICONDUCTOR STANDARD SOFTWARE LICENSE AGREEMENT. | ||
* | ||
* Licensees are granted free, non-transferable use of the information. NO | ||
* WARRANTY of ANY KIND is provided. This heading must NOT be removed from | ||
* the file. | ||
* | ||
*/ | ||
|
||
#include "ble_serialization.h" | ||
#include "conn_systemreset_app.h" | ||
|
||
uint32_t conn_systemreset_enc(uint8_t * const p_buf, | ||
uint32_t * const p_buf_len) | ||
{ | ||
SER_REQ_ENC_BEGIN(CONN_SYSTEMRESET); | ||
SER_REQ_ENC_END; | ||
} |
91 changes: 91 additions & 0 deletions
91
src/sd_api_v3/sdk/components/serialization/application/codecs/common/conn_systemreset_app.h
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,91 @@ | ||
/** | ||
* Copyright (c) 2014 - 2017, Nordic Semiconductor ASA | ||
* | ||
* All rights reserved. | ||
* | ||
* Redistribution and use in source and binary forms, with or without modification, | ||
* are permitted provided that the following conditions are met: | ||
* | ||
* 1. Redistributions of source code must retain the above copyright notice, this | ||
* list of conditions and the following disclaimer. | ||
* | ||
* 2. Redistributions in binary form, except as embedded into a Nordic | ||
* Semiconductor ASA integrated circuit in a product or a software update for | ||
* such product, must reproduce the above copyright notice, this list of | ||
* conditions and the following disclaimer in the documentation and/or other | ||
* materials provided with the distribution. | ||
* | ||
* 3. Neither the name of Nordic Semiconductor ASA nor the names of its | ||
* contributors may be used to endorse or promote products derived from this | ||
* software without specific prior written permission. | ||
* | ||
* 4. This software, with or without modification, must only be used with a | ||
* Nordic Semiconductor ASA integrated circuit. | ||
* | ||
* 5. Any software provided in binary form under this license must not be reverse | ||
* engineered, decompiled, modified and/or disassembled. | ||
* | ||
* THIS SOFTWARE IS PROVIDED BY NORDIC SEMICONDUCTOR ASA "AS IS" AND ANY EXPRESS | ||
* OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES | ||
* OF MERCHANTABILITY, NONINFRINGEMENT, AND FITNESS FOR A PARTICULAR PURPOSE ARE | ||
* DISCLAIMED. IN NO EVENT SHALL NORDIC SEMICONDUCTOR ASA OR CONTRIBUTORS BE | ||
* LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR | ||
* CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE | ||
* GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) | ||
* HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT | ||
* LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT | ||
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
* | ||
*/ | ||
#ifndef CONN_SYSTEMRESET_H__ | ||
#define CONN_SYSTEMRESET_H__ | ||
|
||
#ifdef __cplusplus | ||
extern "C" { | ||
#endif | ||
|
||
/** @addtogroup CONN_ENUMERATIONS Enumerations | ||
* @{ */ | ||
|
||
/** | ||
* @brief Connectivity API SVC numbers. | ||
*/ | ||
enum CONN_SVCS | ||
{ | ||
CONN_SYSTEMRESET = 0x00, | ||
}; | ||
|
||
/** | ||
* @addtogroup ser_codecs Serialization codecs | ||
* @ingroup ble_sdk_lib_serialization | ||
*/ | ||
|
||
/** | ||
* @addtogroup ser_app_common_codecs Application common codecs | ||
* @ingroup ser_codecs_app | ||
*/ | ||
|
||
/**@file | ||
* | ||
* @defgroup conn_systemreset Connectivity chip reset command request encoder | ||
* @{ | ||
* @ingroup ser_app_common_codecs | ||
* | ||
* @brief Connectivity chip reset command request encoder. | ||
*/ | ||
|
||
/**@brief Function for performing the connectivity chip reset. | ||
* | ||
* @retval NRF_SUCCESS Encoding success. | ||
* @retval NRF_ERROR_INTERNAL Encoding failure. Transport error. | ||
*/ | ||
uint32_t conn_systemreset_enc(uint8_t * const p_buf, | ||
uint32_t * const p_buf_len); | ||
|
||
/** @} */ | ||
|
||
#ifdef __cplusplus | ||
} | ||
#endif | ||
|
||
#endif // CONN_SYSTEMRESET_H__ |
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.
I'm not sure how git behaves, but is the absolute path here relative to the git repo?
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.
This is for ignoring the
sdk
folder in root but not ignoring thesdk
folder in src/sdk @bencefrThere 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.
From the gitignore doc: A leading slash matches the beginning of the pathname. For example, "/.c" matches "cat-file.c" but not "mozilla-sha1/sha1.c".*