diff -ruN dump1090/config.js dump1090/config.js --- dump1090/config.js 1970-01-01 01:00:00.000000000 +0100 +++ dump1090/config.js 2022-08-26 18:37:30.702131507 +0200 @@ -0,0 +1,34 @@ +// -------------------------------------------------------- +// +// This file is to configure the configurable settings. +// Load this file before script.js file at gmap.html. +// +// -------------------------------------------------------- + +// -- Output Settings ------------------------------------- +// Show metric values +Metric = false; // true or false + +// -- Map settings ---------------------------------------- +// The Latitude and Longitude in decimal format +CONST_CENTERLAT = 43.690972; +CONST_CENTERLON = 7.109028; +// The google maps zoom level, 0 - 16, lower is further out +CONST_ZOOMLVL = 10; + +// -- Marker settings ------------------------------------- +// The default marker color +MarkerColor = "rgb(0, 255, 0)"; +SelectedColor = "rgb(225, 225, 0)"; +StaleColor = "rgb(255, 0, 0)"; + +// -- Site Settings --------------------------------------- +SiteShow = true; // true or false +// The Latitude and Longitude in decimal format +SiteLat = 43.690972; +SiteLon = 7.109028; + +SiteCircles = true; // true or false (Only shown if SiteShow is true) +// In nautical miles or km (depending settings value 'Metric') +SiteCirclesDistances = new Array(14,29,43,57); + diff -ruN dump1090/dump1090.c dump1090/dump1090.c --- dump1090/dump1090.c 2022-08-26 18:47:54.833423038 +0200 +++ dump1090/dump1090.c 2022-08-26 18:37:30.710131328 +0200 @@ -29,6 +29,9 @@ // #include "coaa.h" #include "dump1090.h" + + sModes Modes; + // // ============================= Utility functions ========================== // diff -ruN dump1090/dump1090.h dump1090/dump1090.h --- dump1090/dump1090.h 2022-08-26 18:47:54.833423038 +0200 +++ dump1090/dump1090.h 2022-08-26 18:37:30.754130342 +0200 @@ -37,7 +37,7 @@ // 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 // -#define MODES_DUMP1090_VERSION "1.10.3010.14" +#define MODES_DUMP1090_VERSION "1.10.3010.22" // ============================= Include files ========================== @@ -227,7 +227,7 @@ struct aircraft *next; // Next aircraft in our linked list }; -struct stDF { +typedef struct stDF { struct stDF *pNext; // Pointer to next item in the linked list struct stDF *pPrev; // Pointer to previous item in the linked list struct aircraft *pAircraft; // Pointer to the Aircraft structure for this DF @@ -238,7 +238,7 @@ } tDF; // Program global state -struct { // Internal state +typedef struct Modes_ { // Internal state pthread_t reader_thread; pthread_mutex_t data_mutex; // Mutex to synchronize buffer access @@ -370,7 +370,9 @@ unsigned int stat_blocks_processed; unsigned int stat_blocks_dropped; -} Modes; +} sModes; + +extern sModes Modes; // The struct we use to store information about a decoded message. struct modesMessage { diff -ruN dump1090/public_html/config.js dump1090/public_html/config.js --- dump1090/public_html/config.js 2022-08-26 18:47:54.841421753 +0200 +++ dump1090/public_html/config.js 2022-08-26 18:37:30.890127295 +0200 @@ -11,24 +11,24 @@ // -- Map settings ---------------------------------------- // The Latitude and Longitude in decimal format -CONST_CENTERLAT = 45.0; -CONST_CENTERLON = 9.0; +CONST_CENTERLAT = 43.267299; +CONST_CENTERLON = 6.634158; // The google maps zoom level, 0 - 16, lower is further out -CONST_ZOOMLVL = 5; +CONST_ZOOMLVL = 10; // -- Marker settings ------------------------------------- // The default marker color -MarkerColor = "rgb(127, 127, 127)"; -SelectedColor = "rgb(225, 225, 225)"; -StaleColor = "rgb(190, 190, 190)"; +MarkerColor = "rgb(0, 255, 0)"; +SelectedColor = "rgb(225, 225, 0)"; +StaleColor = "rgb(255, 0, 0)"; // -- Site Settings --------------------------------------- -SiteShow = false; // true or false +SiteShow = true; // true or false // The Latitude and Longitude in decimal format -SiteLat = 45.0; -SiteLon = 9.0; +SiteLat = 43.267299; +SiteLon = 6.634158; SiteCircles = true; // true or false (Only shown if SiteShow is true) // In nautical miles or km (depending settings value 'Metric') -SiteCirclesDistances = new Array(100,150,200); +SiteCirclesDistances = new Array(14,29,43,57); diff -ruN dump1090/public_html/script.js dump1090/public_html/script.js --- dump1090/public_html/script.js 2022-08-26 18:47:54.841421753 +0200 +++ dump1090/public_html/script.js 2022-08-26 18:37:30.886127385 +0200 @@ -134,7 +134,7 @@ var mapOptions = { center: new google.maps.LatLng(CenterLat, CenterLon), zoom: ZoomLvl, - mapTypeId: google.maps.MapTypeId.ROADMAP, + mapTypeId: "OSM", mapTypeControl: true, streetViewControl: false, mapTypeControlOptions: { diff -ruN dump1090/raspi-blacklist.conf dump1090/raspi-blacklist.conf --- dump1090/raspi-blacklist.conf 1970-01-01 01:00:00.000000000 +0100 +++ dump1090/raspi-blacklist.conf 2022-08-27 10:44:39.764443095 +0200 @@ -0,0 +1,9 @@ +# Blacklist for RapsBerry Pi +# +# /etc/modprobe.d/raspi-blacklist.conf +# +blacklist dvb_usb_v2 +blacklist dvb_usb_rtl28xxu +blacklist rtl2832 +blacklist rtl2832_sdr +# diff -ruN dump1090/README.md dump1090-distri/README.md --- dump1090/README.md 2022-08-26 18:47:54.825424323 +0200 +++ dump1090-distri/README.md 2022-08-27 10:40:56.949091884 +0200 @@ -205,7 +205,7 @@ * It tries to fix DF17 messages with CRC errors resulting from any two bit errors. -The use of aggressive mdoe is only advised in places where there is +The use of aggressive mode is only advised in places where there is low traffic in order to have a chance to capture some more messages. Debug mode diff -ruN dump1090/view1090.c dump1090/view1090.c --- dump1090/view1090.c 2022-08-26 18:47:54.853419826 +0200 +++ dump1090/view1090.c 2022-08-26 18:37:30.754130342 +0200 @@ -29,6 +29,10 @@ // #include "coaa.h" #include "view1090.h" +#include "dump1090.h" + + sModes Modes; + // // ============================= Utility functions ========================== //