FreeCalypso > hg > freecalypso-tools

changeset 289:329c31f7c797

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fc-cal2text changed to emit Tx ramps for each band as a single table
author Mychaela Falconia <falcon@freecalypso.org>
date Sat, 18 Nov 2017 02:01:57 +0000
parents 730cdd32c3b9
children 94234e9c843b
files ffstools/cal2text/main.c librftab/rftablewr.c
diffstat 2 files changed, 8 insertions(+), 23 deletions(-) [+]
line wrap: on
line diff
--- a/ffstools/cal2text/main.c	Sat Nov 18 01:13:03 2017 +0000
+++ b/ffstools/cal2text/main.c	Sat Nov 18 02:01:57 2017 +0000
@@ -18,13 +18,13 @@
 extern void write_agcwords_table();
 extern void write_agcglobals_table();
 extern void write_il2agc_table();
+extern void write_tx_ramps_table();
 extern void write_tx_levels_table();
 extern void write_tx_calchan_table();
 extern void write_tx_caltemp_table();
 extern void write_rx_calchan_table();
 extern void write_rx_caltemp_table();
 extern void write_rx_agcparams_table();
-extern void write_tx_ramp();
 
 struct output_chunk {
 	unsigned	offset;
@@ -58,23 +58,8 @@
 	0, "agcwords", write_agcwords_table
 };
 
-static struct output_chunk tx_ramps_handling[16] = {
-	{0x000, "ramp00", write_tx_ramp},
-	{0x020, "ramp01", write_tx_ramp},
-	{0x040, "ramp02", write_tx_ramp},
-	{0x060, "ramp03", write_tx_ramp},
-	{0x080, "ramp04", write_tx_ramp},
-	{0x0A0, "ramp05", write_tx_ramp},
-	{0x0C0, "ramp06", write_tx_ramp},
-	{0x0E0, "ramp07", write_tx_ramp},
-	{0x100, "ramp08", write_tx_ramp},
-	{0x120, "ramp09", write_tx_ramp},
-	{0x140, "ramp10", write_tx_ramp},
-	{0x160, "ramp11", write_tx_ramp},
-	{0x180, "ramp12", write_tx_ramp},
-	{0x1A0, "ramp13", write_tx_ramp},
-	{0x1C0, "ramp14", write_tx_ramp},
-	{0x1E0, "ramp15", write_tx_ramp},
+static struct output_chunk tx_ramps_handling = {
+	0, "ramps", write_tx_ramps_table
 };
 
 static struct output_chunk tx_levels_handling = {
@@ -115,7 +100,7 @@
 	{"rx/il2agc",         363, "global",   il2agc_handling,       3},
 	{"rx/agcwords",	      40,  "global",  &agcwords_handling,     1},
 
-	{"tx/ramps.850",      512, "tx-850",   tx_ramps_handling,     16},
+	{"tx/ramps.850",      512, "tx-850",  &tx_ramps_handling,     1},
 	{"tx/levels.850",     128, "tx-850",  &tx_levels_handling,    1},
 	{"tx/calchan.850",    128, "tx-850",  &tx_calchan_handling,   1},
 	{"tx/caltemp.850",    40,  "tx-850",  &tx_caltemp_handling,   1},
@@ -123,7 +108,7 @@
 	{"rx/caltemp.850",    44,  "rx-850",  &rx_caltemp_handling,   1},
 	{"rx/agcparams.850",  8,   "rx-850",  &rx_agcparams_handling, 1},
 
-	{"tx/ramps.900",      512, "tx-900",   tx_ramps_handling,     16},
+	{"tx/ramps.900",      512, "tx-900",  &tx_ramps_handling,     1},
 	{"tx/levels.900",     128, "tx-900",  &tx_levels_handling,    1},
 	{"tx/calchan.900",    128, "tx-900",  &tx_calchan_handling,   1},
 	{"tx/caltemp.900",    40,  "tx-900",  &tx_caltemp_handling,   1},
@@ -131,7 +116,7 @@
 	{"rx/caltemp.900",    44,  "rx-900",  &rx_caltemp_handling,   1},
 	{"rx/agcparams.900",  8,   "rx-900",  &rx_agcparams_handling, 1},
 
-	{"tx/ramps.1800",     512, "tx-1800",  tx_ramps_handling,     16},
+	{"tx/ramps.1800",     512, "tx-1800", &tx_ramps_handling,     1},
 	{"tx/levels.1800",    128, "tx-1800", &tx_levels_handling,    1},
 	{"tx/calchan.1800",   128, "tx-1800", &tx_calchan_handling,   1},
 	{"tx/caltemp.1800",   40,  "tx-1800", &tx_caltemp_handling,   1},
@@ -139,7 +124,7 @@
 	{"rx/caltemp.1800",   44,  "rx-1800", &rx_caltemp_handling,   1},
 	{"rx/agcparams.1800", 8,   "rx-1800", &rx_agcparams_handling, 1},
 
-	{"tx/ramps.1900",     512, "tx-1900",  tx_ramps_handling,     16},
+	{"tx/ramps.1900",     512, "tx-1900", &tx_ramps_handling,     1},
 	{"tx/levels.1900",    128, "tx-1900", &tx_levels_handling,    1},
 	{"tx/calchan.1900",   128, "tx-1900", &tx_calchan_handling,   1},
 	{"tx/caltemp.1900",   40,  "tx-1900", &tx_caltemp_handling,   1},
--- a/librftab/rftablewr.c	Sat Nov 18 01:13:03 2017 +0000
+++ b/librftab/rftablewr.c	Sat Nov 18 02:01:57 2017 +0000
@@ -219,7 +219,7 @@
 
 	fputs("rf_table tx-ramps\n", outf);
 	for (i = 0; i < 16; i++) {
-		fprintf(outf, "\n# Tx ramp template %d:\n\n");
+		fprintf(outf, "\n# Tx ramp template %d:\n\n", i);
 		write_tx_ramp(p, outf);
 		p += 32;
 	}