Skip to content

Commit 07676b0

Browse files
committed
update for latest marlin
1 parent 89d09ae commit 07676b0

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

docs/html/sd___e_s_p32_8cpp_source.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
<div class="line"><a name="l00053"></a><span class="lineno"> 53</span>&#160;}</div>
123123
<div class="line"><a name="l00054"></a><span class="lineno"> 54</span>&#160; </div>
124124
<div class="line"><a name="l00055"></a><span class="lineno"> 55</span>&#160;int8_t <a class="code" href="class_e_s_p___s_d.html#a6aaf0c538574f5a4f58df66e78cad9e1">ESP_SD::card_status</a>(){</div>
125-
<div class="line"><a name="l00056"></a><span class="lineno"> 56</span>&#160;<span class="keywordflow">if</span> (!IS_SD_INSERTED() || !card.isMounted()) <span class="keywordflow">return</span> 0; <span class="comment">//No sd</span></div>
125+
<div class="line"><a name="l00056"></a><span class="lineno"> 56</span>&#160;<span class="keywordflow">if</span> (!card.isInserted() || !card.isMounted()) <span class="keywordflow">return</span> 0; <span class="comment">//No sd</span></div>
126126
<div class="line"><a name="l00057"></a><span class="lineno"> 57</span>&#160;<span class="keywordflow">if</span> ( card.isPrinting() || card.isFileOpen() ) <span class="keywordflow">return</span> -1; <span class="comment">// busy</span></div>
127127
<div class="line"><a name="l00058"></a><span class="lineno"> 58</span>&#160;<span class="keywordflow">return</span> 1; <span class="comment">//ok</span></div>
128128
<div class="line"><a name="l00059"></a><span class="lineno"> 59</span>&#160;}</div>

src/sd_ESP32.cpp

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,11 @@ int8_t ESP_SD::card_status(bool forcemount)
6363
if(!card.isMounted() || forcemount) {
6464
card.mount();
6565
}
66-
if (!IS_SD_INSERTED() || !card.isMounted()) {
66+
#ifdef IS_SD_INSERTED
67+
if (!IS_SD_INSERTED() || !card.isMounted()) {
68+
#else
69+
if (!card.isInserted() || !card.isMounted()) {
70+
#endif
6771
return 0; //No sd
6872
}
6973
if ( card.isPrinting() || card.isFileOpen() ) {

0 commit comments

Comments
 (0)