From 597621c1297a691841a4b456cef6f2b1d310e371 Mon Sep 17 00:00:00 2001 From: Peter Antypas Date: Thu, 24 Feb 2022 12:20:41 -0800 Subject: [PATCH 1/2] Retuning for ECS crystal --- latest/Firmware/NMEA2000Adapter/.gitignore | 1 + latest/Firmware/Transponder/Inc/config.h | 2 +- .../Transponder/Inc/radio_config_Si4463_nonstd_preamble.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4460.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4467.h | 2 +- 6 files changed, 6 insertions(+), 5 deletions(-) diff --git a/latest/Firmware/NMEA2000Adapter/.gitignore b/latest/Firmware/NMEA2000Adapter/.gitignore index b5e5a9c..f46ca94 100644 --- a/latest/Firmware/NMEA2000Adapter/.gitignore +++ b/latest/Firmware/NMEA2000Adapter/.gitignore @@ -18,3 +18,4 @@ Debug /Board1.3-L431/ /Board1.3-L422/ /Board2.0-L422/ +/Board6.0-L432/ diff --git a/latest/Firmware/Transponder/Inc/config.h b/latest/Firmware/Transponder/Inc/config.h index 30388da..7bb65fe 100644 --- a/latest/Firmware/Transponder/Inc/config.h +++ b/latest/Firmware/Transponder/Inc/config.h @@ -25,7 +25,7 @@ #include "TXPowerSettings.h" -#define FW_REV "4.0.2" +#define FW_REV "4.1.0" /* diff --git a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h index 3e25bbf..55d4680 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h +++ b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h @@ -64,7 +64,7 @@ // Descriptions: // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. */ -#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x2D +#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x40 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h index c4447e3..0772659 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h @@ -68,7 +68,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4460.h b/latest/Firmware/Transponder/Inc/radio_config_si4460.h index 6207ac9..ebe97eb 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4460.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4460.h @@ -62,7 +62,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4467.h b/latest/Firmware/Transponder/Inc/radio_config_si4467.h index fc69f11..286d9dc 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4467.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4467.h @@ -63,7 +63,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x2D, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 From 1b9a5df007c361f1cabfc7740589e6a35e2937f0 Mon Sep 17 00:00:00 2001 From: Peter Antypas Date: Thu, 24 Feb 2022 14:57:56 -0800 Subject: [PATCH 2/2] Retuned for ECS crystal --- .../Transponder/Inc/radio_config_Si4463_nonstd_preamble.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4460.h | 2 +- latest/Firmware/Transponder/Inc/radio_config_si4467.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h index 55d4680..d9986cf 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h +++ b/latest/Firmware/Transponder/Inc/radio_config_Si4463_nonstd_preamble.h @@ -64,7 +64,7 @@ // Descriptions: // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. */ -#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x40 +#define RF_GLOBAL_XO_TUNE_1 0x11, 0x00, 0x01, 0x00, 0x41 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h index 0772659..b00b570 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4362_c2.h @@ -68,7 +68,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4460.h b/latest/Firmware/Transponder/Inc/radio_config_si4460.h index ebe97eb..1359c22 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4460.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4460.h @@ -62,7 +62,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1 diff --git a/latest/Firmware/Transponder/Inc/radio_config_si4467.h b/latest/Firmware/Transponder/Inc/radio_config_si4467.h index 286d9dc..4d5a36c 100644 --- a/latest/Firmware/Transponder/Inc/radio_config_si4467.h +++ b/latest/Firmware/Transponder/Inc/radio_config_si4467.h @@ -63,7 +63,7 @@ // GLOBAL_XO_TUNE - Configure the internal capacitor frequency tuning bank for the crystal oscillator. // GLOBAL_CLK_CFG - Clock configuration options. */ -#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x40, 0x00 +#define RF_GLOBAL_XO_TUNE_2 0x11, 0x00, 0x02, 0x00, 0x41, 0x00 /* // Set properties: RF_GLOBAL_CONFIG_1