|
81 | 81 | <div class="line"><a name="l00020"></a><span class="lineno"> 20</span> <span class="preprocessor">#endif</span></div>
|
82 | 82 | <div class="line"><a name="l00021"></a><span class="lineno"> 21</span>  </div>
|
83 | 83 | <div class="line"><a name="l00022"></a><span class="lineno"> 22</span> <span class="comment">// User Callback</span></div>
|
84 |
| -<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="keyword">typedef</span> void (*sam_callback)(<span class="keywordtype">size_t</span> size, <span class="keywordtype">void</span> *values);</div> |
| 84 | +<div class="line"><a name="l00023"></a><span class="lineno"> 23</span> <span class="keyword">typedef</span> void (*sam_callback)(<span class="keywordtype">size_t</span> size, int16_t *values);</div> |
85 | 85 | <div class="line"><a name="l00024"></a><span class="lineno"> 24</span>  </div>
|
86 | 86 | <div class="line"><a name="l00025"></a><span class="lineno"> 25</span> <span class="comment">// Application Callback</span></div>
|
87 | 87 | <div class="line"><a name="l00026"></a><span class="lineno"> 26</span> <span class="keyword">static</span> <span class="keywordtype">void</span> OutputByteCallback(<span class="keywordtype">void</span> *cbdata, <span class="keywordtype">unsigned</span> <span class="keywordtype">char</span> b);</div>
|
|
135 | 135 | <div class="line"><a name="l00082"></a><span class="lineno"> 82</span>  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> write(<span class="keywordtype">byte</span> *buffer, <span class="keywordtype">int</span> bytes_count) {</div>
|
136 | 136 | <div class="line"><a name="l00083"></a><span class="lineno"> 83</span>  SAM_LOG(<span class="stringliteral">"SAMOutputCallback::write: %d"</span>, bytes_count);</div>
|
137 | 137 | <div class="line"><a name="l00084"></a><span class="lineno"> 84</span>  <span class="keywordtype">int</span> size = bytes_count;</div>
|
138 |
| -<div class="line"><a name="l00085"></a><span class="lineno"> 85</span>  callback(size, (int8_t *)buffer);</div> |
| 138 | +<div class="line"><a name="l00085"></a><span class="lineno"> 85</span>  callback(size, (int16_t *)buffer);</div> |
139 | 139 | <div class="line"><a name="l00086"></a><span class="lineno"> 86</span>  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div>
|
140 | 140 | <div class="line"><a name="l00087"></a><span class="lineno"> 87</span>  }</div>
|
141 | 141 | <div class="line"><a name="l00088"></a><span class="lineno"> 88</span>  </div>
|
|
236 | 236 | <div class="line"><a name="l00190"></a><span class="lineno"> 190</span>  }</div>
|
237 | 237 | <div class="line"><a name="l00191"></a><span class="lineno"> 191</span>  }</div>
|
238 | 238 | <div class="line"><a name="l00192"></a><span class="lineno"> 192</span>  </div>
|
239 |
| -<div class="line"><a name="l00193"></a><span class="lineno"> 193</span>  <span class="keywordflow">if</span> (i2s_write(i2s_num, buffer, bytes_count * <span class="keyword">sizeof</span>(int16_t),</div> |
| 239 | +<div class="line"><a name="l00193"></a><span class="lineno"> 193</span>  <span class="keywordflow">if</span> (i2s_write(i2s_num, buffer, bytes_count,</div> |
240 | 240 | <div class="line"><a name="l00194"></a><span class="lineno"> 194</span>  &i2s_bytes_write, portMAX_DELAY) != ESP_OK) {</div>
|
241 | 241 | <div class="line"><a name="l00195"></a><span class="lineno"> 195</span>  ESP_LOGE(TAG, <span class="stringliteral">"i2s_write failed!"</span>);</div>
|
242 | 242 | <div class="line"><a name="l00196"></a><span class="lineno"> 196</span>  <span class="keywordflow">return</span> <span class="keyword">false</span>;</div>
|
|
318 | 318 | <div class="line"><a name="l00280"></a><span class="lineno"> 280</span>  <span class="keyword">const</span> <span class="keywordtype">char</span> *name() { <span class="keywordflow">return</span> <span class="stringliteral">"SAMPrintStream"</span>; }</div>
|
319 | 319 | <div class="line"><a name="l00281"></a><span class="lineno"> 281</span>  </div>
|
320 | 320 | <div class="line"><a name="l00282"></a><span class="lineno"> 282</span>  <span class="keyword">virtual</span> <span class="keywordtype">bool</span> write(<span class="keywordtype">byte</span> *buffer, <span class="keywordtype">int</span> bytes_count) {</div>
|
321 |
| -<div class="line"><a name="l00283"></a><span class="lineno"> 283</span>  <span class="keywordflow">switch</span> (bitsPerSample()) {</div> |
322 |
| -<div class="line"><a name="l00284"></a><span class="lineno"> 284</span>  <span class="keywordflow">case</span> 8:</div> |
323 |
| -<div class="line"><a name="l00285"></a><span class="lineno"> 285</span>  <span class="comment">// copy from 1 to 2 channels</span></div> |
324 |
| -<div class="line"><a name="l00286"></a><span class="lineno"> 286</span>  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j < bytes_count; j++) {</div> |
325 |
| -<div class="line"><a name="l00287"></a><span class="lineno"> 287</span>  out_ptr->print(buffer[j]);</div> |
326 |
| -<div class="line"><a name="l00288"></a><span class="lineno"> 288</span>  <span class="keywordflow">if</span> (j < channels() - 1) {</div> |
327 |
| -<div class="line"><a name="l00289"></a><span class="lineno"> 289</span>  out_ptr->print(<span class="stringliteral">","</span>);</div> |
328 |
| -<div class="line"><a name="l00290"></a><span class="lineno"> 290</span>  }</div> |
329 |
| -<div class="line"><a name="l00291"></a><span class="lineno"> 291</span>  <span class="keywordflow">if</span> (j == channels() - 1) {</div> |
330 |
| -<div class="line"><a name="l00292"></a><span class="lineno"> 292</span>  out_ptr->println();</div> |
331 |
| -<div class="line"><a name="l00293"></a><span class="lineno"> 293</span>  }</div> |
332 |
| -<div class="line"><a name="l00294"></a><span class="lineno"> 294</span>  }</div> |
333 |
| -<div class="line"><a name="l00295"></a><span class="lineno"> 295</span>  <span class="keywordflow">break</span>;</div> |
334 |
| -<div class="line"><a name="l00296"></a><span class="lineno"> 296</span>  </div> |
335 |
| -<div class="line"><a name="l00297"></a><span class="lineno"> 297</span>  <span class="keywordflow">case</span> 16:</div> |
336 |
| -<div class="line"><a name="l00298"></a><span class="lineno"> 298</span>  <span class="comment">// copy from 1 to 2 channels</span></div> |
337 |
| -<div class="line"><a name="l00299"></a><span class="lineno"> 299</span>  int16_t *buffer16 = (int16_t *)buffer;</div> |
338 |
| -<div class="line"><a name="l00300"></a><span class="lineno"> 300</span>  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j < bytes_count / 2; j++) {</div> |
339 |
| -<div class="line"><a name="l00301"></a><span class="lineno"> 301</span>  out_ptr->print(buffer16[j]);</div> |
340 |
| -<div class="line"><a name="l00302"></a><span class="lineno"> 302</span>  <span class="keywordflow">if</span> (j < channels() - 1) {</div> |
341 |
| -<div class="line"><a name="l00303"></a><span class="lineno"> 303</span>  out_ptr->print(<span class="stringliteral">","</span>);</div> |
342 |
| -<div class="line"><a name="l00304"></a><span class="lineno"> 304</span>  }</div> |
343 |
| -<div class="line"><a name="l00305"></a><span class="lineno"> 305</span>  <span class="keywordflow">if</span> (j == channels() - 1) {</div> |
344 |
| -<div class="line"><a name="l00306"></a><span class="lineno"> 306</span>  out_ptr->println();</div> |
345 |
| -<div class="line"><a name="l00307"></a><span class="lineno"> 307</span>  }</div> |
346 |
| -<div class="line"><a name="l00308"></a><span class="lineno"> 308</span>  }</div> |
347 |
| -<div class="line"><a name="l00309"></a><span class="lineno"> 309</span>  <span class="keywordflow">break</span>;</div> |
348 |
| -<div class="line"><a name="l00310"></a><span class="lineno"> 310</span>  }</div> |
349 |
| -<div class="line"><a name="l00311"></a><span class="lineno"> 311</span>  </div> |
350 |
| -<div class="line"><a name="l00312"></a><span class="lineno"> 312</span>  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div> |
351 |
| -<div class="line"><a name="l00313"></a><span class="lineno"> 313</span>  }</div> |
352 |
| -<div class="line"><a name="l00314"></a><span class="lineno"> 314</span> };</div> |
| 321 | +<div class="line"><a name="l00283"></a><span class="lineno"> 283</span>  <span class="comment">// copy from 1 to 2 channels</span></div> |
| 322 | +<div class="line"><a name="l00284"></a><span class="lineno"> 284</span>  int16_t *buffer16 = (int16_t *)buffer;</div> |
| 323 | +<div class="line"><a name="l00285"></a><span class="lineno"> 285</span>  <span class="keywordflow">for</span> (<span class="keywordtype">int</span> j = 0; j < bytes_count / 2; j++) {</div> |
| 324 | +<div class="line"><a name="l00286"></a><span class="lineno"> 286</span>  out_ptr->print(buffer16[j]);</div> |
| 325 | +<div class="line"><a name="l00287"></a><span class="lineno"> 287</span>  <span class="keywordflow">if</span> (j < channels() - 1) {</div> |
| 326 | +<div class="line"><a name="l00288"></a><span class="lineno"> 288</span>  out_ptr->print(<span class="stringliteral">","</span>);</div> |
| 327 | +<div class="line"><a name="l00289"></a><span class="lineno"> 289</span>  }</div> |
| 328 | +<div class="line"><a name="l00290"></a><span class="lineno"> 290</span>  <span class="keywordflow">if</span> (j == channels() - 1) {</div> |
| 329 | +<div class="line"><a name="l00291"></a><span class="lineno"> 291</span>  out_ptr->println();</div> |
| 330 | +<div class="line"><a name="l00292"></a><span class="lineno"> 292</span>  }</div> |
| 331 | +<div class="line"><a name="l00293"></a><span class="lineno"> 293</span>  }</div> |
| 332 | +<div class="line"><a name="l00294"></a><span class="lineno"> 294</span>  </div> |
| 333 | +<div class="line"><a name="l00295"></a><span class="lineno"> 295</span>  <span class="keywordflow">return</span> <span class="keyword">true</span>;</div> |
| 334 | +<div class="line"><a name="l00296"></a><span class="lineno"> 296</span>  }</div> |
| 335 | +<div class="line"><a name="l00297"></a><span class="lineno"> 297</span> };</div> |
353 | 336 | <div class="ttc" id="aclass_s_a_m_output_base_html"><div class="ttname"><a href="class_s_a_m_output_base.html">SAMOutputBase</a></div><div class="ttdoc">Base Output Class with common functionality.</div><div class="ttdef"><b>Definition:</b> sam_arduino_out.h:32</div></div>
|
354 | 337 | <div class="ttc" id="aclass_s_a_m_output_callback_html"><div class="ttname"><a href="class_s_a_m_output_callback.html">SAMOutputCallback</a></div><div class="ttdoc">Output via Callback method.</div><div class="ttdef"><b>Definition:</b> sam_arduino_out.h:78</div></div>
|
355 | 338 | <div class="ttc" id="aclass_s_a_m_output_i2_s_html"><div class="ttname"><a href="class_s_a_m_output_i2_s.html">SAMOutputI2S</a></div><div class="ttdoc">Output to I2S for ESP32: This class is obsolete and has been deactivated in the sam_config....</div><div class="ttdef"><b>Definition:</b> sam_arduino_out.h:116</div></div>
|
|
0 commit comments