mirror
/
meshtastic-protobuf
kopia lustrzana https://github.com/meshtastic/protobufs
1
0
Forkuj 0
Kod Zgłoszenia Packages Projekty Wydania Wiki Aktywność

Move LoRa config out of primary channel

pull/148/head
Sacha Weatherstone 2022-05-07 13:32:29 +10:00
rodzic 521620ba14
commit cb8c31bdd9
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 7AB2D7E206124B31
2 zmienionych plików z 79 dodań i 79 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

79
channel.proto
Wyświetl plik

@ -30,85 +30,6 @@ option java_outer_classname = "ChannelProtos";
*/
message ChannelSettings {
/*
* If zero then, use default max legal continuous power (ie. something that won't
* burn out the radio hardware)
* In most cases you should use zero here.
* Units are in dBm.
*/
int32 tx_power = 1;
/*
* Standard predefined channel settings
* Note: these mappings must match ModemConfigChoice in the device code.
*/
enum ModemConfig {
/*
* TODO: REPLACE
*/
VLongSlow = 0;
/*
* TODO: REPLACE
*/
LongSlow = 1;
/*
* TODO: REPLACE
*/
LongFast = 2;
/*
* TODO: REPLACE
*/
MidSlow = 3;
/*
* TODO: REPLACE
*/
MidFast = 4;
/*
* TODO: REPLACE
*/
ShortSlow = 5;
/*
* TODO: REPLACE
*/
ShortFast = 6;
}
/*
* Note: This is the 'old' mechanism for specifying channel parameters.
* Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH.
* As a heuristic: If bandwidth is specified, do not use modem_config.
* Because protobufs take ZERO space when the value is zero this works out nicely.
* This value is replaced by bandwidth/spread_factor/coding_rate.
* If you'd like to experiment with other options add them to MeshRadio.cpp in the device code.
*/
ModemConfig modem_config = 3;
/*
* Bandwidth in MHz
* Certain bandwidth numbers are 'special' and will be converted to the
* appropriate floating point value: 31 -> 31.25MHz
*/
uint32 bandwidth = 6;
/*
* A number from 7 to 12.
* Indicates number of chirps per symbol as 1<<spread_factor.
*/
uint32 spread_factor = 7;
/*
* The denominator of the coding rate.
* ie for 4/8, the value is 8. 5/8 the value is 5.
*/
uint32 coding_rate = 8;
/*
* NOTE: this field is _independent_ and unrelated to the concepts in channel.proto.
* this is controlling the actual hardware frequency the radio is transmitting on.

79
config.proto
Wyświetl plik

@ -63,6 +63,85 @@ message Config {
*/
message LoRaConfig {
/*
* If zero then, use default max legal continuous power (ie. something that won't
* burn out the radio hardware)
* In most cases you should use zero here.
* Units are in dBm.
*/
int32 tx_power = 1;
/*
* Standard predefined channel settings
* Note: these mappings must match ModemConfigChoice in the device code.
*/
enum ModemConfig {
/*
* TODO: REPLACE
*/
VLongSlow = 0;
/*
* TODO: REPLACE
*/
LongSlow = 1;
/*
* TODO: REPLACE
*/
LongFast = 2;
/*
* TODO: REPLACE
*/
MidSlow = 3;
/*
* TODO: REPLACE
*/
MidFast = 4;
/*
* TODO: REPLACE
*/
ShortSlow = 5;
/*
* TODO: REPLACE
*/
ShortFast = 6;
}
/*
* Note: This is the 'old' mechanism for specifying channel parameters.
* Either modem_config or bandwidth/spreading/coding will be specified - NOT BOTH.
* As a heuristic: If bandwidth is specified, do not use modem_config.
* Because protobufs take ZERO space when the value is zero this works out nicely.
* This value is replaced by bandwidth/spread_factor/coding_rate.
* If you'd like to experiment with other options add them to MeshRadio.cpp in the device code.
*/
ModemConfig modem_config = 3;
/*
* Bandwidth in MHz
* Certain bandwidth numbers are 'special' and will be converted to the
* appropriate floating point value: 31 -> 31.25MHz
*/
uint32 bandwidth = 6;
/*
* A number from 7 to 12.
* Indicates number of chirps per symbol as 1<<spread_factor.
*/
uint32 spread_factor = 7;
/*
* The denominator of the coding rate.
* ie for 4/8, the value is 8. 5/8 the value is 5.
*/
uint32 coding_rate = 8;
}
/*