Skip to content

Commit 66d0eb3

Browse files
libdriverlibdriver
authored
Merge pull request #9 from hepingood/dev
style: fix some syntax errors
2 parents f422a45 + bc8b75c commit 66d0eb3

13 files changed

+44
-42
lines changed

‎doc/html/driver__max30105_8c_source.html

+7-7
Original file line numberDiff line numberDiff line change
@@ -233,15 +233,15 @@
233233
<div class="line"><a name="l00203"></a><span class="lineno"> 203</span>&#160; res = handle-&gt;<a class="code" href="structmax30105__handle__s.html#adca3ee7a793bbf510d5267daf0fcf1c5">iic_write</a>(<a class="code" href="driver__max30105_8c.html#acb8783512e3bd21bdb6a294d026e6405">MAX30105_ADDRESS</a>, <a class="code" href="driver__max30105_8c.html#a687d571022c3e51d6bd8255193bbf870">MAX30105_REG_FIFO_READ_POINTER</a>, (uint8_t *)&amp;prev, 1); <span class="comment">/* write fifo read pointer */</span></div>
234234
<div class="line"><a name="l00204"></a><span class="lineno"> 204</span>&#160; <span class="keywordflow">if</span> (res != 0) <span class="comment">/* check result */</span></div>
235235
<div class="line"><a name="l00205"></a><span class="lineno"> 205</span>&#160; {</div>
236-
<div class="line"><a name="l00206"></a><span class="lineno"> 206</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: wirte fifo read pointer failed.\n&quot;</span>); <span class="comment">/* write fifo read pointer failed */</span></div>
236+
<div class="line"><a name="l00206"></a><span class="lineno"> 206</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: write fifo read pointer failed.\n&quot;</span>); <span class="comment">/* write fifo read pointer failed */</span></div>
237237
<div class="line"><a name="l00207"></a><span class="lineno"> 207</span>&#160; (void)handle-&gt;<a class="code" href="structmax30105__handle__s.html#af6963bbad902ca6e43942b48c07986c3">iic_deinit</a>(); <span class="comment">/* iic deinit */</span></div>
238238
<div class="line"><a name="l00208"></a><span class="lineno"> 208</span>&#160; </div>
239239
<div class="line"><a name="l00209"></a><span class="lineno"> 209</span>&#160; <span class="keywordflow">return</span> 6; <span class="comment">/* return error */</span></div>
240240
<div class="line"><a name="l00210"></a><span class="lineno"> 210</span>&#160; }</div>
241241
<div class="line"><a name="l00211"></a><span class="lineno"> 211</span>&#160; res = handle-&gt;<a class="code" href="structmax30105__handle__s.html#adca3ee7a793bbf510d5267daf0fcf1c5">iic_write</a>(<a class="code" href="driver__max30105_8c.html#acb8783512e3bd21bdb6a294d026e6405">MAX30105_ADDRESS</a>, <a class="code" href="driver__max30105_8c.html#adde55e45c2b54f2b5b2aee9a05d7cae2">MAX30105_REG_FIFO_WRITE_POINTER</a>, (uint8_t *)&amp;prev, 1); <span class="comment">/* write fifo write pointer */</span></div>
242242
<div class="line"><a name="l00212"></a><span class="lineno"> 212</span>&#160; <span class="keywordflow">if</span> (res != 0) <span class="comment">/* check result */</span></div>
243243
<div class="line"><a name="l00213"></a><span class="lineno"> 213</span>&#160; {</div>
244-
<div class="line"><a name="l00214"></a><span class="lineno"> 214</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: wirte fifo write pointer failed.\n&quot;</span>); <span class="comment">/* write fifo write pointer failed */</span></div>
244+
<div class="line"><a name="l00214"></a><span class="lineno"> 214</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: write fifo write pointer failed.\n&quot;</span>); <span class="comment">/* write fifo write pointer failed */</span></div>
245245
<div class="line"><a name="l00215"></a><span class="lineno"> 215</span>&#160; (void)handle-&gt;<a class="code" href="structmax30105__handle__s.html#af6963bbad902ca6e43942b48c07986c3">iic_deinit</a>(); <span class="comment">/* iic deinit */</span></div>
246246
<div class="line"><a name="l00216"></a><span class="lineno"> 216</span>&#160; </div>
247247
<div class="line"><a name="l00217"></a><span class="lineno"> 217</span>&#160; <span class="keywordflow">return</span> 6; <span class="comment">/* return error */</span></div>
@@ -343,7 +343,7 @@
343343
<div class="line"><a name="l00334"></a><span class="lineno"> 334</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a4a9a1af4e28aea769f6d9f02a02e07c3">receive_callback</a>(<a class="code" href="group__max30105__basic__driver.html#gga67f6d42848a17a1ef6bd802cc250c918a321c6df03bc2731e724025fe52865c01">MAX30105_INTERRUPT_STATUS_ALC_OVF</a>); <span class="comment">/* run callback */</span></div>
344344
<div class="line"><a name="l00335"></a><span class="lineno"> 335</span>&#160; }</div>
345345
<div class="line"><a name="l00336"></a><span class="lineno"> 336</span>&#160; }</div>
346-
<div class="line"><a name="l00337"></a><span class="lineno"> 337</span>&#160; <span class="keywordflow">if</span> ((prev &amp; (1 &lt;&lt; <a class="code" href="group__max30105__basic__driver.html#gga67f6d42848a17a1ef6bd802cc250c918aba850026bca7d755bb2f00b529dfb241">MAX30105_INTERRUPT_STATUS_PROX_INT</a>)) != 0) <span class="comment">/* check prox int */</span></div>
346+
<div class="line"><a name="l00337"></a><span class="lineno"> 337</span>&#160; <span class="keywordflow">if</span> ((prev &amp; (1 &lt;&lt; <a class="code" href="group__max30105__basic__driver.html#gga67f6d42848a17a1ef6bd802cc250c918aba850026bca7d755bb2f00b529dfb241">MAX30105_INTERRUPT_STATUS_PROX_INT</a>)) != 0) <span class="comment">/* check proxy int */</span></div>
347347
<div class="line"><a name="l00338"></a><span class="lineno"> 338</span>&#160; {</div>
348348
<div class="line"><a name="l00339"></a><span class="lineno"> 339</span>&#160; <span class="keywordflow">if</span> (handle-&gt;<a class="code" href="structmax30105__handle__s.html#a4a9a1af4e28aea769f6d9f02a02e07c3">receive_callback</a> != NULL) <span class="comment">/* if receive callback */</span></div>
349349
<div class="line"><a name="l00340"></a><span class="lineno"> 340</span>&#160; {</div>
@@ -795,7 +795,7 @@
795795
<div class="line"><a name="l00862"></a><span class="lineno"> 862</span>&#160; res = handle-&gt;<a class="code" href="structmax30105__handle__s.html#adca3ee7a793bbf510d5267daf0fcf1c5">iic_write</a>(<a class="code" href="driver__max30105_8c.html#acb8783512e3bd21bdb6a294d026e6405">MAX30105_ADDRESS</a>, <a class="code" href="driver__max30105_8c.html#adde55e45c2b54f2b5b2aee9a05d7cae2">MAX30105_REG_FIFO_WRITE_POINTER</a>, (uint8_t *)&amp;prev, 1); <span class="comment">/* write fifo write pointer */</span></div>
796796
<div class="line"><a name="l00863"></a><span class="lineno"> 863</span>&#160; <span class="keywordflow">if</span> (res != 0) <span class="comment">/* check result */</span></div>
797797
<div class="line"><a name="l00864"></a><span class="lineno"> 864</span>&#160; {</div>
798-
<div class="line"><a name="l00865"></a><span class="lineno"> 865</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: wirte fifo write pointer failed.\n&quot;</span>); <span class="comment">/* write fifo write pointer failed */</span></div>
798+
<div class="line"><a name="l00865"></a><span class="lineno"> 865</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: write fifo write pointer failed.\n&quot;</span>); <span class="comment">/* write fifo write pointer failed */</span></div>
799799
<div class="line"><a name="l00866"></a><span class="lineno"> 866</span>&#160; </div>
800800
<div class="line"><a name="l00867"></a><span class="lineno"> 867</span>&#160; <span class="keywordflow">return</span> 1; <span class="comment">/* return error */</span></div>
801801
<div class="line"><a name="l00868"></a><span class="lineno"> 868</span>&#160; }</div>
@@ -911,7 +911,7 @@
911911
<div class="line"><a name="l01024"></a><span class="lineno"> 1024</span>&#160; res = handle-&gt;<a class="code" href="structmax30105__handle__s.html#adca3ee7a793bbf510d5267daf0fcf1c5">iic_write</a>(<a class="code" href="driver__max30105_8c.html#acb8783512e3bd21bdb6a294d026e6405">MAX30105_ADDRESS</a>, <a class="code" href="driver__max30105_8c.html#a687d571022c3e51d6bd8255193bbf870">MAX30105_REG_FIFO_READ_POINTER</a>, (uint8_t *)&amp;prev, 1); <span class="comment">/* write fifo read pointer */</span></div>
912912
<div class="line"><a name="l01025"></a><span class="lineno"> 1025</span>&#160; <span class="keywordflow">if</span> (res != 0) <span class="comment">/* check result */</span></div>
913913
<div class="line"><a name="l01026"></a><span class="lineno"> 1026</span>&#160; {</div>
914-
<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: wirte fifo read pointer failed.\n&quot;</span>); <span class="comment">/* write fifo read pointer failed */</span></div>
914+
<div class="line"><a name="l01027"></a><span class="lineno"> 1027</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: write fifo read pointer failed.\n&quot;</span>); <span class="comment">/* write fifo read pointer failed */</span></div>
915915
<div class="line"><a name="l01028"></a><span class="lineno"> 1028</span>&#160; </div>
916916
<div class="line"><a name="l01029"></a><span class="lineno"> 1029</span>&#160; <span class="keywordflow">return</span> 1; <span class="comment">/* return error */</span></div>
917917
<div class="line"><a name="l01030"></a><span class="lineno"> 1030</span>&#160; }</div>
@@ -961,7 +961,7 @@
961961
<div class="line"><a name="l01096"></a><span class="lineno"> 1096</span>&#160; res = handle-&gt;<a class="code" href="structmax30105__handle__s.html#adca3ee7a793bbf510d5267daf0fcf1c5">iic_write</a>(<a class="code" href="driver__max30105_8c.html#acb8783512e3bd21bdb6a294d026e6405">MAX30105_ADDRESS</a>, <a class="code" href="driver__max30105_8c.html#a75196e8cb68be277b9cd88a0be9f8efb">MAX30105_REG_FIFO_DATA_REGISTER</a>, (uint8_t *)&amp;data, 1); <span class="comment">/* write fifo data register */</span></div>
962962
<div class="line"><a name="l01097"></a><span class="lineno"> 1097</span>&#160; <span class="keywordflow">if</span> (res != 0) <span class="comment">/* check result */</span></div>
963963
<div class="line"><a name="l01098"></a><span class="lineno"> 1098</span>&#160; {</div>
964-
<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: wirte fifo data register failed.\n&quot;</span>); <span class="comment">/* write fifo data register failed */</span></div>
964+
<div class="line"><a name="l01099"></a><span class="lineno"> 1099</span>&#160; handle-&gt;<a class="code" href="structmax30105__handle__s.html#a769d5b3a6c14790a0e126e8fe70b384b">debug_print</a>(<span class="stringliteral">&quot;max30105: write fifo data register failed.\n&quot;</span>); <span class="comment">/* write fifo data register failed */</span></div>
965965
<div class="line"><a name="l01100"></a><span class="lineno"> 1100</span>&#160; </div>
966966
<div class="line"><a name="l01101"></a><span class="lineno"> 1101</span>&#160; <span class="keywordflow">return</span> 1; <span class="comment">/* return error */</span></div>
967967
<div class="line"><a name="l01102"></a><span class="lineno"> 1102</span>&#160; }</div>
@@ -2114,7 +2114,7 @@
21142114
<div class="line"><a name="l02671"></a><span class="lineno"> 2671</span>&#160; info-&gt;<a class="code" href="structmax30105__info__s.html#a9db82802561bf22d799b03a345f1d1dc">max_current_ma</a> = <a class="code" href="driver__max30105_8c.html#a2989837a37d6d63b59c6dd541b785435">MAX_CURRENT</a>; <span class="comment">/* set maximum current */</span></div>
21152115
<div class="line"><a name="l02672"></a><span class="lineno"> 2672</span>&#160; info-&gt;<a class="code" href="structmax30105__info__s.html#a3366a5dce9b829e03c3d321c2b4df3f6">temperature_max</a> = <a class="code" href="driver__max30105_8c.html#a90c0b20d54005712fcc8cb01281360e9">TEMPERATURE_MAX</a>; <span class="comment">/* set minimal temperature */</span></div>
21162116
<div class="line"><a name="l02673"></a><span class="lineno"> 2673</span>&#160; info-&gt;<a class="code" href="structmax30105__info__s.html#a8f9dbe66ac0b66ebae0a36fcb4ba368e">temperature_min</a> = <a class="code" href="driver__max30105_8c.html#aab353db5bf4eb787f86a2080f609a551">TEMPERATURE_MIN</a>; <span class="comment">/* set maximum temperature */</span></div>
2117-
<div class="line"><a name="l02674"></a><span class="lineno"> 2674</span>&#160; info-&gt;<a class="code" href="structmax30105__info__s.html#a41b0bd442708b70d252c50b92c75265a">driver_version</a> = <a class="code" href="driver__max30105_8c.html#ae578001fe043b4cca7a0edd801cfe9c4">DRIVER_VERSION</a>; <span class="comment">/* set driver verison */</span></div>
2117+
<div class="line"><a name="l02674"></a><span class="lineno"> 2674</span>&#160; info-&gt;<a class="code" href="structmax30105__info__s.html#a41b0bd442708b70d252c50b92c75265a">driver_version</a> = <a class="code" href="driver__max30105_8c.html#ae578001fe043b4cca7a0edd801cfe9c4">DRIVER_VERSION</a>; <span class="comment">/* set driver version */</span></div>
21182118
<div class="line"><a name="l02675"></a><span class="lineno"> 2675</span>&#160; </div>
21192119
<div class="line"><a name="l02676"></a><span class="lineno"> 2676</span>&#160; <span class="keywordflow">return</span> 0; <span class="comment">/* success return 0 */</span></div>
21202120
<div class="line"><a name="l02677"></a><span class="lineno"> 2677</span>&#160;}</div>

‎doc/html/driver__max30105__interface__template_8c_source.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@
145145
<div class="line"><a name="l00141"></a><span class="lineno"> 141</span>&#160; }</div>
146146
<div class="line"><a name="l00142"></a><span class="lineno"> 142</span>&#160; <span class="keywordflow">case</span> <a class="code" href="group__max30105__basic__driver.html#gga67f6d42848a17a1ef6bd802cc250c918aba850026bca7d755bb2f00b529dfb241">MAX30105_INTERRUPT_STATUS_PROX_INT</a> :</div>
147147
<div class="line"><a name="l00143"></a><span class="lineno"> 143</span>&#160; {</div>
148-
<div class="line"><a name="l00144"></a><span class="lineno"> 144</span>&#160; <a class="code" href="group__max30105__interface__driver.html#ga05fd6dd464e408afb68dbc305a02f0e1">max30105_interface_debug_print</a>(<span class="stringliteral">&quot;max30105: irq prox int.\n&quot;</span>);</div>
148+
<div class="line"><a name="l00144"></a><span class="lineno"> 144</span>&#160; <a class="code" href="group__max30105__interface__driver.html#ga05fd6dd464e408afb68dbc305a02f0e1">max30105_interface_debug_print</a>(<span class="stringliteral">&quot;max30105: irq proxy int.\n&quot;</span>);</div>
149149
<div class="line"><a name="l00145"></a><span class="lineno"> 145</span>&#160; </div>
150150
<div class="line"><a name="l00146"></a><span class="lineno"> 146</span>&#160; <span class="keywordflow">break</span>;</div>
151151
<div class="line"><a name="l00147"></a><span class="lineno"> 147</span>&#160; }</div>

‎doc/html/group__max30105__basic__driver.html

+3-3
Original file line numberDiff line numberDiff line change
@@ -969,7 +969,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#gae8b1e2995eec0770bfbffd2
969969
<li>3 handle is not initialized </li>
970970
</ul>
971971
</dd></dl>
972-
<dl class="section note"><dt>Note</dt><dd>nonw </dd></dl>
972+
<dl class="section note"><dt>Note</dt><dd>none </dd></dl>
973973

974974
<p class="definition">Definition at line <a class="el" href="driver__max30105_8c_source.html#l00965">965</a> of file <a class="el" href="driver__max30105_8c_source.html">driver_max30105.c</a>.</p>
975975

@@ -1016,7 +1016,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga7db512492e14dd57a99da2d
10161016
<li>3 handle is not initialized </li>
10171017
</ul>
10181018
</dd></dl>
1019-
<dl class="section note"><dt>Note</dt><dd>nonw </dd></dl>
1019+
<dl class="section note"><dt>Note</dt><dd>none </dd></dl>
10201020

10211021
<p class="definition">Definition at line <a class="el" href="driver__max30105_8c_source.html#l01046">1046</a> of file <a class="el" href="driver__max30105_8c_source.html">driver_max30105.c</a>.</p>
10221022

@@ -1157,7 +1157,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga587eba88662e56a780bb5bf
11571157
<li>3 handle is not initialized </li>
11581158
</ul>
11591159
</dd></dl>
1160-
<dl class="section note"><dt>Note</dt><dd>nonw </dd></dl>
1160+
<dl class="section note"><dt>Note</dt><dd>none </dd></dl>
11611161

11621162
<p class="definition">Definition at line <a class="el" href="driver__max30105_8c_source.html#l00884">884</a> of file <a class="el" href="driver__max30105_8c_source.html">driver_max30105.c</a>.</p>
11631163

‎doc/html/group__max30105__example__driver.html

+1-1
Original file line numberDiff line numberDiff line change
@@ -355,7 +355,7 @@ <h2 class="memtitle"><span class="permalink"><a href="#ga96adf7f16ee91bbab27db51
355355
</tr>
356356
</table>
357357
</div><div class="memdoc">
358-
<p>gren red ir mode </p>
358+
<p>green red ir mode </p>
359359

360360
<p class="definition">Definition at line <a class="el" href="driver__max30105__fifo_8h_source.html#l00059">59</a> of file <a class="el" href="driver__max30105__fifo_8h_source.html">driver_max30105_fifo.h</a>.</p>
361361

‎example/driver_max30105_fifo.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ extern "C"{
5656
#define MAX30105_FIFO_DEFAULT_SAMPLE_AVERAGING MAX30105_SAMPLE_AVERAGING_8 /**< sample 8 */
5757
#define MAX30105_FIFO_DEFAULT_FIFO_ROLL MAX30105_BOOL_TRUE /**< enable */
5858
#define MAX30105_FIFO_DEFAULT_FIFO_ALMOST_FULL 0xF /**< 0xF */
59-
#define MAX30105_FIFO_DEFAULT_MODE MAX30105_MODE_GREEN_RED_IR /**< gren red ir mode */
59+
#define MAX30105_FIFO_DEFAULT_MODE MAX30105_MODE_GREEN_RED_IR /**< green red ir mode */
6060
#define MAX30105_FIFO_DEFAULT_PARTICLE_SENSING_ADC_RANGE MAX30105_PARTICLE_SENSING_ADC_RANGE_4096 /**< adc range 4096 */
6161
#define MAX30105_FIFO_DEFAULT_PARTICLE_SENSING_SAMPLE_RATE MAX30105_PARTICLE_SENSING_SAMPLE_RATE_100_HZ /**< 100 Hz */
6262
#define MAX30105_FIFO_DEFAULT_ADC_RESOLUTION MAX30105_ADC_RESOLUTION_18_BIT /**< 18 bits */

0 commit comments

Comments
 (0)