Read telemetryBaudrate into internalModuleBaudrate
This commit is contained in:
@@ -868,6 +868,7 @@ PACK(struct RadioData {
|
|||||||
int8_t timezone:5;
|
int8_t timezone:5;
|
||||||
uint8_t adjustRTC:1;
|
uint8_t adjustRTC:1;
|
||||||
NOBACKUP(uint8_t inactivityTimer);
|
NOBACKUP(uint8_t inactivityTimer);
|
||||||
|
CUST_ATTR(telemetryBaudrate, r_telemetryBaudrate, nullptr);
|
||||||
uint8_t internalModuleBaudrate:3;
|
uint8_t internalModuleBaudrate:3;
|
||||||
SPLASH_MODE; /* 3bits */
|
SPLASH_MODE; /* 3bits */
|
||||||
int8_t hapticMode:2 CUST(r_beeperMode,w_beeperMode);
|
int8_t hapticMode:2 CUST(r_beeperMode,w_beeperMode);
|
||||||
|
|||||||
@@ -1753,6 +1753,13 @@ static void r_jitterFilter(void* user, uint8_t* data, uint32_t bitoffs,
|
|||||||
yaml_put_bits(data, i, bitoffs, 1);
|
yaml_put_bits(data, i, bitoffs, 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
static void r_telemetryBaudrate(void* user, uint8_t* data, uint32_t bitoffs,
|
||||||
|
const char* val, uint8_t val_len)
|
||||||
|
{
|
||||||
|
uint32_t i = yaml_str2uint(val, val_len);
|
||||||
|
yaml_put_bits(data, i, bitoffs, 3);
|
||||||
|
}
|
||||||
|
|
||||||
//struct_serialConfig
|
//struct_serialConfig
|
||||||
static const struct YamlIdStr enum_SerialPort[] = {
|
static const struct YamlIdStr enum_SerialPort[] = {
|
||||||
{ SP_AUX1, "AUX1" },
|
{ SP_AUX1, "AUX1" },
|
||||||
|
|||||||
@@ -380,6 +380,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_PADDING( 3 ),
|
YAML_PADDING( 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -359,6 +359,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -401,6 +401,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_PADDING( 3 ),
|
YAML_PADDING( 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -399,6 +399,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_PADDING( 3 ),
|
YAML_PADDING( 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -358,6 +358,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -397,6 +397,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -338,6 +338,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -346,6 +346,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -343,6 +343,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -345,6 +345,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
@@ -351,6 +351,7 @@ static const struct YamlNode struct_RadioData[] = {
|
|||||||
YAML_SIGNED( "timezone", 5 ),
|
YAML_SIGNED( "timezone", 5 ),
|
||||||
YAML_UNSIGNED( "adjustRTC", 1 ),
|
YAML_UNSIGNED( "adjustRTC", 1 ),
|
||||||
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
YAML_UNSIGNED( "inactivityTimer", 8 ),
|
||||||
|
YAML_CUSTOM("telemetryBaudrate",r_telemetryBaudrate,nullptr),
|
||||||
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
YAML_UNSIGNED( "internalModuleBaudrate", 3 ),
|
||||||
YAML_SIGNED( "splashMode", 3 ),
|
YAML_SIGNED( "splashMode", 3 ),
|
||||||
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
YAML_SIGNED_CUST( "hapticMode", 2, r_beeperMode, w_beeperMode ),
|
||||||
|
|||||||
Reference in New Issue
Block a user