Mirror/opentx
1
0
Fork 0
mirror of https://github.com/opentx/opentx.git synced 2025-07-17 21:35:27 +03:00
Code Issues Wiki Activity

Default options for widgets / layouts / themes now OK on VC++

Browse source
This commit is contained in:
Bertrand Songis 2016-03-10 18:42:04 +01:00
parent 62df9831d8
commit c521fce20b
8 changed files with 27 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

8
radio/src/opentx.h
View file

@ -1043,7 +1043,10 @@ void checkModelIdUnique(uint8_t index, uint8_t module);
inline int divRoundClosest(const int n, const int d)
{
return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
if (d == 0)
return 0;
else
return ((n < 0) ^ (d < 0)) ? ((n - d/2)/d) : ((n + d/2)/d);
}
#define calc100to256_16Bits(x) calc100to256(x)
@ -1352,7 +1355,6 @@ uint16_t crc16(uint8_t * buf, uint32_t len);
#define PLAY_BACKGROUND 0x20
#define PLAY_INCREMENT(x) ((uint8_t)(((uint8_t)x) << 6)) /* -1, 0, 1, 2 */
/* make sure the defines below always go in numeric order */
enum AUDIO_SOUNDS {
AU_TADA,
#if defined(CPUARM)
@ -1362,7 +1364,6 @@ enum AUDIO_SOUNDS {
AU_THROTTLE_ALERT,
AU_SWITCH_ALERT,
AU_BAD_RADIODATA,
AU_STORAGE_FORMAT,
#endif
AU_TX_BATTERY_LOW,
AU_INACTIVITY,
@ -1382,6 +1383,7 @@ enum AUDIO_SOUNDS {
AU_TELEMETRY_BACK,
AU_TRAINER_LOST,
AU_TRAINER_BACK,
AU_SENSOR_LOST,
#endif
#if defined(PCBSKY9X)
AU_TX_MAH_HIGH,