SD card: fix insertion/removal detection

openvehicles · Apr 14, 2018 · 7aa91ac · 7aa91ac
1 parent 90cd557
commit 7aa91ac
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/vehicle/OVMS.V3/components/sdcard/src/sdcard.cpp b/vehicle/OVMS.V3/components/sdcard/src/sdcard.cpp
@@ -97,6 +97,7 @@ sdcard::sdcard(const char* name, bool mode1bit, bool autoformat, int cdpin)
 
   m_mounted = false;
   m_cd = false;
+  m_cdpin = cdpin;
   insertcount = 5;
 
   // Register our events
@@ -159,7 +160,7 @@ bool sdcard::isinserted()
 
 void sdcard::CheckCardState()
   {
-  bool cd = (gpio_get_level((gpio_num_t)m_slot.gpio_cd)==0)?true:false;
+  bool cd = (gpio_get_level((gpio_num_t)m_cdpin)==0)?true:false;
 
   if (cd != m_cd)
     {

diff --git a/vehicle/OVMS.V3/components/sdcard/src/sdcard.h b/vehicle/OVMS.V3/components/sdcard/src/sdcard.h
@@ -63,6 +63,7 @@ class sdcard : public pcp
     sdmmc_card_t* m_card;
     bool m_mounted;
     bool m_cd;
+    int m_cdpin;
   };
 
 #endif //#ifndef __SDCARD_H__