Re #2404: better definition of PLAY_MODEL_NAME() for various platforms

This commit is contained in:
Damjan Adamic
2015-07-19 12:44:40 +02:00
parent 268f168218
commit 5048ce5d45
4 changed files with 2 additions and 7 deletions
+1
View File
@@ -162,6 +162,7 @@ void audioDefevent(uint8_t e);
#define PLAY_SWITCH_MOVED(sw)
#define PLAY_LOGICAL_SWITCH_OFF(sw)
#define PLAY_LOGICAL_SWITCH_ON(sw)
#define PLAY_MODEL_NAME()
#define START_SILENCE_PERIOD()
#endif
+1
View File
@@ -145,6 +145,7 @@ void beep(uint8_t val);
#define PLAY_SWITCH_MOVED(sw)
#define PLAY_LOGICAL_SWITCH_OFF(sw)
#define PLAY_LOGICAL_SWITCH_ON(sw)
#define PLAY_MODEL_NAME()
#define START_SILENCE_PERIOD()
#endif /* !AUDIO */
-4
View File
@@ -380,12 +380,8 @@ void eeLoadModel(uint8_t id)
#endif
LOAD_MODEL_BITMAP();
SEND_FAILSAFE_1S();
#if defined(SDCARD)
PLAY_MODEL_NAME();
#endif
}
}
-3
View File
@@ -1014,10 +1014,7 @@ void eeLoadModel(uint8_t id)
LOAD_MODEL_BITMAP();
LUA_LOAD_MODEL_SCRIPTS();
SEND_FAILSAFE_1S();
#if defined(CPUARM) && defined(SDCARD)
PLAY_MODEL_NAME();
#endif
}
}