-
Notifications
You must be signed in to change notification settings - Fork 541
Split debug menu and add Segger RTT as option for logging output #423
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
Closed
Closed
Changes from all commits
Commits
Show all changes
22 commits
Select commit
Hold shift + click to select a range
d5b77b0
Improve debugging options
henrygab 75145eb
Add Peek() to SEGGER RTT.
henrygab f67a5d5
Expose default Stream for logging.
henrygab 59831e4
Allow RTT to emulate Serial class
henrygab f809eaa
Add SEGGER_RTT_TerminalOutBuffer()
henrygab 8d89c8e
Add RTT Serial and Terminal class.
henrygab f53d730
Set RTT mode to SKIP and always set default logger
henrygab 4bb3e65
Use default logger for Bluefruit52Lib library.
henrygab b7939d6
Fix build errors.
henrygab dade31e
Expose Adalogger underlying class
henrygab edb9f85
Fix non-native USB boards.
henrygab 5fe8c06
Revert to exposing base Stream class only
henrygab 969ac52
Remove/revert menu options
henrygab 666d72c
Ignore boards.local.txt and platform.local.txt
henrygab 4981f73
Merge branch 'master' into Segger_RTT
henrygab 45cf21f
Remove accidental copy/paste
henrygab 897a56e
Remove outdated comment
henrygab 671a661
Unmodified SysView target source files
henrygab 7f43816
Unmodified, except when previously modified.
henrygab 58156b2
Fails to compile.
henrygab 62dbfd4
Compiles w/o modification to original SEGGER files
henrygab 1aaa510
Remember to use `extern "C" {}`
henrygab 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 hidden or 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 hidden or 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 hidden or 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 hidden or 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,71 @@ | ||
| /** | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 by SimpleHacks, Henry Gabryjelski | ||
| * | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| #include <SeggerRTTSerial.h> | ||
| #include <SEGGER_Extensions.h> | ||
|
|
||
|
|
||
| size_t Segger_RTT_Serial_t::write(uint8_t b) { | ||
| return SEGGER_RTT_PutChar(0, (char)b); | ||
| } | ||
| size_t Segger_RTT_Serial_t::write(const uint8_t *buffer, size_t size) { | ||
| return SEGGER_RTT_Write(0, buffer, size); | ||
| } | ||
| int Segger_RTT_Serial_t::availableForWrite() { | ||
| return SEGGER_RTT_GetAvailWriteSpace(0); | ||
| } | ||
| int Segger_RTT_Serial_t::available() { // to read | ||
| return SEGGER_RTT_HasData(0); | ||
| } | ||
| int Segger_RTT_Serial_t::read() { | ||
| return SEGGER_RTT_GetKey(); | ||
| } | ||
| int Segger_RTT_Serial_t::peek() { | ||
| return SEGGER_RTT_Peek(); | ||
| } | ||
| void Segger_RTT_Serial_t::flush() { | ||
| // no-op -- cannot flush as cannot control host | ||
| } | ||
| // Baud and config are ignored for RTT | ||
| void Segger_RTT_Serial_t::begin (uint32_t baud) | ||
| { | ||
| (void) baud; | ||
| } | ||
| void Segger_RTT_Serial_t::begin (uint32_t baud, uint8_t config) | ||
| { | ||
| (void) baud; | ||
| (void) config; | ||
| } | ||
| void Segger_RTT_Serial_t::end(void) | ||
| { | ||
| // nothing to do | ||
| } | ||
| Segger_RTT_Serial_t::operator bool() | ||
| { | ||
| return true; | ||
| } | ||
|
|
||
|
|
||
|
|
This file contains hidden or 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,76 @@ | ||
| /** | ||
| * The MIT License (MIT) | ||
| * | ||
| * Copyright (c) 2020 by SimpleHacks, Henry Gabryjelski | ||
| * | ||
| * 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. | ||
| * | ||
| */ | ||
|
|
||
| #ifndef SeggerRTTSerial_h | ||
| #define SeggerRTTSerial_h | ||
|
|
||
| //#include "Arduino.h" | ||
| #include <stdint.h> | ||
| #include <Stream.h> | ||
| #include <SEGGER_RTT.h> | ||
| #include <SEGGER_Extensions.h> | ||
|
|
||
| class Segger_RTT_Serial_t : public Stream { | ||
| public: | ||
| virtual size_t write(uint8_t b) override; | ||
| virtual size_t write(const uint8_t *buffer, size_t size) override; | ||
| virtual int availableForWrite() override; | ||
| virtual int available() override; | ||
| virtual int read() override; | ||
| virtual int peek() override; | ||
| virtual void flush() override; | ||
| // Additional non-virtual functions to emulate `Serial` | ||
| operator bool(); | ||
| void begin(uint32_t baud); | ||
| void begin(uint32_t baud, uint8_t config); | ||
| void end(void); | ||
| }; | ||
|
|
||
| // Segger RTT allows for multiple virtual terminals | ||
| // via channel 0 ... but note that this will add | ||
| // 4 bytes RTT buffer overhead to each call to write(). | ||
| template <unsigned char TerminalId> | ||
| class Segger_RTT_Terminal_t : public Segger_RTT_Serial_t { | ||
| private: | ||
| static_assert(TerminalId < SEGGER_RTT_NUMBER_OF_TERMINALS, "TerminalID must be less than SEGGER_RTT_NUMBER_OF_TERMINALS" ); | ||
| public: | ||
| virtual size_t write(uint8_t b) override { | ||
| return SEGGER_RTT_TerminalOutBuffer(TerminalId, &b, 1); | ||
| } | ||
| virtual size_t write(const uint8_t *buffer, size_t size) override { | ||
| return SEGGER_RTT_TerminalOutBuffer(TerminalId, buffer, size); | ||
| } | ||
| virtual int availableForWrite() override { | ||
| int result = SEGGER_RTT_GetAvailWriteSpace(0); | ||
| if (result > SEGGER_RTT_TERMINAL_OUT_OVERHEAD) { | ||
| result -= SEGGER_RTT_TERMINAL_OUT_OVERHEAD; | ||
| } else if (result > 0) { | ||
| result = 0; | ||
| } | ||
| return result; | ||
| } | ||
| }; | ||
|
|
||
| #endif // #ifndef SeggerRTTSerial_h |
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.