1.1.1.1
This commit is contained in:
parent
e8cf3f9cc6
commit
dfdcee932a
|
|
@ -64,6 +64,7 @@ Timeline (Versions):
|
||||||
- 2023.07.16 New Icons for Oled Screen (Runner, Car, Jeep)
|
- 2023.07.16 New Icons for Oled Screen (Runner, Car, Jeep)
|
||||||
- 2023.07.18 Add Support for triggering PTT to external amplifier.
|
- 2023.07.18 Add Support for triggering PTT to external amplifier.
|
||||||
- 2023.07.24 New Validation for Callsings, Overlay change and New Icons (Bike, Motorcycle).
|
- 2023.07.24 New Validation for Callsings, Overlay change and New Icons (Bike, Motorcycle).
|
||||||
|
- 2023.08.05 New Support for SH1106 Oled Screen (0,96" and 1.3")
|
||||||
____________________________________________________
|
____________________________________________________
|
||||||
This code was based on the work by OE5BPA LoRa Tracker, Serge Y. Stroobandt, ON4AA in the byte-saving part of the APRS 434 firmware and Manfred DC2MH (Mane76) with the mods for multiple Callsigns and processor speed.
|
This code was based on the work by OE5BPA LoRa Tracker, Serge Y. Stroobandt, ON4AA in the byte-saving part of the APRS 434 firmware and Manfred DC2MH (Mane76) with the mods for multiple Callsigns and processor speed.
|
||||||
- https://github.com/aprs434/lora.tracker
|
- https://github.com/aprs434/lora.tracker
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,7 @@
|
||||||
{
|
{
|
||||||
"beacons": [
|
"beacons": [
|
||||||
{
|
{
|
||||||
"callsign": "CD2RXU-6",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": "[",
|
"symbol": "[",
|
||||||
"overlay": "/",
|
"overlay": "/",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
|
|
@ -18,7 +18,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"callsign": "CD2RXU-6",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": ">",
|
"symbol": ">",
|
||||||
"overlay": "/",
|
"overlay": "/",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
|
|
@ -35,7 +35,7 @@
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"callsign": "CD2RXU-6",
|
"callsign": "CD2RXU-7",
|
||||||
"symbol": "j",
|
"symbol": "j",
|
||||||
"overlay": "/",
|
"overlay": "/",
|
||||||
"comment": "",
|
"comment": "",
|
||||||
|
|
@ -70,7 +70,8 @@
|
||||||
"maxDistanceToTracker": 30,
|
"maxDistanceToTracker": 30,
|
||||||
"standingUpdateTime": 15,
|
"standingUpdateTime": 15,
|
||||||
"sendAltitude": true,
|
"sendAltitude": true,
|
||||||
"sendBatteryInfo": false
|
"sendBatteryInfo": false,
|
||||||
|
"bluetooth": true
|
||||||
},
|
},
|
||||||
"ptt_trigger": {
|
"ptt_trigger": {
|
||||||
"active": false,
|
"active": false,
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,6 @@ platform = espressif32 @ 6.3.1
|
||||||
framework = arduino
|
framework = arduino
|
||||||
lib_ldf_mode = deep+
|
lib_ldf_mode = deep+
|
||||||
monitor_speed = 115200
|
monitor_speed = 115200
|
||||||
upload_speed = 921600
|
|
||||||
monitor_filters = esp32_exception_decoder
|
monitor_filters = esp32_exception_decoder
|
||||||
lib_deps =
|
lib_deps =
|
||||||
adafruit/Adafruit BusIO@^1.14.1
|
adafruit/Adafruit BusIO@^1.14.1
|
||||||
|
|
@ -37,14 +36,14 @@ check_flags =
|
||||||
check_skip_packages = yes
|
check_skip_packages = yes
|
||||||
board_build.partitions = no_ota.csv
|
board_build.partitions = no_ota.csv
|
||||||
|
|
||||||
[env:ttgo-t-beam-v1]
|
|
||||||
board = ttgo-t-beam
|
|
||||||
build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0
|
|
||||||
|
|
||||||
[env:ttgo-t-beam-v0_7]
|
[env:ttgo-t-beam-v0_7]
|
||||||
board = ttgo-t-beam
|
board = ttgo-t-beam
|
||||||
build_flags = -Werror -Wall -DTTGO_T_Beam_V0_7
|
build_flags = -Werror -Wall -DTTGO_T_Beam_V0_7
|
||||||
|
|
||||||
|
[env:ttgo-t-beam-v1]
|
||||||
|
board = ttgo-t-beam
|
||||||
|
build_flags = -Werror -Wall -DTTGO_T_Beam_V1_0
|
||||||
|
|
||||||
[env:ttgo-t-beam-v1_2]
|
[env:ttgo-t-beam-v1_2]
|
||||||
board = ttgo-t-beam
|
board = ttgo-t-beam
|
||||||
build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2
|
build_flags = -Werror -Wall -DTTGO_T_Beam_V1_2
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ TinyGPSPlus gps;
|
||||||
BluetoothSerial SerialBT;
|
BluetoothSerial SerialBT;
|
||||||
OneButton userButton = OneButton(BUTTON_PIN, true, true);
|
OneButton userButton = OneButton(BUTTON_PIN, true, true);
|
||||||
|
|
||||||
String versionDate = "2023.08.04";
|
String versionDate = "2023.08.05";
|
||||||
|
|
||||||
int myBeaconsIndex = 0;
|
int myBeaconsIndex = 0;
|
||||||
int myBeaconsSize = Config.beacons.size();
|
int myBeaconsSize = Config.beacons.size();
|
||||||
|
|
|
||||||
|
|
@ -68,6 +68,8 @@ void Configuration::readFile(fs::FS &fs, const char *fileName) {
|
||||||
standingUpdateTime = data["other"]["standingUpdateTime"].as<int>();
|
standingUpdateTime = data["other"]["standingUpdateTime"].as<int>();
|
||||||
sendAltitude = data["other"]["sendAltitude"].as<bool>();
|
sendAltitude = data["other"]["sendAltitude"].as<bool>();
|
||||||
sendBatteryInfo = data["other"]["sendBatteryInfo"].as<bool>();
|
sendBatteryInfo = data["other"]["sendBatteryInfo"].as<bool>();
|
||||||
|
bluetooth = data["other"]["bluetooth"].as<bool>();
|
||||||
|
disableGps = data["other"]["disableGps"].as<bool>();
|
||||||
|
|
||||||
configFile.close();
|
configFile.close();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -58,6 +58,8 @@ public:
|
||||||
int standingUpdateTime;
|
int standingUpdateTime;
|
||||||
bool sendAltitude;
|
bool sendAltitude;
|
||||||
bool sendBatteryInfo;
|
bool sendBatteryInfo;
|
||||||
|
bool bluetooth;
|
||||||
|
bool disableGps;
|
||||||
|
|
||||||
Configuration();
|
Configuration();
|
||||||
void validateConfigFile(String currentBeaconCallsign);
|
void validateConfigFile(String currentBeaconCallsign);
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue