projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altos/telelco-v3.0: Configure SPI GPIO pins to 50MHz
[fw/altos]
/
src
/
drivers
/
ao_aprs.c
diff --git
a/src/drivers/ao_aprs.c
b/src/drivers/ao_aprs.c
index bc5c29dfc85634d9f5a4905ead05b55308583293..b0645465c586ddb6e88f11f29ff37962cfc61277 100644
(file)
--- a/
src/drivers/ao_aprs.c
+++ b/
src/drivers/ao_aprs.c
@@
-186,7
+186,7
@@
static uint16_t sysCRC16(const uint8_t *buffer, uint8_t length, uint16_t crc)
for (bit = 0; bit < 8; ++bit)
{
for (bit = 0; bit < 8; ++bit)
{
-
crc ^= (value & 0x01
);
+
crc = (uint16_t) (crc ^ (value & 0x01)
);
crc = ( crc & 0x01 ) ? ( crc >> 1 ) ^ 0x8408 : ( crc >> 1 );
value = value >> 1;
} // END for
crc = ( crc & 0x01 ) ? ( crc >> 1 ) ^ 0x8408 : ( crc >> 1 );
value = value >> 1;
} // END for
@@
-234,7
+234,7
@@
static void timeInit()
#define TNC_TX_DELAY 45
/// The size of the TNC output buffer.
#define TNC_TX_DELAY 45
/// The size of the TNC output buffer.
-#define TNC_BUFFER_SIZE 4
0
+#define TNC_BUFFER_SIZE 4
8
/// States that define the current mode of the 1200 bps (A-FSK) state machine.
typedef enum
/// States that define the current mode of the 1200 bps (A-FSK) state machine.
typedef enum
@@
-282,7
+282,7
@@
tncSetCallsign(void)
TNC_AX25_HEADER[TNC_CALLSIGN_OFF + i] = ' ' << 1;
/* Fill in the SSID with the low digit of the serial number */
TNC_AX25_HEADER[TNC_CALLSIGN_OFF + i] = ' ' << 1;
/* Fill in the SSID with the low digit of the serial number */
- TNC_AX25_HEADER[TNC_SSID_OFF] =
0x60 | ((ao_config.aprs_ssid & 0xf) << 1
);
+ TNC_AX25_HEADER[TNC_SSID_OFF] =
(uint8_t) (0x60 | ((ao_config.aprs_ssid & 0xf) << 1)
);
#endif
}
#endif
}
@@
-310,6
+310,7
@@
static uint8_t tncBitStuff;
/// Buffer to hold the message portion of the AX.25 packet as we prepare it.
static uint8_t tncBuffer[TNC_BUFFER_SIZE];
/// Buffer to hold the message portion of the AX.25 packet as we prepare it.
static uint8_t tncBuffer[TNC_BUFFER_SIZE];
+#pragma GCC diagnostic ignored "-Wformat-overflow="
/**
* Initialize the TNC internal variables.
*/
/**
* Initialize the TNC internal variables.
*/
@@
-490,7
+491,7
@@
static void tnc1200TimerTick()
static void tncCompressInt(uint8_t *dest, int32_t value, int len) {
int i;
for (i = len - 1; i >= 0; i--) {
static void tncCompressInt(uint8_t *dest, int32_t value, int len) {
int i;
for (i = len - 1; i >= 0; i--) {
- dest[i] =
value % 91 + 33
;
+ dest[i] =
(uint8_t) (value % 91 + 33)
;
value /= 91;
}
}
value /= 91;
}
}
@@
-611,7
+612,7
@@
fixed23_mul(uint32_t x, uint32_t y)
static inline uint32_t
fixed30_mul(uint32_t x, uint32_t y)
{
static inline uint32_t
fixed30_mul(uint32_t x, uint32_t y)
{
- return (
(uint64_t) x * y + fixed30_half) >> 30
;
+ return (
uint32_t) (((uint64_t) x * y + fixed30_half) >> 30)
;
}
/*
}
/*
@@
-620,15
+621,18
@@
fixed30_mul(uint32_t x, uint32_t y)
*/
static uint32_t
*/
static uint32_t
-ao_fixed_log2(
uint32_t
x)
+ao_fixed_log2(
int32_t i
x)
{
uint32_t result;
uint32_t frac = fixed23_one;
{
uint32_t result;
uint32_t frac = fixed23_one;
+ uint32_t x;
/* Bounds check for sanity */
/* Bounds check for sanity */
- if (x <= 0)
+ if (
i
x <= 0)
return 0;
return 0;
+ x = (uint32_t) ix;
+
if (x >= fixed30_one)
return 0xffffffff;
if (x >= fixed30_one)
return 0xffffffff;
@@
-693,16
+697,16
@@
ao_fixed_log2(uint32_t x)
#define APRS_LOG_CONVERT fixed23_real(1.714065192056127)
#define APRS_LOG_BASE fixed23_real(346.920048461100941)
#define APRS_LOG_CONVERT fixed23_real(1.714065192056127)
#define APRS_LOG_BASE fixed23_real(346.920048461100941)
-static int
+static int
32_t
ao_aprs_encode_altitude(int meters)
{
ao_aprs_encode_altitude(int meters)
{
- return fixed23_floor(fixed23_mul(ao_fixed_log2(meters) + APRS_LOG_CONVERT, APRS_LOG_BASE) + fixed23_half);
+ return
(int32_t)
fixed23_floor(fixed23_mul(ao_fixed_log2(meters) + APRS_LOG_CONVERT, APRS_LOG_BASE) + fixed23_half);
}
/**
* Generate the plain text position packet.
*/
}
/**
* Generate the plain text position packet.
*/
-static
in
t tncPositionPacket(void)
+static
uint8_
t tncPositionPacket(void)
{
static int32_t latitude;
static int32_t longitude;
{
static int32_t latitude;
static int32_t longitude;
@@
-736,8
+740,8
@@
static int tncPositionPacket(void)
/* Symbol table ID */
*buf++ = '/';
/* Symbol table ID */
*buf++ = '/';
- lat = (
(uint64_t) 380926 * (900000000 - latitude)) / 10000000
;
- lon = (
(uint64_t) 190463 * (1800000000 + longitude)) / 10000000
;
+ lat = (
int32_t) (((int64_t) 380926 * (900000000 - latitude)) / 10000000)
;
+ lon = (
int32_t) (((int64_t) 190463 * (1800000000 + longitude)) / 10000000)
;
alt = ao_aprs_encode_altitude(altitude);
alt = ao_aprs_encode_altitude(altitude);
@@
-787,19
+791,19
@@
static int tncPositionPacket(void)
if (lon > 1800000000)
lon = 1800000000;
if (lon > 1800000000)
lon = 1800000000;
- lat_deg =
lat / 10000000
;
+ lat_deg =
(uint16_t) (lat / 10000000)
;
lat -= lat_deg * 10000000;
lat *= 60;
lat -= lat_deg * 10000000;
lat *= 60;
- lat_min =
lat / 10000000
;
+ lat_min =
(uint16_t) (lat / 10000000)
;
lat -= lat_min * 10000000;
lat -= lat_min * 10000000;
- lat_frac =
lat / 100000
;
+ lat_frac =
(uint16_t) (lat / 100000)
;
- lon_deg =
lon / 10000000
;
+ lon_deg =
(uint16_t) (lon / 10000000)
;
lon -= lon_deg * 10000000;
lon *= 60;
lon -= lon_deg * 10000000;
lon *= 60;
- lon_min =
lon / 10000000
;
+ lon_min =
(uint16_t) (lon / 10000000)
;
lon -= lon_min * 10000000;
lon -= lon_min * 10000000;
- lon_frac =
lon / 100000
;
+ lon_frac =
(uint16_t) (lon / 100000)
;
/* Convert from meters to feet */
alt = (alt * 328 + 50) / 100;
/* Convert from meters to feet */
alt = (alt * 328 + 50) / 100;
@@
-814,7
+818,7
@@
static int tncPositionPacket(void)
buf += tncComment(buf);
buf += tncComment(buf);
- return
buf - tncBuffer
;
+ return
(uint8_t) (buf - tncBuffer)
;
}
static int16_t
}
static int16_t
@@
-827,7
+831,7
@@
tncFill(uint8_t *buf, int16_t len)
while (tncMode != TNC_TX_READY && l < len) {
b = 0;
for (bit = 0; bit < 8; bit++) {
while (tncMode != TNC_TX_READY && l < len) {
b = 0;
for (bit = 0; bit < 8; bit++) {
- b =
b << 1 | (timeNCO >> 15
);
+ b =
(uint8_t) (b << 1 | (timeNCO >> 15)
);
timeNCO += timeNCOFreq;
}
*buf++ = b;
timeNCO += timeNCOFreq;
}
*buf++ = b;
@@
-860,8
+864,8
@@
void ao_aprs_send(void)
crc = sysCRC16(tncBuffer, tncLength, crc ^ 0xffff);
// Save the CRC in the message.
crc = sysCRC16(tncBuffer, tncLength, crc ^ 0xffff);
// Save the CRC in the message.
- tncBuffer[tncLength++] =
crc & 0xff
;
- tncBuffer[tncLength++] = (
crc >> 8) & 0xff
;
+ tncBuffer[tncLength++] =
(uint8_t) (crc & 0xff)
;
+ tncBuffer[tncLength++] = (
uint8_t) ((crc >> 8) & 0xff)
;
// Prepare the variables that are used in the real-time clock interrupt.
tncBitCount = 0;
// Prepare the variables that are used in the real-time clock interrupt.
tncBitCount = 0;