eive/eive-obsw
13
4
Fork 0
Code Issues 4 Pull Requests 1 Releases 121 Wiki Activity

Various Improvements & Fixes #187

Merged
meierj merged 201 commits from mueller/various-improvements-rpi-tweaks into develop 2022-03-26 21:07:07 +01:00
Conversation 1 Commits 201 Files Changed 19 +5385 -11119
221 changed files with 5385 additions and 11119 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e250ddc43e - Show all commits

4
bsp_q7s/memory/SdCardManager.h
View File

@@ -24,11 +24,7 @@ class MutexIF;
* @brief Manages handling of SD cards like switching them on or off or getting the current * @brief Manages handling of SD cards like switching them on or off or getting the current
* state * state
*/ */
<<<<<<< HEAD
class SdCardManager : public SystemObject {
=======
class SdCardManager : public SystemObject, public SdCardMountedIF { class SdCardManager : public SystemObject, public SdCardMountedIF {
>>>>>>> mueller/plpcdu-sus-updates
friend class SdCardAccess; friend class SdCardAccess;
public: public: