don't lose region info for 1.1 nodes that update

pull/18/head
Kevin Hester 2021-03-11 17:50:36 +08:00
rodzic e6e1c5a600
commit 5c1062ea83
2 zmienionych plików z 51 dodań i 2 usunięć

Wyświetl plik

@ -5,9 +5,24 @@ option optimize_for = LITE_RUNTIME;
import "mesh.proto";
import "channel.proto";
import "radioconfig.proto";
option java_outer_classname = "DeviceOnly";
/* This is a stub version of the old 1.1 representation of RadioConfig. But only keeping the region info. The device firmware uses
this stub while migrating old nodes to the new preferences system.
*/
message LegacyRadioConfig {
message LegacyPreferences {
/*
* The region code for my radio (US, CN, EU433, etc...)
*/
RegionCode region = 15;
}
LegacyPreferences preferences = 1;
}
/*
* This message is never sent over the wire, but it is used for serializing DB
* state to flash in the device code
@ -22,8 +37,8 @@ message DeviceState {
*/
reserved 12;
// Moved to its own file
// RadioConfig radio = 1;
// Moved to its own file, but we keep this here so we can automatically migrate old radio.region settings
LegacyRadioConfig legacyRadio = 1;
/*
* Read only settings/info about this node

Wyświetl plik

@ -20,6 +20,8 @@
- [deviceonly.proto](#deviceonly.proto)
- [ChannelFile](#.ChannelFile)
- [DeviceState](#.DeviceState)
- [LegacyRadioConfig](#.LegacyRadioConfig)
- [LegacyRadioConfig.LegacyPreferences](#.LegacyRadioConfig.LegacyPreferences)
- [environmental_measurement.proto](#environmental_measurement.proto)
- [EnvironmentalMeasurement](#.EnvironmentalMeasurement)
@ -319,6 +321,7 @@ the receive queue and use the preferences store for the other stuff
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| legacyRadio | [LegacyRadioConfig](#LegacyRadioConfig) | | Moved to its own file, but we keep this here so we can automatically migrate old radio.region settings |
| my_node | [MyNodeInfo](#MyNodeInfo) | | Read only settings/info about this node |
| owner | [User](#User) | | My owner info |
| node_db | [NodeInfo](#NodeInfo) | repeated | |
@ -332,6 +335,37 @@ the receive queue and use the preferences store for the other stuff
<a name=".LegacyRadioConfig"></a>
### LegacyRadioConfig
This is a stub version of the old 1.1 representation of RadioConfig. But only keeping the region info. The device firmware uses
this stub while migrating old nodes to the new preferences system.
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| preferences | [LegacyRadioConfig.LegacyPreferences](#LegacyRadioConfig.LegacyPreferences) | | |
<a name=".LegacyRadioConfig.LegacyPreferences"></a>
### LegacyRadioConfig.LegacyPreferences
| Field | Type | Label | Description |
| ----- | ---- | ----- | ----------- |
| region | [RegionCode](#RegionCode) | | The region code for my radio (US, CN, EU433, etc...) |