[geofence] add nordics to APRS, move from telemetry positive to telemetery negative

telemetry now runs unless is it specifically *not* permitted

firmware/inc/geofence_no_aprs.h

@@ -10,7 +10,7 @@
 
 #include "samd20.h"
 
-const int32_t* no_aprs_outlines[35];
-const uint32_t no_aprs_outline_lengths[35];
+const int32_t* no_aprs_outlines[27];
+const uint32_t no_aprs_outline_lengths[27];
 
 #endif /* GEOFENCE_NO_APRS_H */

firmware/inc/geofence_telemetry.h

@@ -1,5 +1,5 @@
 /**
- * Autogenerated telemetry structures. See sim/geofence
+ * Autogenerated telemetry zone structures. See sim/geofence
  */
 
 #ifndef GEOFENCE_TELEMETRY_H
@@ -10,7 +10,7 @@
 
 #include "samd20.h"
 
-const int32_t* telemetry_outlines[14];
-const uint32_t telemetry_outline_lengths[14];
+const int32_t* no_telem_outlines[5];
+const uint32_t no_telem_outline_lengths[5];
 
-#endif /* GEOFENCE_TELEMETRY_H */
+#endif /* GEOFENCE_APRS_H */

firmware/src/geofence_no_aprs.c

@@ -12,117 +12,6 @@
 /* Longitude,  Latitude */
 
 const int32_t no_aprs_outline_1[] = {
-    16703676,  75607233,
-    17139538,  75710773,
-    17685451,  76386811,
-    18296929,  76508551,
-    18601225,  76966268,
-    19710600,  77485168,
-    20579770,  77205743,
-    20781637,  76542944,
-    21036047,  76409164,
-    22241745,  76486970,
-    22807658,  76255374,
-    24935952,  76705786,
-    25167984,  77196426,
-    25194028,  78144953,
-    26111712,  78415954,
-    26391304,  77608794,
-    27104640,  77615728,
-    27263111,  78034761,
-    27509973,  79869028,
-    27459828,  80660577,
-    27306475,  81302393,
-    26871413,  81636146,
-    23488813,  81672687,
-    23004976,  82008234,
-    22412802,  81910683,
-    22221153,  81516052,
-    19732074,  82012940,
-    19021189,  81642145,
-    18184116,  81835703,
-    17722159,  81272675,
-    16946217,  81398403,
-    16058709,  81448171,
-    15596513,  80652183,
-    14601104,  81214916,
-    10723245,  81199478,
-    10459229,  80720903,
-    10250716,  79098510,
-    10317424,  78093468,
-    10579269,  77626518,
-    11951164,  77131083,
-    12326155,  77413632,
-    13495664,  77146373,
-    14200288,  76272430,
-    16701132,  75607170,
-};
-const int32_t no_aprs_outline_2[] = {
-    31580467,  78806131,
-    33720422,  78979849,
-    33884169,  79456068,
-    33940441,  80284720,
-    33865499,  81158797,
-    33690952,  81672579,
-    31391684,  81507821,
-    31207512,  80773796,
-    31183483,  79725299,
-    31326960,  78990488,
-    31578266,  78806091,
-};
-const int32_t no_aprs_outline_3[] = {
-    28040517,  77680935,
-    29717798,  77752429,
-    29931077,  78131427,
-    30007587,  78983353,
-    29902687,  79855887,
-    29344521,  80193946,
-    27754664,  80000800,
-    27595475,  79263561,
-    27607625,  78345462,
-    27767446,  77789527,
-    28037973,  77680898,
-};
-const int32_t no_aprs_outline_4[] = {
-    19100648,  73508093,
-    19524880,  73945330,
-    19586084,  74483871,
-    19512855,  75029142,
-    19199287,  75417520,
-    18597539,  75170403,
-    18487176,  74564633,
-    18557871,  73936743,
-    18708534,  73669406,
-    19098104,  73508065,
-};
-const int32_t no_aprs_outline_5[] = {
-    -9043720,  70133330,
-    -7895872,  70376375,
-    -7709748,  70756423,
-    -7672469,  71248164,
-    -7788033,  71712761,
-    -7972445,  71912575,
-    -9159524,  71566416,
-    -9356126,  71260815,
-    -9405554,  70730188,
-    -9285690,  70292738,
-    -9046254,  70133307,
-};
-const int32_t no_aprs_outline_6[] = {
-    21542054,  63728833,
-    21338089,  63783695,
-    21532542,  63857024,
-    21802207,  64235802,
-    21848281,  64864017,
-    22493476,  65236506,
-    24284495,  65236469,
-    24154787,  65022900,
-    23470558,  64571787,
-    22436094,  64152969,
-    21992807,  63750430,
-    21542428,  63728569,
-};
-const int32_t no_aprs_outline_7[] = {
     -1296829,  59416314,
      -963759,  59702060,
      -773792,  60216752,
@@ -136,29 +25,13 @@ const int32_t no_aprs_outline_7[] = {
     -1840197,  59876478,
     -1299373,  59416299,
 };
-const int32_t no_aprs_outline_8[] = {
-    18149755,  56494884,
-    18462940,  56586234,
-    19091510,  57049677,
-    19218124,  57438172,
-    19573135,  57686006,
-    19642418,  57989354,
-    19493531,  58340996,
-    19140575,  58424679,
-    18455619,  58256504,
-    18088448,  58017722,
-    17861867,  57762824,
-    17794017,  57248177,
-    17883985,  56690538,
-    18147211,  56494856,
-};
-const int32_t no_aprs_outline_9[] = {
+const int32_t no_aprs_outline_2[] = {
     -8415212,  54461069,
     -8133450,  54640792,
     -8440435,  54580357,
     -8456271,  54446962,
 };
-const int32_t no_aprs_outline_10[] = {
+const int32_t no_aprs_outline_3[] = {
     -3935086,  53671044,
     -4303212,  53810810,
     -4070297,  54064947,
@@ -168,7 +41,7 @@ const int32_t no_aprs_outline_10[] = {
     -3346141,  53740460,
     -3933404,  53670189,
 };
-const int32_t no_aprs_outline_11[] = {
+const int32_t no_aprs_outline_4[] = {
      3830746,  51212585,
      3432475,  51245754,
      3350108,  51377685,
@@ -177,12 +50,12 @@ const int32_t no_aprs_outline_11[] = {
      4226121,  51386470,
      3902064,  51207674,
 };
-const int32_t no_aprs_outline_12[] = {
+const int32_t no_aprs_outline_5[] = {
     12396891,  43934549,
     12503661,  43989763,
     12426351,  43894083,
 };
-const int32_t no_aprs_outline_13[] = {
+const int32_t no_aprs_outline_6[] = {
      8804180,  38610075,
      9039079,  38654400,
      9286334,  38883264,
@@ -215,7 +88,7 @@ const int32_t no_aprs_outline_13[] = {
      8294684,  38694642,
      8801636,  38610065,
 };
-const int32_t no_aprs_outline_14[] = {
+const int32_t no_aprs_outline_7[] = {
    125408815,  37424265,
    125804241,  37608545,
    126068652,  37451543,
@@ -278,7 +151,7 @@ const int32_t no_aprs_outline_14[] = {
    124827897,  37678200,
    125406281,  37424255,
 };
-const int32_t no_aprs_outline_15[] = {
+const int32_t no_aprs_outline_8[] = {
     -7833246,  36713680,
     -7267541,  36917252,
     -7134822,  37035455,
@@ -334,7 +207,7 @@ const int32_t no_aprs_outline_15[] = {
     -8574930,  36818852,
     -7938790,  36713398,
 };
-const int32_t no_aprs_outline_16[] = {
+const int32_t no_aprs_outline_9[] = {
    -31178229,  39057393,
    -30891762,  39220843,
    -30827422,  39493050,
@@ -345,7 +218,7 @@ const int32_t no_aprs_outline_16[] = {
    -31479544,  39159979,
    -31180773,  39057383,
 };
-const int32_t no_aprs_outline_17[] = {
+const int32_t no_aprs_outline_10[] = {
    -28227888,  38087217,
    -27930072,  38144373,
    -27497740,  38426205,
@@ -364,7 +237,7 @@ const int32_t no_aprs_outline_17[] = {
    -28562941,  38129688,
    -28230432,  38087197,
 };
-const int32_t no_aprs_outline_18[] = {
+const int32_t no_aprs_outline_11[] = {
    -25435406,  37420568,
    -25147600,  37456880,
    -24945484,  37582301,
@@ -379,13 +252,13 @@ const int32_t no_aprs_outline_18[] = {
    -25840137,  37485366,
    -25437950,  37420548,
 };
-const int32_t no_aprs_outline_19[] = {
+const int32_t no_aprs_outline_12[] = {
    126460838,  37610363,
    126369365,  37772007,
    126493600,  37782550,
    126516020,  37604681,
 };
-const int32_t no_aprs_outline_20[] = {
+const int32_t no_aprs_outline_13[] = {
    -25028339,  36649790,
    -24773908,  36777371,
    -24732672,  37054872,
@@ -396,7 +269,7 @@ const int32_t no_aprs_outline_20[] = {
    -25315999,  36690804,
    -25030883,  36649770,
 };
-const int32_t no_aprs_outline_21[] = {
+const int32_t no_aprs_outline_14[] = {
     12006075,  36454950,
     12275574,  36554912,
     12360080,  36795526,
@@ -407,7 +280,7 @@ const int32_t no_aprs_outline_21[] = {
     11740263,  36557307,
     12003531,  36454941,
 };
-const int32_t no_aprs_outline_22[] = {
+const int32_t no_aprs_outline_15[] = {
    -16834838,  32371236,
    -16434655,  32603176,
    -16430585,  32907527,
@@ -418,7 +291,7 @@ const int32_t no_aprs_outline_22[] = {
    -17139891,  32407629,
    -16837382,  32371226,
 };
-const int32_t no_aprs_outline_23[] = {
+const int32_t no_aprs_outline_16[] = {
    -92233018,  14304145,
    -92013145,  14376106,
    -92235136,  14545385,
@@ -638,7 +511,7 @@ const int32_t no_aprs_outline_23[] = {
    -92491208,  14402253,
    -92235562,  14304137,
 };
-const int32_t no_aprs_outline_24[] = {
+const int32_t no_aprs_outline_17[] = {
   -118281574,  28637234,
   -117983529,  28793952,
   -117938732,  29079836,
@@ -649,7 +522,7 @@ const int32_t no_aprs_outline_24[] = {
   -118526701,  28734987,
   -118284118,  28637216,
 };
-const int32_t no_aprs_outline_25[] = {
+const int32_t no_aprs_outline_18[] = {
   -106528050,  21277569,
   -106281033,  21379085,
   -106193017,  21641301,
@@ -660,7 +533,7 @@ const int32_t no_aprs_outline_25[] = {
   -106816417,  21375589,
   -106530594,  21277553,
 };
-const int32_t no_aprs_outline_26[] = {
+const int32_t no_aprs_outline_19[] = {
   -110971697,  18473853,
   -110699343,  18563050,
   -110603113,  18750442,
@@ -671,7 +544,7 @@ const int32_t no_aprs_outline_26[] = {
   -111279357,  18603680,
   -110974241,  18473837,
 };
-const int32_t no_aprs_outline_27[] = {
+const int32_t no_aprs_outline_20[] = {
     44009954,  12368370,
     45187760,  12605599,
     45827504,  13125829,
@@ -728,7 +601,7 @@ const int32_t no_aprs_outline_27[] = {
     43263857,  12532214,
     44007410,  12368346,
 };
-const int32_t no_aprs_outline_28[] = {
+const int32_t no_aprs_outline_21[] = {
    -61283520,  15643292,
    -61068652,  15682464,
    -60924666,  15812742,
@@ -742,7 +615,7 @@ const int32_t no_aprs_outline_28[] = {
    -61874521,  15769539,
    -61286064,  15643284,
 };
-const int32_t no_aprs_outline_29[] = {
+const int32_t no_aprs_outline_22[] = {
    -60858270,  14185145,
    -60647348,  14245842,
    -60535917,  14374289,
@@ -755,7 +628,7 @@ const int32_t no_aprs_outline_29[] = {
    -61222866,  14259744,
    -60860814,  14185129,
 };
-const int32_t no_aprs_outline_30[] = {
+const int32_t no_aprs_outline_23[] = {
     53720801,  12079957,
     54219902,  12131858,
     54579337,  12280696,
@@ -770,7 +643,7 @@ const int32_t no_aprs_outline_30[] = {
     53413764,  12149679,
     53718257,  12079949,
 };
-const int32_t no_aprs_outline_31[] = {
+const int32_t no_aprs_outline_24[] = {
    -54089758,   2150489,
    -53767768,   2354842,
    -53508996,   2253141,
@@ -803,7 +676,7 @@ const int32_t no_aprs_outline_31[] = {
    -54616263,   2326782,
    -54130049,   2121053,
 };
-const int32_t no_aprs_outline_32[] = {
+const int32_t no_aprs_outline_25[] = {
     45120720, -13224868,
     45440104, -13109076,
     45534485, -12744768,
@@ -814,7 +687,7 @@ const int32_t no_aprs_outline_32[] = {
     44817681, -13078115,
     45118176, -13224884,
 };
-const int32_t no_aprs_outline_33[] = {
+const int32_t no_aprs_outline_26[] = {
     55659980, -21620172,
     56049279, -21486931,
     56143484, -21085306,
@@ -825,174 +698,7 @@ const int32_t no_aprs_outline_33[] = {
     55158158, -21462862,
     55657435, -21620189,
 };
-const int32_t no_aprs_outline_34[] = {
-    29170857,  69071509,
-    29388311,  69298146,
-    30087285,  69432866,
-    30159735,  69629854,
-    30788897,  69528517,
-    30922479,  69605815,
-    30869769,  69783425,
-    31233378,  69732868,
-    31262028,  70520218,
-    31083058,  71012200,
-    29948180,  71413510,
-    28606180,  71503492,
-    28434251,  71698792,
-    27602308,  71825956,
-    27137910,  71639188,
-    26969698,  71324920,
-    26713211,  71658235,
-    26355095,  71581766,
-    25587647,  71878791,
-    25125690,  71632489,
-    24615747,  71725373,
-    24066335,  71384992,
-    23393819,  71567795,
-    21969765,  71373016,
-    21709186,  70942048,
-    21279419,  70914494,
-    21081415,  70582132,
-    20811543,  70919497,
-    20238341,  70734837,
-    19707672,  70975778,
-    19400541,  70806582,
-    19109101,  70945339,
-    17921710,  70209809,
-    17171916,  70158761,
-    16855772,  69955657,
-    16551092,  69444397,
-    16264761,  69877003,
-    16048034,  69973547,
-    15303370,  69583813,
-    15015398,  69660753,
-    14497418,  69464214,
-    14205947,  69260814,
-    14074360,  68892388,
-    13490285,  68880799,
-    12706576,  68442758,
-    12517825,  67935139,
-    12605934,  67383435,
-    12834239,  67210624,
-    13501656,  67434909,
-    13295614,  67299033,
-    12939689,  67042319,
-    12787583,  66685969,
-    12390484,  66754920,
-    12155648,  66545785,
-    12040416,  66261667,
-    11659257,  66194818,
-    11492488,  65906512,
-    11458325,  65532566,
-    10700690,  65442145,
-    10508802,  65241936,
-    10429136,  64910095,
-     9358109,  64103530,
-     8781522,  64338192,
-     8225173,  64208545,
-     8033358,  63994700,
-     7665657,  63885549,
-     7515596,  63611942,
-     6852332,  63427166,
-     6544693,  63129296,
-     5009871,  62615542,
-     4652845,  62105304,
-     4631132,  61560599,
-     4492951,  60992738,
-     4661298,  60652247,
-     4636822,  60189654,
-     4800891,  59833691,
-     4859426,  59005048,
-     5015427,  58771786,
-     5205985,  58710340,
-     5287023,  58424694,
-     5582741,  58115564,
-     6686581,  57633770,
-     7909642,  57643387,
-     8625168,  57883784,
-     9618875,  58492151,
-    10274579,  58579885,
-    10592789,  58886306,
-    10889826,  58722909,
-    11013470,  58077500,
-    12234702,  56565507,
-    12190590,  56108120,
-    12608353,  56033012,
-    12524844,  55918434,
-    12545768,  55656451,
-    12665715,  55596543,
-    12575155,  55381498,
-    12693555,  55088882,
-    13306674,  54938033,
-    14230381,  54994091,
-    14572661,  55251683,
-    14647822,  55604276,
-    14984744,  55752084,
-    15846043,  55708821,
-    16222165,  55933711,
-    16407823,  55826760,
-    16645442,  55887982,
-    17414644,  57189475,
-    17335632,  57630249,
-    16990267,  57777879,
-    17198478,  58282152,
-    18197616,  58628846,
-    18532181,  58610285,
-    18962477,  59282277,
-    19208113,  59458465,
-    19289711,  59956851,
-    19025789,  60417052,
-    18051636,  61045686,
-    17758929,  61033430,
-    17500811,  61188008,
-    17710217,  61381309,
-    17770331,  61785657,
-    17914815,  62017736,
-    18600830,  62439429,
-    18754370,  62678376,
-    20773776,  63326539,
-    20847191,  62941687,
-    20811200,  62448385,
-    20991697,  61727430,
-    21190511,  61475856,
-    20910285,  60706161,
-    21010886,  60213005,
-    21454028,  59650693,
-    21785135,  59647148,
-    22045849,  59799318,
-    23019431,  59354531,
-    26193944,  59937148,
-    27874029,  60078847,
-    28545849,  60461964,
-    28491623,  60540128,
-    28622463,  60491597,
-    28650572,  60610974,
-    27797654,  60536122,
-    31285662,  62567798,
-    31534019,  62885398,
-    31336721,  63068087,
-    29991534,  63735168,
-    30526066,  64077294,
-    30487883,  64236537,
-    29986622,  64524271,
-    30110234,  64732583,
-    29604217,  64968380,
-    29826935,  65145057,
-    29607986,  65248669,
-    29819448,  65568751,
-    29715940,  65624566,
-    30095343,  65681674,
-    30087493,  65786526,
-    29066258,  66891717,
-    29988065,  67668255,
-    29343867,  68061846,
-    28685203,  68189776,
-    28470741,  68488376,
-    28772845,  68840028,
-    28414002,  68904156,
-    29118563,  69049935,
-};
-const int32_t no_aprs_outline_35[] = {
+const int32_t no_aprs_outline_27[] = {
     20575408,  42013086,
     20485441,  42223358,
     20240500,  42338960,
@@ -1572,24 +1278,9 @@ const int32_t* no_aprs_outlines[] = {
   no_aprs_outline_25,
   no_aprs_outline_26,
   no_aprs_outline_27,
-  no_aprs_outline_28,
-  no_aprs_outline_29,
-  no_aprs_outline_30,
-  no_aprs_outline_31,
-  no_aprs_outline_32,
-  no_aprs_outline_33,
-  no_aprs_outline_34,
-  no_aprs_outline_35,
 };
 const uint32_t no_aprs_outline_lengths[] = {
-  44,
-  11,
-  11,
-  10,
-  11,
   12,
-  12,
-  14,
   4,
   8,
   7,
@@ -1615,7 +1306,6 @@ const uint32_t no_aprs_outline_lengths[] = {
   31,
   9,
   9,
-  165,
   549,
 };
 

firmware/src/geofence_telemetry.c

@@ -1,5 +1,5 @@
 /**
- * Autogenerated telemetry structures. See sim/geofence
+ * Autogenerated telemetry zone structures. See sim/geofence
  */
 
 
@@ -11,309 +11,445 @@
 
 /* Longitude,  Latitude */
 
-const int32_t telemetry_outline_1[] = {
-     -989615,  32266048,
-     1012315,  32626707,
-     2702773,  33653740,
-     8187437,  39927411,
-     9079296,  41906049,
-    10614762,  40316636,
-    14414771,  37995874,
-    16762253,  35496503,
-    19758772,  34501497,
-    21328401,  34585098,
-    22807606,  35099197,
-    27173590,  38431862,
-    30019789,  38458094,
-    32345972,  39723724,
-    34441671,  42200183,
-    35203324,  45159873,
-    34980720,  46942168,
-    34332233,  48526915,
-    31647123,  51295297,
-    32813724,  53163236,
-    33359575,  55461872,
-    33244436,  57969878,
-    32457778,  60696676,
-    34964957,  62977971,
-    36286624,  67291103,
-    37685643,  69524731,
-    38622237,  72808415,
-    39091234,  83830734,
-    37891227,  86000000,
-    36088194,  86000000,
-    34043357,  86000000,
-    29682108,  86000000,
-    23049078,  86000000,
-    10025412,  86000000,
-     7714825,  86000000,
-     6082081,  86000000,
-     5117741,  82828556,
-     5335267,  73608691,
-     2954474,  71852217,
-     1512849,  69779144,
-     -412373,  70914661,
-    -2495382,  70349632,
-    -2811474,  76120029,
-    -4086361,  85675264,
-    -6087055,  86000000,
-    -8264996,  86000000,
-   -11110551,  86000000,
-   -13249343,  82728129,
-   -14407907,  74297848,
-   -14430887,  67955195,
-   -20904709,  67206040,
-   -22948694,  68047154,
-   -24955816,  66775451,
-   -25292687,  65778742,
-   -25101464,  64554217,
-   -22836287,  62482635,
-   -18608359,  62049622,
-   -13211846,  63760698,
-   -12100176,  62167442,
-   -15100734,  57477625,
-   -15631237,  55525579,
-   -15880778,  52584981,
-   -15299403,  48979099,
-   -14369933,  47459306,
-   -13119490,  46333057,
-   -13867228,  44882855,
-   -14182822,  43317928,
-   -14186549,  36776116,
-   -13794228,  35150397,
-   -12387483,  33388228,
-   -10258328,  32403441,
-     -999999,  32266038,
+const int32_t no_telemetry_outline_1[] = {
+    78946012,  31337208,
+    79107132,  31402654,
+    79565455,  30949086,
+    80149446,  30789847,
+    80191200,  30568413,
+    80682129,  30414830,
+    81110318,  30036795,
+    81417126,  30337601,
+    82043391,  30326773,
+    82220638,  30063841,
+    83155414,  29612663,
+    83583499,  29183590,
+    84101354,  29219965,
+    84228684,  28911743,
+    84796871,  28560213,
+    85159068,  28592228,
+    85122422,  28315942,
+    85678314,  28277440,
+    85994573,  27910414,
+    86136991,  28114324,
+    86408701,  27928650,
+    86690494,  28094918,
+    87290716,  27821912,
+    88756214,  28039675,
+    88764895,  27429868,
+    88891342,  27316051,
+    89480660,  28059937,
+    89897893,  28294138,
+    91020778,  27970069,
+    91273008,  28078384,
+    91641872,  27923256,
+    91631903,  27759953,
+    91977673,  27730342,
+    92664342,  27948935,
+    92652567,  28093373,
+    93251958,  28629461,
+    93760768,  28729764,
+    94622981,  29312420,
+    95389244,  29037400,
+    96035301,  29447136,
+    96355796,  29249060,
+    96122320,  29082073,
+    96137159,  28922598,
+    96435692,  29050673,
+    96580903,  28763670,
+    96281488,  28412060,
+    96602657,  28459912,
+    97322514,  28217994,
+    97658876,  28500014,
+    98098944,  28142257,
+    98298827,  27550101,
+    98452523,  27657223,
+    98651160,  27572450,
+    98656279,  25863559,
+    97819477,  25251837,
+    97529366,  24631177,
+    97708170,  24228748,
+    97564557,  23911040,
+    98212536,  24110621,
+    98835083,  24121210,
+    98676746,  23905102,
+    98863764,  23191242,
+    99507132,  22959138,
+    99192992,  22125981,
+    99917698,  22028004,
+    99940699,  21758718,
+   100214735,  21462979,
+   100604586,  21471758,
+   101120675,  21746107,
+   101247901,  21197306,
+   101704771,  21150126,
+   101736504,  21826522,
+   101524472,  22253652,
+   101707512,  22486584,
+   102127435,  22379199,
+   102470878,  22750907,
+   102981953,  22448263,
+   103300599,  22764395,
+   103492933,  22587971,
+   103620211,  22782040,
+   103941485,  22540067,
+   104143072,  22800151,
+   104371740,  22704062,
+   104687281,  22822195,
+   104864735,  23136359,
+   105275354,  23345187,
+   105842969,  22922807,
+   106541840,  22908340,
+   106780280,  22778889,
+   106550417,  22501386,
+   106663542,  21978915,
+   106971015,  21923907,
+   107351198,  21608913,
+   107759241,  21655001,
+   107972665,  21507932,
+   107600198,  21357450,
+   107990671,  21257437,
+   108634101,  21405156,
+   108983132,  21202293,
+   109383262,  21204849,
+   109356668,  20869669,
+   109618555,  20231781,
+   109070638,  20077938,
+   108442089,  19484530,
+   108328165,  18840986,
+   108522732,  18333613,
+   109426460,  17983608,
+   109800703,  18020098,
+   110699249,  18598651,
+   110926267,  19190137,
+   111314424,  19590953,
+   111223293,  20047916,
+   110805302,  20364550,
+   110689821,  20727310,
+   110846434,  21081976,
+   112079951,  21529004,
+   112892787,  21350710,
+   113267570,  21834333,
+   113757035,  22037355,
+   113881550,  22280287,
+   114614221,  22280902,
+   115205585,  22510575,
+   115551459,  22469516,
+   116579630,  22708409,
+   117131722,  23327281,
+   117623544,  23430294,
+   118437065,  24337060,
+   118838618,  24412755,
+   119259735,  24948773,
+   120079321,  25312507,
+   120145354,  25635269,
+   119924972,  26055805,
+   120150899,  26203924,
+   121124429,  27798200,
+   121872603,  28149517,
+   121976662,  28872684,
+   122199609,  29021153,
+   122270252,  29406299,
+   122689167,  29759971,
+   122694629,  30041680,
+   122467674,  30286612,
+   122131780,  30409664,
+   121742625,  30328515,
+   121523199,  30501872,
+   122173493,  30830906,
+   122107886,  32028308,
+   121555566,  32626504,
+   121203005,  32789487,
+   120512276,  34448167,
+   119605692,  34947110,
+   119900860,  35342907,
+   120839718,  35909927,
+   121190596,  36350273,
+   122001086,  36665274,
+   122365952,  36541805,
+   122718149,  36721832,
+   122949362,  37527081,
+   122170357,  37811803,
+   121707517,  37753920,
+   120741868,  38130263,
+   120110494,  37939880,
+   119583833,  37433052,
+   119357865,  37427217,
+   119393939,  37761987,
+   119175915,  38236853,
+   117959127,  38551096,
+   118010694,  38910693,
+   118298905,  38766803,
+   119121097,  38915858,
+   119615744,  39537974,
+   120647778,  39974174,
+   121273129,  40586051,
+   121880101,  40478663,
+   120976985,  39654246,
+   121021211,  39210409,
+   120795980,  38899894,
+   121068199,  38447105,
+   121783051,  38594319,
+   122934118,  39309112,
+   124279066,  39586707,
+   124721398,  39231822,
+   125030917,  39258833,
+   124381838,  38092095,
+   125265608,  37443155,
+   125804241,  37608545,
+   126068652,  37451543,
+   126652799,  37487368,
+   126666817,  37917161,
+   127090302,  38283857,
+   128038931,  38308537,
+   128374618,  38623451,
+   128530317,  38337921,
+   128649962,  38763467,
+   127851415,  39388755,
+   127858767,  39566640,
+   128657512,  39860933,
+   129920000,  40630717,
+   130036022,  41534135,
+   130441812,  41926699,
+   130896822,  42069137,
+   130919034,  42534796,
+   131335893,  42738713,
+   130709358,  42656407,
+   130834206,  42522928,
+   130687344,  42302526,
+   130419974,  42699873,
+   131068565,  42902260,
+   131257337,  43378074,
+   131255271,  44071568,
+   130981691,  44844309,
+   131851827,  45326840,
+   132936000,  45029912,
+   133113454,  45130733,
+   133186007,  45494845,
+   133436430,  45604700,
+   133861316,  46247761,
+   134167647,  47302170,
+   134752314,  47715408,
+   134565971,  48022495,
+   134665191,  48253919,
+   134293378,  48373424,
+   133020121,  48064396,
+   132476285,  47714968,
+   130961951,  47709308,
+   130732566,  48019234,
+   130804237,  48341486,
+   130552111,  48602503,
+   130553139,  48861195,
+   130196010,  48891640,
+   129498167,  49388812,
+   127999606,  49568599,
+   127550795,  49801789,
+   127590275,  50208972,
+   127337215,  50350148,
+   127306987,  50707964,
+   126924842,  51100134,
+   126805414,  51505631,
+   126048143,  52739456,
+   125225556,  53165795,
+   123309607,  53555594,
+   120704080,  53171837,
+   120044275,  52718223,
+   120656127,  52566655,
+   120749812,  52096508,
+   120066912,  51600673,
+   119163713,  50406007,
+   119346235,  50278935,
+   119259829,  50066393,
+   117873448,  49513486,
+   116683295,  49823779,
+   115820553,  48577236,
+   115785517,  48248211,
+   115525063,  48130853,
+   115898226,  47686929,
+   116760552,  47869786,
+   117350795,  47652175,
+   117768392,  47987865,
+   118498373,  47983990,
+   119711174,  47149988,
+   119867236,  46672190,
+   118843935,  46760213,
+   117438125,  46586248,
+   117333433,  46362019,
+   116562580,  46289806,
+   116197641,  45739371,
+   115681032,  45458259,
+   114560162,  45389994,
+   113586995,  44745712,
+   111898000,  45064040,
+   111402222,  44367258,
+   111933140,  43711436,
+   111007200,  43341376,
+   110400416,  42773663,
+   109339815,  42438364,
+   106770051,  42288733,
+   104982045,  41595517,
+   104498249,  41658688,
+   104498249,  41876975,
+   103711114,  41751300,
+   102156687,  42158092,
+   101495282,  42538739,
+    96385464,  42720329,
+    95325527,  44039350,
+    95350283,  44278069,
+    94711972,  44350832,
+    93516233,  44944463,
+    90877270,  45196100,
+    90661831,  45525229,
+    91001702,  46035759,
+    91028888,  46566069,
+    90313320,  47676182,
+    89479217,  48029051,
+    89047664,  48002540,
+    87979722,  48555122,
+    88060074,  48707147,
+    87743193,  48881608,
+    87814303,  49162315,
+    86885985,  49090563,
+    86549416,  48528608,
+    85692208,  48311827,
+    85525969,  47915619,
+    85656612,  47254633,
+    85484786,  47063506,
+    84786165,  46830733,
+    84666644,  46972371,
+    83029424,  47185947,
+    82315206,  45594938,
+    82611620,  45424249,
+    82521444,  45125478,
+    81944898,  45160856,
+    81692045,  45349375,
+    79871848,  44883767,
+    80481519,  44714633,
+    80355228,  44097275,
+    80785742,  43161546,
+    80390212,  43043135,
+    80538933,  42873497,
+    80165001,  42665505,
+    80235125,  42043470,
+    78742608,  41560046,
+    78123425,  41075625,
+    76907738,  41024186,
+    76318523,  40352262,
+    75677160,  40305799,
+    75555572,  40625186,
+    74835092,  40482584,
+    74830502,  40328485,
+    73991581,  40043133,
+    73835363,  39800145,
+    73907138,  39578511,
+    73631658,  39448850,
+    73801615,  38606885,
+    74277456,  38659756,
+    74835975,  38404318,
+    74894271,  37601418,
+    75118796,  37385676,
+    74376156,  37137369,
+    75840252,  36649693,
+    75912287,  36048956,
+    76177808,  35810525,
+    76551272,  35887055,
+    76956584,  35290097,
+    77263943,  35220588,
+    78042709,  35479793,
+    78281969,  34653927,
+    78936396,  34351957,
+    78731757,  34055536,
+    78801829,  33499707,
+    79135200,  33171922,
+    79219373,  32501060,
+    78918982,  32358180,
+    78700854,  32597001,
+    78389663,  32519872,
+    78735474,  31957939,
+    78743491,  31323796,
+    78899501,  31331363,
 };
-const int32_t telemetry_outline_2[] = {
+const int32_t no_telemetry_outline_2[] = {
+   126460838,  37610363,
+   126369365,  37772007,
+   126493600,  37782550,
+   126516020,  37604681,
 };
-const int32_t telemetry_outline_3[] = {
-   -92314460,  10327936,
-   -90249458,  10600852,
-   -88409914,  11499125,
-   -85777348,  14308935,
-   -84289960,  15006381,
-   -83221852,  15936681,
-   -81283172,  20100685,
-   -79243911,  20480663,
-   -77681519,  21125277,
-   -75584793,  22960568,
-   -74942993,  24180939,
-   -74543226,  26363662,
-   -75210187,  29714479,
-   -72383115,  31206753,
-   -71100503,  32307126,
-   -70150316,  34152819,
-   -69985593,  35968036,
-   -68029530,  36317200,
-   -66458135,  37173260,
-   -65341969,  38408403,
-   -64709297,  39702139,
-   -62990541,  40955325,
-   -61935008,  42593197,
-   -61507526,  44325319,
-   -61618999,  46104617,
-   -63647377,  50625516,
-   -64693025,  51880414,
-   -66168647,  52912944,
-   -69654423,  53570753,
-   -71637454,  52858309,
-   -73432751,  51165651,
-   -75638832,  50895455,
-   -78731829,  49237345,
-   -81780456,  51847069,
-   -86765976,  54221011,
-   -91059459,  54441297,
-   -94948855,  55775160,
-   -96974927,  55343899,
-  -123216337,  55431251,
-  -126338701,  54699632,
-  -128003075,  53638506,
-  -129467710,  51608246,
-  -130137038,  49222866,
-  -130085595,  46939590,
-  -129532414,  45193293,
-  -130042470,  42860693,
-  -129570554,  38639442,
-  -128365002,  36144020,
-  -125771781,  32777010,
-  -124966701,  31242973,
-  -123756850,  30158292,
-  -123792696,  28176337,
-  -122802603,  26244763,
-  -121095873,  24941902,
-  -118677312,  24298687,
-  -117544261,  23444045,
-  -116911869,  22337514,
-  -115698415,  21162352,
-  -116386185,  19853874,
-  -116562663,  18604625,
-  -116257162,  17380117,
-  -115437400,  16159895,
-  -113871384,  15077872,
-  -111614120,  14443546,
-  -109521994,  14572871,
-  -107451550,  15386136,
-  -106182706,  14592515,
-   -99918051,  12055149,
-   -97542034,  11489294,
-   -95957493,  11426835,
-   -94241105,  10607215,
-   -92324844,  10327928,
+const int32_t no_telemetry_outline_3[] = {
+   114139003,  22348452,
+   113902526,  22396095,
+   114015391,  22511907,
+   114266022,  22540970,
+   114267984,  22295530,
 };
-const int32_t telemetry_outline_4[] = {
+const int32_t no_telemetry_outline_4[] = {
+    44009954,  12368370,
+    45187760,  12605599,
+    45827504,  13125829,
+    46755583,  13203356,
+    47562521,  13453102,
+    48074903,  13786388,
+    48799797,  13831885,
+    49516435,  14433301,
+    51762142,  15128345,
+    52457450,  15500829,
+    52578373,  16145989,
+    53282799,  16459649,
+    53396048,  16669330,
+    53085678,  16648389,
+    51977632,  18996150,
+    49041995,  18581782,
+    48172171,  18156920,
+    47441785,  17111875,
+    47143605,  16946658,
+    46975663,  16953481,
+    46727660,  17265585,
+    45535337,  17302068,
+    45148072,  17427463,
+    43916933,  17324730,
+    43417998,  17516238,
+    43190929,  17359373,
+    43165041,  16689420,
+    42799324,  16371785,
+    42726448,  16652511,
+    42494301,  16421274,
+    42524550,  16051174,
+    42238717,  15298933,
+    42583490,  14981734,
+    42735721,  14307593,
+    42406743,  14101007,
+    42379495,  13651714,
+    42598973,  13443717,
+    42952770,  13517998,
+    42929198,  13210380,
+    43263857,  12532214,
+    44007410,  12368346,
 };
-const int32_t telemetry_outline_5[] = {
-   130514500,  29522844,
-   131667229,  30019641,
-   132394625,  32058425,
-   133173931,  32067808,
-   133776011,  32600134,
-   134462930,  32549119,
-   134946829,  32965598,
-   135950950,  32779112,
-   137500320,  33892204,
-   139635333,  33945183,
-   140951642,  34653056,
-   141665144,  35497919,
-   141456849,  36302046,
-   141827385,  37732055,
-   142797520,  39309565,
-   142265719,  41481720,
-   143439911,  41193941,
-   144300275,  42086597,
-   146385185,  42749519,
-   146657736,  43470798,
-   146088012,  44766111,
-   145325809,  45202378,
-   144578549,  44824443,
-   144073725,  44957327,
-   142172137,  46367583,
-   140554731,  46239101,
-   140148588,  45392633,
-   140854333,  44324949,
-   139889930,  43986450,
-   138602603,  42351141,
-   138698375,  41698750,
-   139296136,  41120560,
-   138910730,  39010150,
-   138282679,  39076271,
-   137459739,  38292470,
-   136345640,  38012459,
-   135342837,  36492006,
-   134205404,  36337549,
-   133837630,  36927822,
-   133182622,  37108691,
-   132565121,  36785908,
-   132368062,  36129651,
-   130294202,  34797391,
-   129923323,  35312264,
-   129298636,  35434779,
-   128583961,  34946835,
-   128355885,  34153901,
-   128552726,  33686250,
-   127985048,  33200752,
-   127832152,  32528056,
-   128216748,  32000789,
-   128915598,  31864468,
-   128945546,  31317460,
-   129685382,  30723335,
-   129759171,  29862484,
-   130511292,  29522826,
-};
-const int32_t telemetry_outline_6[] = {
-};
-const int32_t telemetry_outline_7[] = {
-   139828041,  32305292,
-   140440121,  32542523,
-   140703981,  33116067,
-   140429581,  33647846,
-   139785933,  33876134,
-   139181610,  33645124,
-   138938580,  33087581,
-   139190270,  32552224,
-   139824749,  32305283,
-};
-const int32_t telemetry_outline_8[] = {
-};
-const int32_t telemetry_outline_9[] = {
-   127657066,  25403010,
-   128433568,  25700982,
-   129054288,  26413574,
-   129102418,  27017940,
-   130380452,  28017865,
-   130337036,  28958872,
-   129622516,  29226301,
-   128650357,  28804066,
-   128175679,  28214441,
-   128119896,  27565668,
-   127381462,  27212499,
-   126822911,  26098681,
-   127044279,  25624584,
-   127653785,  25403001,
-};
-const int32_t telemetry_outline_10[] = {
-};
-const int32_t telemetry_outline_11[] = {
-   142174256,  25920895,
-   142803574,  26149417,
-   143030082,  26704671,
-   142711186,  27234228,
-   142061038,  27423919,
-   141477420,  27177379,
-   141279198,  26666162,
-   141573805,  26131511,
-   142170974,  25920886,
-};
-const int32_t telemetry_outline_12[] = {
-};
-const int32_t telemetry_outline_13[] = {
-   123829321,  23584448,
-   124967916,  24107191,
-   125935330,  24196529,
-   126269958,  24811133,
-   125864739,  25367683,
-   125306802,  25553958,
-   123701077,  25097954,
-   123025280,  24739313,
-   122852883,  24231515,
-   123179608,  23744774,
-   123826029,  23584440,
-};
-const int32_t telemetry_outline_14[] = {
+const int32_t no_telemetry_outline_5[] = {
+    53720801,  12079957,
+    54579337,  12280696,
+    54815056,  12605264,
+    54286174,  12891252,
+    53466411,  12949518,
+    53181336,  12806850,
+    53012107,  12479938,
+    53413764,  12149679,
+    53718257,  12079949,
 };
 
-const int32_t* telemetry_outlines[] = {
-  telemetry_outline_1,
-  telemetry_outline_2,
-  telemetry_outline_3,
-  telemetry_outline_4,
-  telemetry_outline_5,
-  telemetry_outline_6,
-  telemetry_outline_7,
-  telemetry_outline_8,
-  telemetry_outline_9,
-  telemetry_outline_10,
-  telemetry_outline_11,
-  telemetry_outline_12,
-  telemetry_outline_13,
-  telemetry_outline_14,
+const int32_t* no_telem_outlines[] = {
+  no_telemetry_outline_1,
+  no_telemetry_outline_2,
+  no_telemetry_outline_3,
+  no_telemetry_outline_4,
+  no_telemetry_outline_5,
 };
-const uint32_t telemetry_outline_lengths[] = {
-  72,
-  0,
-  72,
-  0,
-  56,
-  0,
+const uint32_t no_telem_outline_lengths[] = {
+  356,
+  4,
+  5,
+  41,
   9,
-  0,
-  14,
-  0,
-  9,
-  0,
-  11,
-  0,
 };
 
 

firmware/src/location.c

@@ -109,8 +109,8 @@ bool latlon_in_polygon(const int32_t* poly, uint32_t points, int32_t lat_hn, int
 bool latlon_in_telemetry(int32_t telemetry_outline, int32_t lat_hn, int32_t lon_hn)
 {
   return latlon_in_polygon(
-    telemetry_outlines[telemetry_outline],
-    telemetry_outline_lengths[telemetry_outline],
+    no_telem_outlines[telemetry_outline],
+    no_telem_outline_lengths[telemetry_outline],
     lat_hn, lon_hn);
 }
 /**
@@ -132,7 +132,7 @@ void location_telemetry_update(int32_t lat_hn, int32_t lon_hn)
   }
 
   /* Check all the telemetry outlines */
-  for (outline = 0; outline < sizeof(telemetry_outlines) / sizeof(int32_t*); outline++) {
+  for (outline = 0; outline < sizeof(no_telem_outlines) / sizeof(int32_t*); outline++) {
 
     if (latlon_in_telemetry(outline, lat_hn, lon_hn)) { /* If we're in this zone */
 
@@ -337,8 +337,8 @@ void location_aprs_update(int32_t lat_hn, int32_t lon_hn)
  */
 bool location_telemetry_active(void)
 {
-  /* Are we in a telemetry zone? */
-  return (current_telemetry_outline != -1);
+  /* Are we outside the no telemetry zones? */
+  return (current_telemetry_outline == -1);
 }
 
 

firmware/test/tc/location_aprs_tc_list.csv

@@ -11,9 +11,6 @@ Portugal,0,40,-8
 Italy,0,43,12
 Romania,0,46,24
 Moldova,0,47.2,28.9
-Sweden,0,58,12
-Stockholm,0,59.3,18
-Malmo,0,55.6,13
 Mexico City,0,19.5,-99
 Yemen,0,15,44
 NK,0,39,126
@@ -26,6 +23,10 @@ Anchorage,144.39,61.2,-149.9
 Honolulu,144.39,21.3,-157.8
 
 # 144.8
+Oslo,144.8,59.9,10.74
+Sweden,144.8,58,12
+Stockholm,144.8,59.3,18
+Malmo,144.8,55.6,13
 Copenhagen,144.8,55.7,12.5
 Amsterdam,144.8,52.4,5.7
 Reykjavik,144.8,64.27,-21.57

firmware/test/tc/location_telemetry_tc_list.csv

@@ -20,14 +20,13 @@ Poland,1,51,20
 Madrid,1,40.5,-3.5
 
 # Outside of europe, may allow based on power availability
-Russia,0,55,37
-Mongolia,0,48,107
-Vladivostok,0,43,132
-Armenia,0,40,44
-Africa,0,9,2
-Thailand,0,14,100
-South Korea,0,37,128
-
+Russia,1,55,37
+Mongolia,1,48,107
+Vladivostok,1,43,132
+Armenia,1,40,44
+Africa,1,9,2
+Thailand,1,14,100
+South Korea,1,37,128
 LA,1,34,-118
 New York,1,41,-74
 Canada,1,44,-76

sim/geofence/country_excludes.ipynb

@@ -26,18 +26,23 @@
       "\n",
       "# United Kingdom, Isle of Man, Jersey, Guernsey\n",
       "# Belgium, Luxembourg, Portugal, France, Albania, Bosnia & H, Croatia, Finland (Aland), \n",
-      "# Hungary, Italy, Macedonia, Moldova, Kaliningradskaya??, Montenegro, Norway, Romania, Slovakia, Sweden\n",
+      "# Hungary, Italy, Macedonia, Moldova, Kaliningradskaya??, Montenegro, Romania, Slovakia, Mexico\n",
       "# US with UK license under https://www.gpo.gov/fdsys/pkg/CFR-2013-title47-vol5/xml/CFR-2013-title47-vol5-sec97-107.xml 97.107(b)(2)\n",
       "# Mexico, not member of CEPT\n",
+      "#\n",
+      "# Edits June 2016:\n",
+      "# - Sweden confirmed okay by SM0ULC\n",
+      "# - Finland (Aland) probably okay, information from SM0ULC\n",
+      "# - Norway confirmed okay by SM0ULC\n",
+      "#\n",
       "aprs_tx_exclude = ['GB', \"IM\", \"JE\", \"GG\",\n",
-      "                   'BE', 'LU', 'PT', 'FR', 'AL', 'BA', 'HR', 'FI', 'A?',\n",
-      "                   'HU', 'IT', 'MK', 'MD', 'ME', 'NO', 'RO', 'SK', 'SE',\n",
-      "                   'MX'] + tx_exclude"
+      "                   'BE', 'LU', 'PT', 'FR', 'AL', 'BA', 'HR',\n",
+      "                   'HU', 'IT', 'MK', 'MD', 'ME', 'RO', 'SK', 'MX'] + tx_exclude"
      ],
      "language": "python",
      "metadata": {},
      "outputs": [],
-     "prompt_number": 1
+     "prompt_number": 3
     },
     {
      "cell_type": "code",
@@ -45,7 +50,8 @@
      "input": [],
      "language": "python",
      "metadata": {},
-     "outputs": []
+     "outputs": [],
+     "prompt_number": 3
     }
    ],
    "metadata": {}