mirror
/
pico-tracker
kopia lustrzana https://github.com/bristol-seds/pico-tracker
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Fix point_in_poly. We need to interpolate along diagonal boarder lines which is kinda going to need floating point

master
Richard Meadows 2015-06-29 22:08:31 +01:00
rodzic 88087381eb
commit a834db5f1f
1 zmienionych plików z 3 dodań i 5 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

8
firmware/src/location.c
Wyświetl plik

@ -59,7 +59,7 @@ bool point_in_polygon(const int32_t* poly, uint32_t points, int32_t x, int32_t y
if (((polyY(i) < y && polyY(j) >= y) || (polyY(j) < y && polyY(i) >= y)) && if (((polyY(i) < y && polyY(j) >= y) || (polyY(j) < y && polyY(i) >= y)) &&
(polyX(i) <= x || polyX(j) <= x)) { (polyX(i) <= x || polyX(j) <= x)) {
if (polyX(i) + (y-polyY(i)) / (polyY(j) - polyY(i)) * (polyX(j)-polyX(i)) < x) { if (polyX(i) + (float)(y-polyY(i)) / (polyY(j) - polyY(i)) * (polyX(j)-polyX(i)) < x) {
oddNodes =! oddNodes; oddNodes =! oddNodes;
} }
} }
@ -98,10 +98,8 @@ bool latlon_in_aprs_zone(int32_t aprs_zone, int32_t aprs_zone_outline, float lon
*/ */
bool aprs_location_tx_allow(void) { bool aprs_location_tx_allow(void) {
/* Not in any zone, or in a zone other than Alpha, or not airbourne */ /* Not in any zone, or in a zone other than Alpha */
return (current_aprs_zone == -1) || return (current_aprs_zone == -1) || (current_aprs_zone > 0);
(current_aprs_zone > 0) ||
(_altitude < 200);
} }
/** /**
* Returns the aprs frequency in the current zone. * Returns the aprs frequency in the current zone.