Upstream merge conflicts resolved

This commit is contained in:
terribl 2013-05-12 09:50:20 +03:00
commit cac715e40a
3 changed files with 35 additions and 5 deletions

View file

@ -56,7 +56,7 @@
// MinorVer changes when additional features are added, but not for bug fixes (range 00-99) // MinorVer changes when additional features are added, but not for bug fixes (range 00-99)
// DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update // DayDate & Year changes for all changes, including for bug fixes. It represent the release date of the update
// //
#define MODES_DUMP1090_VERSION "1.05.1105.13" #define MODES_DUMP1090_VERSION "1.05.1205.13"
#define MODES_USER_LATITUDE_DFLT (0.0) #define MODES_USER_LATITUDE_DFLT (0.0)
#define MODES_USER_LONGITUDE_DFLT (0.0) #define MODES_USER_LONGITUDE_DFLT (0.0)
@ -1663,7 +1663,7 @@ void decodeModesMessage(struct modesMessage *mm, unsigned char *msg) {
// //
void displayModesMessage(struct modesMessage *mm) { void displayModesMessage(struct modesMessage *mm) {
int j; int j;
char * pTimeStamp; unsigned char * pTimeStamp;
// Handle only addresses mode first. // Handle only addresses mode first.
if (Modes.onlyaddr) { if (Modes.onlyaddr) {
@ -1674,7 +1674,7 @@ void displayModesMessage(struct modesMessage *mm) {
// Show the raw message. // Show the raw message.
if (Modes.mlat) { if (Modes.mlat) {
printf("@"); printf("@");
pTimeStamp = (char *) &mm->timestampMsg; pTimeStamp = (unsigned char *) &mm->timestampMsg;
for (j=5; j>=0;j--) { for (j=5; j>=0;j--) {
printf("%02X",pTimeStamp[j]); printf("%02X",pTimeStamp[j]);
} }
@ -3052,11 +3052,11 @@ void modesSendRawOutput(struct modesMessage *mm) {
char *p = &Modes.rawOut[Modes.rawOutUsed]; char *p = &Modes.rawOut[Modes.rawOutUsed];
int msgLen = mm->msgbits / 8; int msgLen = mm->msgbits / 8;
int j; int j;
char * pTimeStamp; unsigned char * pTimeStamp;
if (Modes.mlat) { if (Modes.mlat) {
*p++ = '@'; *p++ = '@';
pTimeStamp = (char *) &mm->timestampMsg; pTimeStamp = (unsigned char *) &mm->timestampMsg;
for (j = 5; j >= 0; j--) { for (j = 5; j >= 0; j--) {
sprintf(p, "%02X", pTimeStamp[j]); sprintf(p, "%02X", pTimeStamp[j]);
p += 2; p += 2;

View file

@ -108,6 +108,31 @@ function refreshTableInfo() {
i.innerHTML = html; i.innerHTML = html;
} }
function refreshTableInfo() {
var i = document.getElementById('tabinfo');
var html = '<table id="tableinfo" width="100%">';
html += '<thead style="background-color: #CCCCCC;"><td>Flight</td><td align="right">Altitude</td><td align="center">Speed</td><td align="center">Track</td><td>Lat</td><td>Long</td><td>Seen</td><td>Msgs</td></thead>';
for (var p in Planes) {
if (p == Selected) {
html += '<tr style="background-color: #F0F0F0;">';
} else {
html += '<tr>';
}
html += '<td>' + Planes[p].flight + '</td>';
html += '<td align="right">' + Planes[p].altitude + '</td>';
html += '<td align="center">' + Planes[p].speed + '</td>';
html += '<td align="center">' + Planes[p].track + '</td>';
html += '<td>' + Planes[p].lat + '</td>';
html += '<td>' + Planes[p].lon + '</td>';
html += '<td align="center">' + Planes[p].seen + '</td>';
html += '<td align="center">' + Planes[p].messages + '</td>';
html += '</tr>';
}
html += '</table>';
i.innerHTML = html;
}
function fetchData() { function fetchData() {
$.getJSON('data.json', function(data) { $.getJSON('data.json', function(data) {
var stillhere = {} var stillhere = {}

View file

@ -42,3 +42,8 @@ body { height: 100%; margin: 0; padding: 0; }
cursor: pointer; cursor: pointer;
} }
#tableinfo {
font-size: x-small;
font-family: monospace;
}