Merge branch 'master' of https://github.com/pjalocha/esp32-ogn-tracker

main/freqplan.h

@@ -36,6 +36,15 @@ class FreqPlan
    { if(Channels<=1) return 0;                                              // if single channel (New Zeeland) return channel #0
      if(Plan>=2)                                                            // if USA/Canada or Australia/South America
      { uint8_t Channel = FreqHopHash((Time<<1)+Slot) % Channels;            // Flarm hopping channel
+       if(OGN)                                                              // OGN Tracker
+       { if(Slot)                                                           // for 2nd slot
+         { uint8_t Channel2 = FreqHopHash((Time<<1)) % Channels;            // use same as Flarm in the 1st slot
+           if(Channel2==Channel) { Channel++; if(Channel>=Channels) Channel-=2; } // but if same then Flarm in the 2nd slot
+                            else Channel=Channel2;
+         }
+         else { Channel++; if(Channel>=Channels) Channel-=2; }              // for 1st slot choose a higher channel (unless already highest, then choose a lower one)
+       }
+/*
        if(OGN)                                                              // for OGN tracker
        { if(Slot) { uint8_t Channel1=FreqHopHash((Time<<1)) % Channels;     // for 2nd slot choose a channel close to the 1st slot
                             Channel1++; if(Channel1>=Channels) Channel1-=2; //
@@ -44,6 +53,7 @@ class FreqPlan
                                     else  Channel=Channel2; }
              else { Channel++; if(Channel>=Channels) Channel-=2; }          // for 1st slot choose a higher channel (unless already highest, then choose a lower one)
        }
+*/
        return Channel; }                                                    // return 0..Channels-1 for USA/CA or Australia.
      return Slot^OGN; }                                                     // if Europe/South Africa: return 0 or 1 for EU freq. plan
 

main/hal.cpp

@@ -375,7 +375,8 @@ static void esp_spp_cb(esp_spp_cb_event_t Event, esp_spp_cb_param_t *Param)
 { switch (Event)
   { case ESP_SPP_INIT_EVT:                                        // [0]
       esp_bt_dev_set_device_name(Parameters.BTname);
-      esp_bt_gap_set_scan_mode(ESP_BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE);
+      // esp_bt_gap_set_scan_mode(ESP_BT_SCAN_MODE_CONNECTABLE_DISCOVERABLE); // for older ESP-IDF
+      esp_bt_gap_set_scan_mode(ESP_BT_CONNECTABLE, ESP_BT_GENERAL_DISCOVERABLE);
       esp_spp_start_srv(sec_mask, role_slave, 0, "SPP_SERVER");
       break;
     case ESP_SPP_DISCOVERY_COMP_EVT:                              // [8]

sdkconfig

@@ -365,6 +365,16 @@ CONFIG_SPI_MASTER_ISR_IN_IRAM=y
 CONFIG_SPI_SLAVE_IN_IRAM=
 CONFIG_SPI_SLAVE_ISR_IN_IRAM=y
 
+#
+# eFuse Bit Manager
+#
+CONFIG_EFUSE_CUSTOM_TABLE=
+CONFIG_EFUSE_VIRTUAL=
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_NONE=
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_3_4=y
+CONFIG_EFUSE_CODE_SCHEME_COMPAT_REPEAT=
+CONFIG_EFUSE_MAX_BLK_LEN=192
+
 #
 # ESP32-specific
 #
@@ -464,7 +474,9 @@ CONFIG_ESP32_WIFI_AMPDU_RX_ENABLED=y
 CONFIG_ESP32_WIFI_RX_BA_WIN=6
 CONFIG_ESP32_WIFI_NVS_ENABLED=y
 CONFIG_ESP32_WIFI_SOFTAP_BEACON_MAX_LEN=752
+CONFIG_ESP32_WIFI_MGMT_SBUF_NUM=32
 CONFIG_ESP32_WIFI_DEBUG_LOG_ENABLE=
+CONFIG_ESP32_WIFI_IRAM_OPT=y
 
 #
 # PHY
@@ -501,6 +513,7 @@ CONFIG_ESP_HTTP_CLIENT_ENABLE_HTTPS=y
 #
 CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
 CONFIG_HTTPD_MAX_URI_LEN=512
+CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 
 #
 # ESP HTTPS OTA
@@ -607,6 +620,7 @@ CONFIG_FREERTOS_VTASKLIST_INCLUDE_COREID=
 CONFIG_FREERTOS_GENERATE_RUN_TIME_STATS=
 CONFIG_FREERTOS_DEBUG_INTERNALS=
 CONFIG_FREERTOS_TASK_FUNCTION_WRAPPER=y
+CONFIG_FREERTOS_CHECK_MUTEX_GIVEN_BY_OWNER=y
 
 #
 # Heap memory debugging