Skip to content

Commit 14cb644

Browse files
pschatzmannpschatzmann
committed
ArduinoLogger: begin()
1 parent e181e35 commit 14cb644

File tree

4 files changed

+59
-59
lines changed

4 files changed

+59
-59
lines changed

‎ArduinoCore-Linux/cores/arduino/ArduinoLogger.h‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,37 +23,37 @@ class ArduinoLogger {
2323
const char* LogLevelTxt[4] = {"Debug", "Info", "Warning", "Error"};
2424

2525
// activate the logging
26-
virtual void setLogger(Stream& out, LogLevel level = Error) {
26+
void begin(Stream& out, LogLevel level = Warning) {
2727
this->log_stream_ptr = &out;
2828
this->log_level = level;
2929
}
3030

3131
// checks if the logging is active
32-
virtual bool isLogging() { return log_stream_ptr != nullptr; }
32+
bool isLogging() { return log_stream_ptr != nullptr; }
3333

34-
virtual void error(const char* str, const char* str1 = nullptr,
35-
const char* str2 = nullptr) {
34+
void error(const char* str, const char* str1 = nullptr,
35+
const char* str2 = nullptr) {
3636
log(Error, str, str1, str2);
3737
}
3838

39-
virtual void info(const char* str, const char* str1 = nullptr,
40-
const char* str2 = nullptr) {
39+
void info(const char* str, const char* str1 = nullptr,
40+
const char* str2 = nullptr) {
4141
log(Info, str, str1, str2);
4242
}
4343

44-
virtual void warning(const char* str, const char* str1 = nullptr,
45-
const char* str2 = nullptr) {
44+
void warning(const char* str, const char* str1 = nullptr,
45+
const char* str2 = nullptr) {
4646
log(Warning, str, str1, str2);
4747
}
4848

49-
virtual void debug(const char* str, const char* str1 = nullptr,
50-
const char* str2 = nullptr) {
49+
void debug(const char* str, const char* str1 = nullptr,
50+
const char* str2 = nullptr) {
5151
log(Debug, str, str1, str2);
5252
}
5353

5454
// write an message to the log
55-
virtual void log(LogLevel current_level, const char* str,
56-
const char* str1 = nullptr, const char* str2 = nullptr) {
55+
void log(LogLevel current_level, const char* str, const char* str1 = nullptr,
56+
const char* str2 = nullptr) {
5757
if (log_stream_ptr != nullptr) {
5858
if (current_level >= log_level) {
5959
log_stream_ptr->print("Emulator - ");

‎docs/html/_arduino_logger_8h_source.html‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -98,37 +98,37 @@
9898
<div class="line"><a id="l00023" name="l00023"></a><span class="lineno"> 23</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* LogLevelTxt[4] = {<span class="stringliteral">&quot;Debug&quot;</span>, <span class="stringliteral">&quot;Info&quot;</span>, <span class="stringliteral">&quot;Warning&quot;</span>, <span class="stringliteral">&quot;Error&quot;</span>};</div>
9999
<div class="line"><a id="l00024" name="l00024"></a><span class="lineno"> 24</span> </div>
100100
<div class="line"><a id="l00025" name="l00025"></a><span class="lineno"> 25</span> <span class="comment">// activate the logging</span></div>
101-
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> setLogger(Stream&amp; out, <a class="code hl_enumeration" href="classarduino_1_1_arduino_logger.html#a467191041310d59bdf2316798d624305">LogLevel</a> level = Error) {</div>
101+
<div class="line"><a id="l00026" name="l00026"></a><span class="lineno"> 26</span> <span class="keywordtype">void</span> begin(Stream&amp; out, <a class="code hl_enumeration" href="classarduino_1_1_arduino_logger.html#a467191041310d59bdf2316798d624305">LogLevel</a> level = Warning) {</div>
102102
<div class="line"><a id="l00027" name="l00027"></a><span class="lineno"> 27</span> this-&gt;log_stream_ptr = &amp;out;</div>
103103
<div class="line"><a id="l00028" name="l00028"></a><span class="lineno"> 28</span> this-&gt;log_level = level;</div>
104104
<div class="line"><a id="l00029" name="l00029"></a><span class="lineno"> 29</span> }</div>
105105
<div class="line"><a id="l00030" name="l00030"></a><span class="lineno"> 30</span> </div>
106106
<div class="line"><a id="l00031" name="l00031"></a><span class="lineno"> 31</span> <span class="comment">// checks if the logging is active</span></div>
107-
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span> <span class="keyword">virtual</span> <span class="keywordtype">bool</span> isLogging() { <span class="keywordflow">return</span> log_stream_ptr != <span class="keyword">nullptr</span>; }</div>
107+
<div class="line"><a id="l00032" name="l00032"></a><span class="lineno"> 32</span> <span class="keywordtype">bool</span> isLogging() { <span class="keywordflow">return</span> log_stream_ptr != <span class="keyword">nullptr</span>; }</div>
108108
<div class="line"><a id="l00033" name="l00033"></a><span class="lineno"> 33</span> </div>
109-
<div class="line"><a id="l00034" name="l00034"></a><span class="lineno"> 34</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> error(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
110-
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
109+
<div class="line"><a id="l00034" name="l00034"></a><span class="lineno"> 34</span> <span class="keywordtype">void</span> error(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
110+
<div class="line"><a id="l00035" name="l00035"></a><span class="lineno"> 35</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
111111
<div class="line"><a id="l00036" name="l00036"></a><span class="lineno"> 36</span> log(Error, str, str1, str2);</div>
112112
<div class="line"><a id="l00037" name="l00037"></a><span class="lineno"> 37</span> }</div>
113113
<div class="line"><a id="l00038" name="l00038"></a><span class="lineno"> 38</span> </div>
114-
<div class="line"><a id="l00039" name="l00039"></a><span class="lineno"> 39</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> info(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
115-
<div class="line"><a id="l00040" name="l00040"></a><span class="lineno"> 40</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
114+
<div class="line"><a id="l00039" name="l00039"></a><span class="lineno"> 39</span> <span class="keywordtype">void</span> info(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
115+
<div class="line"><a id="l00040" name="l00040"></a><span class="lineno"> 40</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
116116
<div class="line"><a id="l00041" name="l00041"></a><span class="lineno"> 41</span> log(Info, str, str1, str2);</div>
117117
<div class="line"><a id="l00042" name="l00042"></a><span class="lineno"> 42</span> }</div>
118118
<div class="line"><a id="l00043" name="l00043"></a><span class="lineno"> 43</span> </div>
119-
<div class="line"><a id="l00044" name="l00044"></a><span class="lineno"> 44</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> warning(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
120-
<div class="line"><a id="l00045" name="l00045"></a><span class="lineno"> 45</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
119+
<div class="line"><a id="l00044" name="l00044"></a><span class="lineno"> 44</span> <span class="keywordtype">void</span> warning(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
120+
<div class="line"><a id="l00045" name="l00045"></a><span class="lineno"> 45</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
121121
<div class="line"><a id="l00046" name="l00046"></a><span class="lineno"> 46</span> log(Warning, str, str1, str2);</div>
122122
<div class="line"><a id="l00047" name="l00047"></a><span class="lineno"> 47</span> }</div>
123123
<div class="line"><a id="l00048" name="l00048"></a><span class="lineno"> 48</span> </div>
124-
<div class="line"><a id="l00049" name="l00049"></a><span class="lineno"> 49</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> debug(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
125-
<div class="line"><a id="l00050" name="l00050"></a><span class="lineno"> 50</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
124+
<div class="line"><a id="l00049" name="l00049"></a><span class="lineno"> 49</span> <span class="keywordtype">void</span> debug(<span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
125+
<div class="line"><a id="l00050" name="l00050"></a><span class="lineno"> 50</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
126126
<div class="line"><a id="l00051" name="l00051"></a><span class="lineno"> 51</span> log(Debug, str, str1, str2);</div>
127127
<div class="line"><a id="l00052" name="l00052"></a><span class="lineno"> 52</span> }</div>
128128
<div class="line"><a id="l00053" name="l00053"></a><span class="lineno"> 53</span> </div>
129129
<div class="line"><a id="l00054" name="l00054"></a><span class="lineno"> 54</span> <span class="comment">// write an message to the log</span></div>
130-
<div class="line"><a id="l00055" name="l00055"></a><span class="lineno"> 55</span> <span class="keyword">virtual</span> <span class="keywordtype">void</span> log(<a class="code hl_enumeration" href="classarduino_1_1_arduino_logger.html#a467191041310d59bdf2316798d624305">LogLevel</a> current_level, <span class="keyword">const</span> <span class="keywordtype">char</span>* str,</div>
131-
<div class="line"><a id="l00056" name="l00056"></a><span class="lineno"> 56</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>, <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
130+
<div class="line"><a id="l00055" name="l00055"></a><span class="lineno"> 55</span> <span class="keywordtype">void</span> log(<a class="code hl_enumeration" href="classarduino_1_1_arduino_logger.html#a467191041310d59bdf2316798d624305">LogLevel</a> current_level, <span class="keyword">const</span> <span class="keywordtype">char</span>* str, <span class="keyword">const</span> <span class="keywordtype">char</span>* str1 = <span class="keyword">nullptr</span>,</div>
131+
<div class="line"><a id="l00056" name="l00056"></a><span class="lineno"> 56</span> <span class="keyword">const</span> <span class="keywordtype">char</span>* str2 = <span class="keyword">nullptr</span>) {</div>
132132
<div class="line"><a id="l00057" name="l00057"></a><span class="lineno"> 57</span> <span class="keywordflow">if</span> (log_stream_ptr != <span class="keyword">nullptr</span>) {</div>
133133
<div class="line"><a id="l00058" name="l00058"></a><span class="lineno"> 58</span> <span class="keywordflow">if</span> (current_level &gt;= log_level) {</div>
134134
<div class="line"><a id="l00059" name="l00059"></a><span class="lineno"> 59</span> log_stream_ptr-&gt;print(<span class="stringliteral">&quot;Emulator - &quot;</span>);</div>

0 commit comments

Comments
 (0)