fixing fucked up struct definitions;

updated uvision project;
updated hex file;
This commit is contained in:
dongie 2014-04-08 08:25:25 +09:00
parent 4356893adc
commit c1cdf8b844
4 changed files with 3661 additions and 3558 deletions

View File

@ -469,11 +469,6 @@
<FileType>1</FileType>
<FilePath>.\src\buzzer.c</FilePath>
</File>
<File>
<FileName>telemetry.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry.c</FilePath>
</File>
<File>
<FileName>utils.c</FileName>
<FileType>1</FileType>
@ -489,6 +484,21 @@
<FileType>1</FileType>
<FilePath>.\src\sumd.c</FilePath>
</File>
<File>
<FileName>telemetry_frsky.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_frsky.c</FilePath>
</File>
<File>
<FileName>telemetry_common.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_common.c</FilePath>
</File>
<File>
<FileName>telemetry_hott.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -1344,11 +1354,6 @@
<FileType>1</FileType>
<FilePath>.\src\buzzer.c</FilePath>
</File>
<File>
<FileName>telemetry_frsky.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_frsky.c</FilePath>
</File>
<File>
<FileName>utils.c</FileName>
<FileType>1</FileType>
@ -1364,6 +1369,21 @@
<FileType>1</FileType>
<FilePath>.\src\sumd.c</FilePath>
</File>
<File>
<FileName>telemetry_frsky.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_frsky.c</FilePath>
</File>
<File>
<FileName>telemetry_common.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_common.c</FilePath>
</File>
<File>
<FileName>telemetry_hott.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -2159,11 +2179,6 @@
<FileType>1</FileType>
<FilePath>.\src\buzzer.c</FilePath>
</File>
<File>
<FileName>telemetry.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry.c</FilePath>
</File>
<File>
<FileName>utils.c</FileName>
<FileType>1</FileType>
@ -2179,6 +2194,21 @@
<FileType>1</FileType>
<FilePath>.\src\sumd.c</FilePath>
</File>
<File>
<FileName>telemetry_frsky.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_frsky.c</FilePath>
</File>
<File>
<FileName>telemetry_common.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_common.c</FilePath>
</File>
<File>
<FileName>telemetry_hott.c</FileName>
<FileType>1</FileType>
<FilePath>.\src\telemetry_hott.c</FilePath>
</File>
</Files>
</Group>
<Group>

File diff suppressed because it is too large Load Diff

View File

@ -49,6 +49,8 @@
const uint8_t kHoTTv4BinaryPacketSize = 45;
const uint8_t kHoTTv4TextPacketSize = 173;
static HoTTV4GPSModule_t HoTTV4GPSModule;
static HoTTV4ElectricAirModule_t HoTTV4ElectricAirModule;
static void hottV4SerialWrite(uint8_t c);

View File

@ -85,7 +85,7 @@ typedef enum {
* 5ms delay
*/
struct {
typedef struct HoTTV4GPSModule_t {
uint8_t startByte; // Byte 1: 0x7C = Start byte data
uint8_t sensorID; // Byte 2: 0x8A = GPS Sensor
uint8_t alarmTone; // Byte 3: 0…= warning beeps
@ -142,7 +142,7 @@ struct {
uint8_t GPS_fix; // Byte 42: 00 ASCII Free Character [6], we use it for GPS FIX
uint8_t version; // Byte 43: 00 version number
uint8_t endByte; // Byte 44: 0x7D End byte
} HoTTV4GPSModule;
} HoTTV4GPSModule_t;
/**
* EAM (Electric Air Module) 33620
@ -152,7 +152,7 @@ struct {
* 5ms Idle Line!
*/
struct {
typedef struct HoTTV4ElectricAirModule_t {
uint8_t startByte;
uint8_t sensorID;
uint8_t alarmTone; // Alarm */
@ -198,7 +198,7 @@ struct {
uint8_t version;
uint8_t endByte;
} HoTTV4ElectricAirModule;
} HoTTV4ElectricAirModule_t;
void handleHoTTTelemetry(void);
void checkTelemetryState(void);