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

Added number of outlines to zone structure, fixes wrong sizeof thing

ubseds12
Richard Meadows 2015-06-07 22:24:20 +01:00
rodzic fcef15b7c6
commit d5f6a921c7
7 zmienionych plików z 381 dodań i 312 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

1
firmware/inc/geofence_aprs.h
Wyświetl plik

@ -16,6 +16,7 @@
*/
struct aprs_zone_t {
const int32_t** outlines;
const int32_t outline_count;
const uint32_t* outline_lengths;
int32_t frequency, deviation;
char* name;

1
firmware/inc/geofence_countries.h
Wyświetl plik

@ -16,6 +16,7 @@
*/
struct country_t {
const int32_t** outlines;
const int32_t outline_count;
const uint32_t* outline_lengths;
char* name;
char* isocode;

24
firmware/src/geofence_aprs.c
Wyświetl plik

@ -5766,39 +5766,39 @@ const uint32_t lima_outline_lengths[] = {
const struct aprs_zone_t aprs_zones[] = {
/* -------------------Alpha */
{ .outlines = alpha_outlines, .outline_lengths = alpha_outline_lengths,
{ .outlines = alpha_outlines, .outline_count = 28, .outline_lengths = alpha_outline_lengths,
.frequency = 0, .deviation = 0, .name = "Alpha" },
/* -----------------Charlie */
{ .outlines = charlie_outlines, .outline_lengths = charlie_outline_lengths,
{ .outlines = charlie_outlines, .outline_count = 15, .outline_lengths = charlie_outline_lengths,
.frequency = 144390000, .deviation = 5000, .name = "Charlie" },
/* -------------------Bravo */
{ .outlines = bravo_outlines, .outline_lengths = bravo_outline_lengths,
{ .outlines = bravo_outlines, .outline_count = 12, .outline_lengths = bravo_outline_lengths,
.frequency = 144575000, .deviation = 3000, .name = "Bravo" },
/* --------------------Echo */
{ .outlines = echo_outlines, .outline_lengths = echo_outline_lengths,
{ .outlines = echo_outlines, .outline_count = 18, .outline_lengths = echo_outline_lengths,
.frequency = 145175000, .deviation = 3000, .name = "Echo" },
/* -------------------Delta */
{ .outlines = delta_outlines, .outline_lengths = delta_outline_lengths,
{ .outlines = delta_outlines, .outline_count = 4, .outline_lengths = delta_outline_lengths,
.frequency = 145010000, .deviation = 3000, .name = "Delta" },
/* --------------------Golf */
{ .outlines = golf_outlines, .outline_lengths = golf_outline_lengths,
{ .outlines = golf_outlines, .outline_count = 2, .outline_lengths = golf_outline_lengths,
.frequency = 145570000, .deviation = 3000, .name = "Golf" },
/* -----------------Foxtrot */
{ .outlines = foxtrot_outlines, .outline_lengths = foxtrot_outline_lengths,
{ .outlines = foxtrot_outlines, .outline_count = 2, .outline_lengths = foxtrot_outline_lengths,
.frequency = 145525000, .deviation = 3000, .name = "Foxtrot" },
/* -------------------India */
{ .outlines = india_outlines, .outline_lengths = india_outline_lengths,
{ .outlines = india_outlines, .outline_count = 1, .outline_lengths = india_outline_lengths,
.frequency = 144620000, .deviation = 3000, .name = "India" },
/* --------------------Kilo */
{ .outlines = kilo_outlines, .outline_lengths = kilo_outline_lengths,
{ .outlines = kilo_outlines, .outline_count = 3, .outline_lengths = kilo_outline_lengths,
.frequency = 144640000, .deviation = 3000, .name = "Kilo" },
/* ------------------Juliet */
{ .outlines = juliet_outlines, .outline_lengths = juliet_outline_lengths,
{ .outlines = juliet_outlines, .outline_count = 28, .outline_lengths = juliet_outline_lengths,
.frequency = 144390000, .deviation = 3000, .name = "Juliet" },
/* --------------------Mike */
{ .outlines = mike_outlines, .outline_lengths = mike_outline_lengths,
{ .outlines = mike_outlines, .outline_count = 5, .outline_lengths = mike_outline_lengths,
.frequency = 144930000, .deviation = 3000, .name = "Mike" },
/* --------------------Lima */
{ .outlines = lima_outlines, .outline_lengths = lima_outline_lengths,
{ .outlines = lima_outlines, .outline_count = 4, .outline_lengths = lima_outline_lengths,
.frequency = 144660000, .deviation = 3000, .name = "Lima" },
};

466
firmware/src/geofence_countries.c
Wyświetl plik

Plik diff jest za duży Load Diff

4
sim/geofence/README.md
Wyświetl plik

@ -6,8 +6,10 @@ this. This notebook is also used to calculate the deviation values.
## Prerequisites
```
sudo apt-get install ipython libblas-dev liblapack-dev gfortran python-pyproj
sudo apt-get install ipython ipython-notebook libblas-dev liblapack-dev gfortran python-pyproj
sudo apt-get install libfreetype6-dev python-dev
sudo pip install scipy matplotlib
sudo apt-get install g++
sudo pip install --pre pyclipper
```

12
sim/geofence/aprs_zones.json
Wyświetl plik

@ -12773,6 +12773,7 @@
"YE"
],
"name": "Alpha",
"outline_c": 28,
"outline_l": "alpha_outline_lengths",
"outline_n": "alpha_outlines",
"outlines": [
@ -206711,6 +206712,7 @@
"CA"
],
"name": "Charlie",
"outline_c": 15,
"outline_l": "charlie_outline_lengths",
"outline_n": "charlie_outlines",
"outlines": [
@ -304752,6 +304754,7 @@
"NZ"
],
"name": "Bravo",
"outline_c": 12,
"outline_l": "bravo_outline_lengths",
"outline_n": "bravo_outlines",
"outlines": [
@ -375265,6 +375268,7 @@
"AU"
],
"name": "Echo",
"outline_c": 18,
"outline_l": "echo_outline_lengths",
"outline_n": "echo_outlines",
"outlines": [
@ -410739,6 +410743,7 @@
"PA"
],
"name": "Delta",
"outline_c": 4,
"outline_l": "delta_outline_lengths",
"outline_n": "delta_outlines",
"outlines": [
@ -451356,6 +451361,7 @@
"BR"
],
"name": "Golf",
"outline_c": 2,
"outline_l": "golf_outline_lengths",
"outline_n": "golf_outlines",
"outlines": [
@ -468135,6 +468141,7 @@
"TH"
],
"name": "Foxtrot",
"outline_c": 2,
"outline_l": "foxtrot_outline_lengths",
"outline_n": "foxtrot_outlines",
"outlines": [
@ -482152,6 +482159,7 @@
"KR"
],
"name": "India",
"outline_c": 1,
"outline_l": "india_outline_lengths",
"outline_n": "india_outlines",
"outlines": [
@ -512598,6 +512606,7 @@
"HK"
],
"name": "Kilo",
"outline_c": 3,
"outline_l": "kilo_outline_lengths",
"outline_n": "kilo_outlines",
"outlines": [
@ -678213,6 +678222,7 @@
"CO"
],
"name": "Juliet",
"outline_c": 28,
"outline_l": "juliet_outline_lengths",
"outline_n": "juliet_outlines",
"outlines": [
@ -718254,6 +718264,7 @@
"PY"
],
"name": "Mike",
"outline_c": 5,
"outline_l": "mike_outline_lengths",
"outline_n": "mike_outlines",
"outlines": [
@ -763721,6 +763732,7 @@
"JP"
],
"name": "Lima",
"outline_c": 4,
"outline_l": "lima_outline_lengths",
"outline_n": "lima_outlines",
"outlines": [

185
sim/geofence/geofence.ipynb
Wyświetl plik

File diff suppressed because one or more lines are too long