fxanalyse: FXAnalyse.c annotate

annotate FXAnalyse.c @ 183:791ca26fee6a

Rewrite data writing to file Fmt() uses by default truncation to conver double arguments to their text representation. Rounding must be used. Rewrite using standard C functions to get rid of this problem (and probably make it more efficient). Extend to handle arbitrary number of channels and to report errors on opening the data files.

author	Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date	Fri, 21 Feb 2014 18:42:30 +0100
parents	8faada7e4faf
children	12df3a2b18de

rev	line source
119 f9fb17fb64cc Add Sr frequency logging to disk and to Sr data logger Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 118 diff changeset	1 #include <tcpsupp.h>
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	2 #include <utility.h>
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	3 #include <ansi_c.h>
183 791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	4 #include <lowlvlio.h>
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	5 #include <cvirte.h>
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	6 #include <userint.h>
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	7 #include <formatio.h>
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	8 #include <inifile.h>
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	9 #include <string.h>
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	10
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	11 #include "FXAnalyse.h"
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	12 #include "Plot.h"
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	13 #include "Allan.h"
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	14 #include "DDS4xAD9912.h"
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	15 #include "DDS_Fox.h"
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	16 #include "muParserDLL.h"
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	17 #include "utils.h"
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	18 #include "stat.h"
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	19 #include "future.h"
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	20 #include "data-provider.h"
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	21 #include "sr-data-logger.h"
97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	22 #include "config.h"
97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	23 #include "logging.h"
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	24
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	25
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	26 #define FREP_STEP_SIZE 50000.0
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	27 #define SPEED_OF_LIGHT 299792458.0 // m/s
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	28 #define SR_WAVELENGTH 698.4460 // nm
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	29 #define HG_WAVELENGTH 1062.4000 // nm
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	30
170 a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	31 // select which data provider to use
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	32 #ifdef NDEBUG
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	33 #define DataProvider KKDataProvider
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	34 #else
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	35 #define DataProvider FakeDataProvider
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	36 #endif
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	37
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	38
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	39 // data acquisition status
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	40 int acquiring;
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	41 // data queue
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	42 CmtTSQHandle dataQueue;
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	43 // data provider thread
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	44 CmtThreadFunctionID dataProviderThread;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	45
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	46
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	47 struct event event;
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	48 double utc;
37 5e81800fe354 Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 35 diff changeset	49 double Ch1, Ch2, Ch3, Ch4;
5e81800fe354 Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 35 diff changeset	50 double Math1, Math2, Math3, Math4, Math5;
135 77539f2597b1 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 134 diff changeset	51 double N1, N2, N3;
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	52 double Ndiv = 8.0;
fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	53 double Sign1 = 1.0, Sign2 = 1.0, Sign3 = 0.0;
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	54 void MathParser1, MathParser2, MathParser3, MathParser4, *MathParser5;
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	55
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	56
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	57 // panels
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	58 static int MainPanel;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	59 static int CalcNPanel;
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	60 static int EstimateNPanel;
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	61
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	62
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	63 struct adev {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	64 Allan_Data allan;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	65 double *data;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	66 const char *title;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	67 double normalization;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	68 int control;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	69 };
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	70
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	71
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	72 #define ADEV(__channel, __normalization) \
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	73 { \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	74 .data = & ## __channel, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	75 .title = #__channel, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	76 .normalization = __normalization, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	77 .control = PANEL_ADEV_ ## __channel \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	78 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	79
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	80
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	81 static int adev_toggle(struct adev *adev)
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	82 {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	83 if (adev->allan.active)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	84 Allan_ClosePanel(&(adev->allan));
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	85 else
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	86 Allan_InitPanel(&(adev->allan), adev->title,
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	87 adev->normalization, MainPanel, adev->control);
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	88 return adev->allan.active;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	89 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	90
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	91
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	92 static inline void adev_update(struct adev *adev)
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	93 {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	94 if (adev->allan.active)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	95 Allan_AddFrequency(&(adev->allan), *(adev->data));
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	96 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	97
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	98
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	99 struct adev adevs[] = {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	100 ADEV(Ch1, 1.84e12),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	101 ADEV(Ch2, 10.0e3),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	102 ADEV(Ch3, 429.228e12),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	103 ADEV(Ch4, 275.0e3),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	104 ADEV(Math1, 250.0e6),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	105 ADEV(Math2, 194.395e12),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	106 ADEV(Math3, 282.143e12),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	107 ADEV(Math4, 429.228e12),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	108 ADEV(Math5, 1.0),
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	109 { NULL }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	110 };
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	111
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	112
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	113 struct plot {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	114 Plot_Data plot;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	115 double *data;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	116 const char *title;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	117 double min;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	118 double max;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	119 int control;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	120 };
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	121
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	122
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	123 #define PLOT(__channel, __min, __max) \
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	124 { \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	125 .data = & ## __channel, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	126 .title = #__channel, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	127 .min = __min, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	128 .max = __max, \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	129 .control = PANEL_PLOT_ ## __channel \
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	130 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	131
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	132
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	133 static int plot_toggle(struct plot *plot)
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	134 {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	135 if (plot->plot.active)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	136 Plot_ClosePanel(&(plot->plot));
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	137 else
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	138 Plot_InitPanel(&(plot->plot), plot->title,
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	139 plot->min, plot->max, MainPanel, plot->control);
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	140 return plot->plot.active;
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	141 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	142
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	143
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	144 static inline void plot_update(struct plot *plot)
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	145 {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	146 if (plot->plot.active)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	147 Plot_AddFrequency(&(plot->plot), *(plot->data));
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	148 }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	149
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	150 struct plot plots[] = {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	151 PLOT(Ch1, 54.999e6, 55.001e6),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	152 PLOT(Ch2, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	153 PLOT(Ch3, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	154 PLOT(Ch4, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	155 PLOT(Math1, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	156 PLOT(Math2, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	157 PLOT(Math3, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	158 PLOT(Math4, 0.0, 0.0),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	159 PLOT(Math5, 0.0, 0.0),
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	160 { NULL }
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	161 };
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	162
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	163
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	164 // dedrift DDS
29 585c60175bd5 Cleanup AD9956 DDS parameters setting code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 28 diff changeset	165 DDSParameter DDS1xAD9956;
585c60175bd5 Cleanup AD9956 DDS parameters setting code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 28 diff changeset	166 // 4xAD9912 DDS box
585c60175bd5 Cleanup AD9956 DDS parameters setting code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 28 diff changeset	167 DDS4xAD9912_Data DDS4xAD9912;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	168
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	169
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	170 enum {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	171 LO = 1,
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	172 HG = 2,
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	173 SR = 4,
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	174 };
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	175
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	176 enum {
26 4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	177 N_MEASUREMENT_NONE,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	178 N_MEASUREMENT_INIT,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	179 N_MEASUREMENT_SLOPE,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	180 N_MEASUREMENT_ADJUST_FREQ_PLUS,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	181 N_MEASUREMENT_FREP_PLUS,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	182 N_MEASUREMENT_ADJUST_FREQ_MINUS,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	183 N_MEASUREMENT_FREP_MINUS,
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	184 };
4bb197635664 Cleanup N1 measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 25 diff changeset	185
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	186 int Measuring_1 = N_MEASUREMENT_NONE;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	187 int Measuring_2 = N_MEASUREMENT_NONE;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	188 int Measuring_3 = N_MEASUREMENT_NONE;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	189
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	190 int nobs = 0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	191 int settling = 0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	192
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	193 double f0_DDS1 = 110000000.0, f0_DDS2, f0_DDS3, df_DDS3;
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	194
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	195 double SlopeTime1=40.0, DeltaT_1=20.0, delta_f_lock_1=500.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	196 double SlopeTime2=40.0, DeltaT_2=20.0, delta_f_lock_2=500.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	197 double SlopeTime3=40.0, DeltaT_3=20.0, delta_f_lock_3=500.0;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	198
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	199 double t1, t2, t3;
156 4ab8099a18e2 Add beatnote frequency drift correction to N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 155 diff changeset	200 double f_rep_slope, f_beat_slope;
115 23f8b7b2b63a Use DDS1 to change frep in the measurement of N3. Improve some variable names Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 114 diff changeset	201 double f_rep_plus, f_rep_minus;
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	202 double f_beat_plus, f_beat_minus;
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	203 double N_measured;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	204
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	205 double Frequencystep1=10000.0, tbegin1=0.0, Frepbefore1=0.0, Frequency1=0.0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	206 double Frequencystep2=10.0, tbegin2=0.0, Frepbefore2=0.0, Ch2before=0.0, Frequency2=0.0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	207 double Frequencystep3=100000.0, tbegin3=0.0, Frepbefore3=0.0, Frequency3=0.0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	208
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	209 int Getsign1=FALSE,Getsign2=FALSE,Getsign3=FALSE;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	210
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	211 struct stat stat_math1, stat_ch2, stat_ch3, freq;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	212 struct rollmean rollmean_ch1, rollmean_ch2, rollmean_ch3, rollmean_ch4;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	213
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	214
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	215 // dedrift
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	216 enum {
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	217 DEDRIFT_REFERENCE_MICROWAVE = 0,
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	218 DEDRIFT_REFERENCE_HG = 1,
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	219 };
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	220
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	221 struct dedrift {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	222 int enabled; // dedrift enabled
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	223 int reference; // reference frequency
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	224 int invert; // invert applied slope sign
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	225 int doubleslope; // double applied slope
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	226 int keep_freq; // keep current frequency value when dedrift is disabled
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	227 int keep_slope; // keep current slope value when dedrift is disabled
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	228 double freq0; // DDS center frequency
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	229 double threshold; // maximum allowed frequency change
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	230 double applied; // currently applied slope
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	231 double interval; // measurement duration
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	232 double t0; // beginning of currrent measurement interval
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	233 };
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	234
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	235 struct dedrift dedrift = {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	236 .enabled = FALSE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	237 .reference = DEDRIFT_REFERENCE_MICROWAVE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	238 .invert = FALSE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	239 .doubleslope = FALSE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	240 .keep_freq = TRUE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	241 .keep_slope = TRUE,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	242 .freq0 = 70e6,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	243 .threshold = 100.0,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	244 .applied = 0.0,
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	245 .interval = 30.0,
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	246 .t0 = 0.0
2 bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	247 };
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	248
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	249
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	250 // recenter
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	251 struct recenter {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	252 int enabled; // recenter enabled
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	253 int lo; // recenter microwave beatnote
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	254 int sr; // recenter Sr beatnote
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	255 int hg; // recenter Hg beatnote
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	256 double interval; // interval
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	257 double t0; // beginning of current interval
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	258 };
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	259
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	260 struct recenter recenter = {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	261 .enabled = FALSE,
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	262 .lo = FALSE,
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	263 .sr = FALSE,
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	264 .hg = FALSE,
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	265 .interval = 1800.0,
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	266 .t0 = 0.0
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	267 };
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	268
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	269
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	270 // data loggging
170 a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	271 static char *datafolder;
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	272
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	273 struct datafile {
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	274 char *name;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	275 double *data;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	276 int nchan;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	277 int control;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	278 int write;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	279 };
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	280
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	281 #define DATAFILE(__name, __data, __nchan, __control, __write) \
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	282 { \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	283 .name = __name, \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	284 .data = __data, \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	285 .nchan = __nchan, \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	286 .control = __control, \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	287 .write = __write \
4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	288 }
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	289
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	290 struct datafile datafiles[] = {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	291 DATAFILE("Raw", event.data, 4, PANEL_SAVE_RAW, TRUE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	292 DATAFILE("DDS", DDS4xAD9912.frequency, 4, PANEL_SAVE_DDS, FALSE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	293 DATAFILE("Lo", &Math2, 1, PANEL_SAVE_LO, FALSE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	294 DATAFILE("Hg", &Math3, 1, PANEL_SAVE_HG, FALSE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	295 DATAFILE("Sr", &Math4, 1, PANEL_SAVE_SR, FALSE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	296 DATAFILE("Ex", &Math5, 1, PANEL_SAVE_EXTRA, FALSE),
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	297 { NULL, }
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	298 };
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	299
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	300
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	301 static void write_data(const char folder, const char name, const char *id,
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	302 const char timestr, double utc, double v, int nchan)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	303 {
183 791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	304 int i, fd, len;
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	305 char line[1024];
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	306 char filename[FILENAME_MAX];
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	307
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	308 // construct filename in the form folder\\id-name.txt
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	309 snprintf(filename, sizeof(filename), "%s\\%s-%s.txt", folder, id, name);
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	310
183 791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	311 fd = open(filename, O_CREAT\|O_WRONLY\|O_APPEND);
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	312 if (fd < 0) {
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	313 logmessage(ERROR, "open data file %s: %s", filename, strerror(errno));
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	314 return;
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	315 }
183 791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	316
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	317 // timestamp
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	318 len = snprintf(line, sizeof(line), "%s\t%.3f", timestr, utc);
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	319
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	320 // data channels
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	321 for (i = 0; i < nchan; i++)
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	322 len += snprintf(line + len, sizeof(line) - len, "\t%.3f", v[i]);
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	323
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	324 // newline
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	325 line[len++] = '\r';
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	326 line[len++] = '\n';
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	327
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	328 // write to file
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	329 write(fd, line, len);
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	330
791ca26fee6a Rewrite data writing to file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 180 diff changeset	331 close(fd);
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	332 }
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	333
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	334
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	335 static inline void datafile_append(struct datafile d, char id, char *timestr)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	336 {
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	337 if (d->write)
170 a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	338 write_data(datafolder, d->name, id, timestr, utc, d->data, d->nchan);
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	339 }
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	340
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	341
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	342 static struct datalogger datalogger;
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	343
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	344
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	345 void * muParserNew()
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	346 {
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	347 void *parser = mupCreate();
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	348
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	349 mupDefineOprtChars(parser, "abcdefghijklmnopqrstuvwxyz�"
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	350 "ABCDEFGHIJKLMNOPQRSTUVWXYZ"
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	351 "+-*^/?<>=#!$%&\|~'_");
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	352
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	353 mupDefineVar(parser, "Ch1", &Ch1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	354 mupDefineVar(parser, "Ch2", &Ch2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	355 mupDefineVar(parser, "Ch3", &Ch3);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	356 mupDefineVar(parser, "Ch4", &Ch4);
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	357 mupDefineVar(parser, "DDS1", &(DDS4xAD9912.frequency[0]));
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	358 mupDefineVar(parser, "DDS2", &(DDS4xAD9912.frequency[1]));
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	359 mupDefineVar(parser, "DDS3", &(DDS4xAD9912.frequency[2]));
fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	360 mupDefineVar(parser, "DDS4", &(DDS4xAD9912.frequency[3]));
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	361 mupDefineVar(parser, "N1", &N1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	362 mupDefineVar(parser, "N2", &N2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	363 mupDefineVar(parser, "N3", &N3);
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	364 mupDefineVar(parser, "Sign1", &Sign1);
37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	365 mupDefineVar(parser, "Sign2", &Sign2);
37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	366 mupDefineVar(parser, "Sign3", &Sign3);
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	367 mupDefineVar(parser, "Ndiv", &Ndiv);
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	368
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	369 mupDefinePostfixOprt(parser, "P", &Peta, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	370 mupDefinePostfixOprt(parser, "T", &Tera, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	371 mupDefinePostfixOprt(parser, "G", &Giga, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	372 mupDefinePostfixOprt(parser, "M", &Mega, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	373 mupDefinePostfixOprt(parser, "k", &kilo, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	374 mupDefinePostfixOprt(parser, "m", &milli, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	375 mupDefinePostfixOprt(parser, "u", &micro, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	376 mupDefinePostfixOprt(parser, "�", &micro, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	377 mupDefinePostfixOprt(parser, "n", &nano, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	378 mupDefinePostfixOprt(parser, "p", &pico, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	379 mupDefinePostfixOprt(parser, "f", &femto, 1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	380
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	381 return parser;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	382 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	383
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	384
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	385 void CVICALLBACK DataAvailableCB (CmtTSQHandle queueHandle, unsigned int event,
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	386 int value, void *callbackData);
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	387
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	388
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	389 int main (int argc, char *argv[])
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	390 {
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	391 int rv;
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	392 double frequency;
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	393 char expr[1024];
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	394 char host[256];
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	395 int port;
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	396 double clock;
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	397
fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	398 if ((MainPanel = LoadPanel (0, "FXAnalyse.uir", PANEL)) < 0)
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	399 return -1;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	400 if ((CalcNPanel = LoadPanel (MainPanel, "FXAnalyse.uir", CALCN)) < 0)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	401 return -1;
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	402 if ((EstimateNPanel = LoadPanel (MainPanel, "FXAnalyse.uir", ESTIMATEN)) < 0)
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	403 return -1;
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	404
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	405 // logging
97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	406 logger_init();
97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	407
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	408 // load configuration file
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	409 char path[MAX_PATHNAME_LEN];
97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	410 GetIniFilePath(path);
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	411 IniText configuration = Ini_New(TRUE);
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	412 Ini_ReadFromFile(configuration, path);
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	413
170 a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	414 // data folder
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	415 rv = Ini_GetStringCopy(configuration, "data", "folder", &datafolder);
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	416 if (rv > 0) {
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	417 logmessage(INFO, "writing data files in %s", datafolder);
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	418 } else {
170 a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	419 logmessage(ERROR, "data folder not configured in %s", path);
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	420 // do not allow to start the acquisition
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	421 SetCtrlAttribute(MainPanel, PANEL_STARTBUTTON, ATTR_DIMMED, TRUE);
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	422 }
a4fcebb5941b Make data folder configurable in configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 169 diff changeset	423
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	424 // AD9956 configuration parameters
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	425 rv = Ini_GetStringIntoBuffer(configuration, "AD9956", "host", host, sizeof(host));
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	426 if (! rv)
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	427 return -1;
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	428 rv = Ini_GetInt(configuration, "AD9956", "port", &port);
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	429 if (! rv)
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	430 return -1;
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	431 rv = Ini_GetDouble(configuration, "AD9956", "clock", &clock);
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	432 if (! rv)
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	433 return -1;
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	434
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	435 // dedrift DDS
164 211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	436 DDSFox_Initialize(&DDS1xAD9956, host, port, dedrift.freq0);
211ea3950310 Read AD9956 configuration from configuration file Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 162 diff changeset	437
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	438 // AD9912 configuration parameters
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	439 rv = Ini_GetStringIntoBuffer(configuration, "AD9912", "host", host, sizeof(host));
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	440 if (! rv)
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	441 return -1;
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	442 rv = Ini_GetDouble(configuration, "AD9912", "clock", &clock);
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	443 if (! rv)
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	444 return -1;
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	445
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	446 // initialize 4x AD9912 DDS box
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	447 DDS4xAD9912_Init(&DDS4xAD9912, host, clock);
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	448 DDS4xAD9912_Reset(&DDS4xAD9912);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	449 GetCtrlVal(MainPanel, PANEL_DDS1, &frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	450 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	451 GetCtrlVal(MainPanel, PANEL_DDS2, &frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	452 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	453 GetCtrlVal(MainPanel, PANEL_DDS3, &frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	454 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	455 GetCtrlVal(MainPanel, PANEL_DDS4, &frequency);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	456 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, frequency);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	457
174 d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	458 // dispose configuration
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	459 Ini_Dispose(configuration);
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	460
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	461 // Sr data logger
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	462 sr_datalogger_init(&datalogger);
d96f0b04f7fe Make DDS addres configurable in configuration file. Modernize AD9912 driver. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 170 diff changeset	463
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	464 GetCtrlVal(MainPanel, PANEL_N1CHOICE, &N1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	465 GetCtrlVal(MainPanel, PANEL_N2CHOICE, &N2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	466 GetCtrlVal(MainPanel, PANEL_N3CHOICE, &N3);
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	467
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	468 MathParser1 = muParserNew();
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	469 GetCtrlVal(MainPanel, PANEL_MATHSTRING1, expr);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	470 mupSetExpr(MathParser1, expr);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	471
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	472 MathParser2 = muParserNew();
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	473 mupDefineVar(MathParser2, "Math1", &Math1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	474 GetCtrlVal(MainPanel, PANEL_MATHSTRING2, expr);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	475 mupSetExpr(MathParser2, expr);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	476
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	477 MathParser3 = muParserNew();
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	478 mupDefineVar(MathParser3, "Math1", &Math1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	479 mupDefineVar(MathParser3, "Math2", &Math2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	480 GetCtrlVal(MainPanel, PANEL_MATHSTRING3, expr);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	481 mupSetExpr(MathParser3, expr);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	482
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	483 MathParser4 = muParserNew();
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	484 mupDefineVar(MathParser4, "Math1", &Math1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	485 mupDefineVar(MathParser4, "Math2", &Math2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	486 mupDefineVar(MathParser4, "Math3", &Math3);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	487 GetCtrlVal(MainPanel, PANEL_MATHSTRING4, expr);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	488 mupSetExpr(MathParser4, expr);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	489
168 4de7f2c9f328 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 166 diff changeset	490 MathParser5 = muParserNew();
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	491 mupDefineVar(MathParser5, "Math1", &Math1);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	492 mupDefineVar(MathParser5, "Math2", &Math2);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	493 mupDefineVar(MathParser5, "Math3", &Math3);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	494 mupDefineVar(MathParser5, "Math4", &Math4);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	495 GetCtrlVal(MainPanel, PANEL_MATHSTRING5, expr);
30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	496 mupSetExpr(MathParser5, expr);
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	497
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	498 // data queue
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	499 CmtNewTSQ(128, sizeof(struct event), 0, &dataQueue);
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	500
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	501 // register callback to execute when data will be in the data queue
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	502 CmtInstallTSQCallback(dataQueue, EVENT_TSQ_ITEMS_IN_QUEUE, 1,
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	503 DataAvailableCB, NULL, CmtGetCurrentThreadID(), NULL);
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	504
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	505 DisplayPanel(MainPanel);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	506
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	507 RunUserInterface();
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	508
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	509 DiscardPanel(MainPanel);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	510 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	511 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	512
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	513 int CVICALLBACK QuitCallback (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	514 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	515 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	516 switch (event)
40 50544ecfcfc7 Handle application quit just once Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 39 diff changeset	517 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	518 case EVENT_COMMIT:
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	519 QuitUserInterface(0);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	520 break;
40 50544ecfcfc7 Handle application quit just once Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 39 diff changeset	521 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	522 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	523 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	524
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	525 int CVICALLBACK CB_OnEventMain(int panel, int event,
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	526 void *callbackData, int eventData1, int eventData2)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	527 {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	528 int control, index;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	529 double step;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	530
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	531 #define do_arrow(__DDS, __STEP) \
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	532 do { \
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	533 GetCtrlIndex(panel, __STEP, &index); \
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	534 if ((eventData1 == VAL_RIGHT_ARROW_VKEY) && (index < 14)) \
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	535 SetCtrlIndex(panel, __STEP, index + 1); \
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	536 if ((eventData1 == VAL_LEFT_ARROW_VKEY) && (index > 0)) \
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	537 SetCtrlIndex(panel, __STEP, index - 1); \
fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	538 GetCtrlVal(panel, __STEP, &step); \
fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	539 SetCtrlAttribute(panel, __DDS, ATTR_INCR_VALUE, step); \
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	540 } while (0)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	541
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	542 switch (event) {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	543 case EVENT_KEYPRESS:
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	544 /* key code */
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	545 switch (eventData1) {
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	546 case VAL_RIGHT_ARROW_VKEY:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	547 case VAL_LEFT_ARROW_VKEY:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	548 control = GetActiveCtrl(panel);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	549 switch (control) {
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	550 case PANEL_DDS1:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	551 case PANEL_DDS1STEP:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	552 do_arrow(PANEL_DDS1, PANEL_DDS1STEP);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	553 break;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	554 case PANEL_DDS2:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	555 case PANEL_DDS2STEP:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	556 do_arrow(PANEL_DDS2, PANEL_DDS2STEP);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	557 break;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	558 case PANEL_DDS3:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	559 case PANEL_DDS3STEP:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	560 do_arrow(PANEL_DDS3, PANEL_DDS3STEP);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	561 break;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	562 case PANEL_DDS4:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	563 case PANEL_DDS4STEP:
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	564 do_arrow(PANEL_DDS4, PANEL_DDS4STEP);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	565 break;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	566 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	567 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	568 case VAL_F2_VKEY :
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	569 SetActiveCtrl(panel, PANEL_DDS1);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	570 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	571 case VAL_F3_VKEY :
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	572 SetActiveCtrl(panel, PANEL_DDS2);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	573 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	574 case VAL_F4_VKEY :
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	575 SetActiveCtrl(panel, PANEL_DDS3);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	576 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	577 case VAL_F5_VKEY :
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	578 SetActiveCtrl(panel, PANEL_DDS4);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	579 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	580 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	581 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	582 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	583 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	584 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	585
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	586 int CVICALLBACK CB_OnStart (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	587 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	588 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	589 switch (event)
20 3a7f088d4960 Get rid of unused variables. Some minor coding style improvements Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 17 diff changeset	590 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	591 case EVENT_COMMIT:
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	592 if (acquiring)
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	593 break;
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	594
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	595 logmsg("start");
105 29b1aa89a34c Disable the Start button when data acquisition thread is running Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 97 diff changeset	596 SetCtrlAttribute(panel, PANEL_STARTBUTTON, ATTR_DIMMED, TRUE);
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	597 acquiring = 1;
82 47860259afe2 Implement logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 80 diff changeset	598
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	599 // start data provider thread
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	600 CmtScheduleThreadPoolFunctionAdv(
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	601 DEFAULT_THREAD_POOL_HANDLE, DataProvider, NULL,
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	602 THREAD_PRIORITY_HIGHEST, NULL, 0, NULL, 0, &dataProviderThread);
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	603
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	604 break;
82 47860259afe2 Implement logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 80 diff changeset	605 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	606 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	607 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	608
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	609 int CVICALLBACK CB_OnStop (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	610 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	611 {
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	612 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	613 case EVENT_COMMIT:
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	614 if (! acquiring)
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	615 break;
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	616
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	617 logmsg("stop");
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	618 acquiring = 0;
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	619
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	620 // wait for data provider thread to terminate
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	621 CmtWaitForThreadPoolFunctionCompletion(
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	622 DEFAULT_THREAD_POOL_HANDLE, dataProviderThread,
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	623 OPT_TP_PROCESS_EVENTS_WHILE_WAITING);
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	624 CmtReleaseThreadPoolFunctionID(
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	625 DEFAULT_THREAD_POOL_HANDLE, dataProviderThread);
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	626
105 29b1aa89a34c Disable the Start button when data acquisition thread is running Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 97 diff changeset	627 SetCtrlAttribute(panel, PANEL_STARTBUTTON, ATTR_DIMMED, FALSE);
29b1aa89a34c Disable the Start button when data acquisition thread is running Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 97 diff changeset	628
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	629 break;
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	630 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	631 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	632 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	633
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	634 void CVICALLBACK DataAvailableCB (CmtTSQHandle queueHandle, unsigned int ev,
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	635 int value, void *callbackData)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	636 {
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	637 int read;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	638
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	639 switch (ev) {
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	640 case EVENT_TSQ_ITEMS_IN_QUEUE:
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	641 // read data from the data queue
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	642 while (value > 0) {
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	643
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	644 read = CmtReadTSQData(queueHandle, &event, 1, TSQ_INFINITE_TIMEOUT, 0);
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	645 if (read != 1)
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	646 logmsg("Error!");
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	647 value = value - read;
9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	648
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	649 utc = event.time.tv_sec + event.time.tv_usec * 1e-6;
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	650 Ch1 = event.data[0];
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	651 Ch2 = event.data[1];
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	652 Ch3 = event.data[2];
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	653 Ch4 = event.data[3];
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	654
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	655 // update display
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	656 SetCtrlVal(MainPanel, PANEL_UTC, utc);
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	657 SetCtrlVal(MainPanel, PANEL_CH1, Ch1);
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	658 SetCtrlVal(MainPanel, PANEL_CH2, Ch2);
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	659 SetCtrlVal(MainPanel, PANEL_CH3, Ch3);
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	660 SetCtrlVal(MainPanel, PANEL_CH4, Ch4);
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	661
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	662 // compute
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	663 Math1 = mupEval(MathParser1);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	664 Math2 = mupEval(MathParser2);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	665 Math3 = mupEval(MathParser3);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	666 Math4 = mupEval(MathParser4);
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	667 Math5 = mupEval(MathParser5);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	668
124 bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	669 // update display. numeric controllers do not format values
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	670 // with a thousands separator: use string controllers and a
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	671 // custom formatting function
bdfc61a8ebee Add thousands separator to important numeric displays Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 123 diff changeset	672 char buffer[256];
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	673 SetCtrlVal(MainPanel, PANEL_MATH1, thousands(buffer, sizeof(buffer), "%.6f", Math1));
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	674 SetCtrlVal(MainPanel, PANEL_MATH2, thousands(buffer, sizeof(buffer), "%.3f", Math2));
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	675 SetCtrlVal(MainPanel, PANEL_MATH3, thousands(buffer, sizeof(buffer), "%.3f", Math3));
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	676 SetCtrlVal(MainPanel, PANEL_MATH4, thousands(buffer, sizeof(buffer), "%.3f", Math4));
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	677 SetCtrlVal(MainPanel, PANEL_MATH5, thousands(buffer, sizeof(buffer), "%.3f", Math5));
166 fdd2f8fd7714 Minor cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 164 diff changeset	678
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	679 // update timeseries plots
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	680 for (struct plot *plot = plots; plot->data; plot++)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	681 plot_update(plot);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	682
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	683 // update allan deviation plots
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	684 for (struct adev *adev = adevs; adev->data; adev++)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	685 adev_update(adev);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	686
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	687 // N measurement
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	688
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	689 switch (Measuring_1) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	690
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	691 case N_MEASUREMENT_NONE:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	692 // not measuring
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	693 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	694
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	695 case N_MEASUREMENT_INIT:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	696 // initialization step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	697
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	698 // set DDS1 to nominal frequency
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	699 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, f0_DDS1);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	700 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	701
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	702 // record current DDS frequencies
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	703 f0_DDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	704
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	705 t1 = utc;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	706 t2 = t3 = 0.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	707 nobs = 0;
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	708 stat_zero(&stat_math1);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	709 f_rep_plus = f_rep_minus = 0.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	710
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	711 // next step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	712 Measuring_1 += 1;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	713 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	714
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	715 case N_MEASUREMENT_SLOPE:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	716 // slope measurement
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	717
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	718 stat_accumulate(&stat_math1, Math1);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	719
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	720 if ((utc - t1) > SlopeTime1) {
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	721 f_rep_slope = stat_math1.slope;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	722
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	723 // frep positive step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	724 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1 + delta_f_lock_1, FREP_STEP_SIZE);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	725 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	726
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	727 // allow counter to settle
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	728 settling = 3;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	729
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	730 // next step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	731 Measuring_1 += 1;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	732 }
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	733 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	734
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	735 case N_MEASUREMENT_ADJUST_FREQ_PLUS:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	736 case N_MEASUREMENT_ADJUST_FREQ_MINUS:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	737 // adjust DDS frequency to keep beatnote within the bandpass filter
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	738
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	739 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	740 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	741
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	742 double fDDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	743 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, fDDS2 + 275000 - Ch4);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	744 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	745
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	746 // allow counter to settle
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	747 settling = 3;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	748
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	749 // next step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	750 Measuring_1 += 1;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	751 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	752
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	753 case N_MEASUREMENT_FREP_PLUS:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	754 // frep positive step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	755
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	756 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	757 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	758
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	759 if (t2 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	760 t2 = utc;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	761
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	762 f_rep_plus += Math1 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	763 nobs += 1;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	764
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	765 if ((utc - t2) > DeltaT_1) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	766 f_rep_plus = f_rep_plus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	767 nobs = 0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	768
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	769 // frep negative step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	770 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1 - delta_f_lock_1, FREP_STEP_SIZE);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	771 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	772
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	773 // allow counter to settle
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	774 settling = 3;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	775
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	776 // next step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	777 Measuring_1 += 1;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	778 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	779 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	780
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	781 case N_MEASUREMENT_FREP_MINUS:
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	782 // frep negative step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	783
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	784 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	785 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	786
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	787 if (t3 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	788 t3 = utc;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	789
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	790 f_rep_minus += Math1 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	791 nobs += 1;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	792
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	793 if ((utc - t3) > DeltaT_1) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	794 f_rep_minus = f_rep_minus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	795 nobs = 0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	796
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	797 // compute N1
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	798 double delta_f_rep = f_rep_minus - f_rep_plus;
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	799 N_measured = Sign1 * 2 * Ndiv * delta_f_lock_1 / delta_f_rep;
1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	800 SetCtrlVal(CalcNPanel, CALCN_N, N_measured);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	801
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	802 // back to nominal frep
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	803 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	804 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	805 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	806 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	807
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	808 // done
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	809 Measuring_1 = N_MEASUREMENT_NONE;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	810 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	811 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	812 }
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	813
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	814 switch (Measuring_2) {
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	815
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	816 case N_MEASUREMENT_NONE:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	817 // not measuring
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	818 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	819
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	820 case N_MEASUREMENT_INIT:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	821 // initialization step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	822
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	823 // set DDS1 to nominal frequency
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	824 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, f0_DDS1);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	825 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	826
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	827 // record current DDS frequencies
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	828 f0_DDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	829 f0_DDS3 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	830
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	831 t1 = utc;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	832 t2 = t3 = 0.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	833 nobs = 0;
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	834 stat_zero(&stat_math1);
1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	835 stat_zero(&stat_ch2);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	836 f_rep_plus = f_rep_minus = 0.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	837 f_beat_plus = f_beat_minus = 0.0;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	838
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	839 // next step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	840 Measuring_2 += 1;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	841 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	842
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	843 case N_MEASUREMENT_SLOPE:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	844 // slope measurement
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	845
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	846 stat_accumulate(&stat_math1, Math1);
1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	847 stat_accumulate(&stat_ch2, Ch2);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	848
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	849 if ((utc - t1) > SlopeTime2) {
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	850 f_rep_slope = stat_math1.slope;
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	851 f_beat_slope = stat_ch2.slope;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	852
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	853 // frep positive step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	854 double fDDS1 = f0_DDS1 + delta_f_lock_2;
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	855 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, fDDS1, FREP_STEP_SIZE);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	856 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
62 53dbce5f0745 Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 61 diff changeset	857
61 37075b60408b Fix N2 measurement after cleanup. Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 60 diff changeset	858 // adjust DDS3 to keep beatnote within the bandpass filter. prediction
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	859 double fDDS3 = f0_DDS3 + Sign1 * Sign2 * N2/N1 * Ndiv * delta_f_lock_2;
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	860 df_DDS3 = fDDS3 - DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
62 53dbce5f0745 Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 61 diff changeset	861 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, fDDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	862 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	863
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	864 // allow counter to settle
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	865 settling = 3;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	866
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	867 // next step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	868 Measuring_2 += 1;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	869 }
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	870 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	871
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	872 case N_MEASUREMENT_ADJUST_FREQ_PLUS:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	873 case N_MEASUREMENT_ADJUST_FREQ_MINUS:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	874 // adjust DDS frequency to keep beatnote within the bandpass filter
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	875
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	876 if (settling-- > 0)
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	877 break;
61 37075b60408b Fix N2 measurement after cleanup. Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 60 diff changeset	878
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	879 double fDDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2) + 275000 - Ch4;
61 37075b60408b Fix N2 measurement after cleanup. Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 60 diff changeset	880 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, fDDS2);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	881 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	882
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	883 double fDDS3 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3) + 10000 - Ch2;
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	884 df_DDS3 = df_DDS3 + 10000 - Ch2;
61 37075b60408b Fix N2 measurement after cleanup. Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 60 diff changeset	885 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, fDDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	886 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	887
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	888 // allow counter to settle
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	889 settling = 3;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	890
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	891 // next step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	892 Measuring_2 += 1;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	893 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	894
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	895 case N_MEASUREMENT_FREP_PLUS:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	896 // frep positive step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	897
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	898 if (settling-- > 0)
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	899 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	900
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	901 if (t2 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	902 t2 = utc;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	903
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	904 f_rep_plus += Math1 + 250000000 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	905 f_beat_plus += Ch2 - f_beat_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	906 nobs += 1;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	907
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	908 if ((utc - t2) > DeltaT_2) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	909 f_rep_plus = f_rep_plus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	910 f_beat_plus = f_beat_plus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	911 nobs = 0;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	912
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	913 // negative frequency step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	914 double fDDS1 = f0_DDS1 - delta_f_lock_2;
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	915 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, fDDS1, FREP_STEP_SIZE);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	916 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
62 53dbce5f0745 Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 61 diff changeset	917
53dbce5f0745 Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 61 diff changeset	918 // adjust DDS3 to keep beatnote within the bandpass filter. prediction
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	919 double fDDS3 = f0_DDS3 - Sign1 * Sign2 * N2/N1 * Ndiv * delta_f_lock_2;
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	920 df_DDS3 = fDDS3 - DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
61 37075b60408b Fix N2 measurement after cleanup. Further simplification Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 60 diff changeset	921 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, fDDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	922 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	923
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	924 // allow counter to settle
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	925 settling = 3;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	926
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	927 // next step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	928 Measuring_2 += 1;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	929 }
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	930 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	931
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	932 case N_MEASUREMENT_FREP_MINUS:
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	933 // frep negative step
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	934
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	935 if (settling-- > 0)
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	936 break;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	937
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	938 if (t3 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	939 t3 = utc;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	940
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	941 f_rep_minus += Math1 + 250000000 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	942 f_beat_minus += Ch2 + f_beat_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	943 nobs += 1;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	944
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	945 if ((utc -t3) > DeltaT_2) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	946 f_rep_minus = f_rep_minus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	947 f_beat_minus = f_beat_minus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	948 nobs = 0;
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	949
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	950 // compute N2
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	951 double delta_f_rep_m = f_rep_minus - f_rep_plus;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	952 double delta_f_rep = Sign1 * Ndiv * 2.0 * delta_f_lock_3 / N1;
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	953
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	954 logmsg("delta frep: measured=%e expected=%e difference=%e",
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	955 delta_f_rep_m, delta_f_rep, delta_f_rep_m - delta_f_rep);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	956
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	957 N_measured = -Sign2 * (df_DDS3 + f_beat_minus - f_beat_plus) / delta_f_rep;
1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	958 SetCtrlVal(CalcNPanel, CALCN_N, N_measured);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	959
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	960 // back to nominal frequency
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	961 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	962 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	963 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, f0_DDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	964 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	965 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	966 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
46 6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	967
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	968 // done
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	969 Measuring_2 = N_MEASUREMENT_NONE;
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	970 }
6503feae1809 Cleanup. Convert N2 measurement logic to state machine like structure Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 44 diff changeset	971 break;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	972 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	973
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	974 switch (Measuring_3) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	975
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	976 case N_MEASUREMENT_NONE:
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	977 // not measuring N3
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	978 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	979
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	980 case N_MEASUREMENT_INIT:
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	981 // init
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	982
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	983 // set DDS1 to nominal frequency
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	984 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, f0_DDS1);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	985 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	986
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	987 // record current DDS frequencies
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	988 f0_DDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	989 f0_DDS3 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	990
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	991 t1 = utc;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	992 t2 = t3 = 0.0;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	993 nobs = 0;
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	994 stat_zero(&stat_math1);
156 4ab8099a18e2 Add beatnote frequency drift correction to N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 155 diff changeset	995 stat_zero(&stat_ch3);
115 23f8b7b2b63a Use DDS1 to change frep in the measurement of N3. Improve some variable names Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 114 diff changeset	996 f_rep_plus = f_rep_minus = 0.0;
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	997 f_beat_plus = f_beat_minus = 0.0;
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	998
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	999 // next step
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1000 Measuring_3 += 1;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1001 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1002
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1003 case N_MEASUREMENT_SLOPE:
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1004 // slope measurement
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1005
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1006 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1007 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1008
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1009 stat_accumulate(&stat_math1, Math1);
156 4ab8099a18e2 Add beatnote frequency drift correction to N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 155 diff changeset	1010 stat_accumulate(&stat_ch3, Ch3);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1011
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1012 if (utc - t1 > SlopeTime3) {
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1013 // slope measurement
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1014 f_rep_slope = stat_math1.slope;
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1015 f_beat_slope = stat_ch3.slope;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1016
156 4ab8099a18e2 Add beatnote frequency drift correction to N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 155 diff changeset	1017 logmsg("f_rep_slope=%e Hz/s", f_rep_slope);
4ab8099a18e2 Add beatnote frequency drift correction to N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 155 diff changeset	1018 logmsg("f_beat_slope=%e Hz/s", f_rep_slope);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1019
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1020 // frep positive step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1021 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1 + delta_f_lock_3, FREP_STEP_SIZE);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1022 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1023
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1024 // adjust DDS3 to keep beatnote within the bandpass filter
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1025 double fDDS3 = f0_DDS3 + Sign1 * Sign3 * N3/N1 * Ndiv * delta_f_lock_3;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1026 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, fDDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1027 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1028
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1029 // allow counter to settle
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1030 settling = 3;
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1031
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1032 // next step
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1033 Measuring_3 += 1;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1034 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1035 break;
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1036
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1037 case N_MEASUREMENT_ADJUST_FREQ_PLUS:
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1038 case N_MEASUREMENT_ADJUST_FREQ_MINUS:
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1039 // adjust DDS frequency to keep beatnote within the bandpass filter
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1040
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1041 if (settling-- > 0)
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1042 break;
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1043
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1044 // adjust DDS frequency to keep 55 MHz tracker oscillator locked
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	1045 double fDDS2 = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2) + 275000 - Ch4;
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1046 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, fDDS2);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1047 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1048
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1049 // allow counter to settle
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1050 settling = 3;
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1051
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1052 // next step
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1053 Measuring_3 += 1;
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1054 break;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1055
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1056 case N_MEASUREMENT_FREP_PLUS:
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1057 // frep positive step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1058
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1059 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1060 break;
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1061
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1062 if (t2 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1063 t2 = utc;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1064
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1065 f_rep_plus += Math1 + 250000000 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1066 f_beat_plus += Ch3 - f_beat_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1067 nobs += 1;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1068
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1069 if (utc - t2 > DeltaT_3) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1070 f_rep_plus = f_rep_plus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1071 f_beat_plus = f_beat_plus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1072 nobs = 0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1073
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1074 // frep negative step
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1075 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1 - delta_f_lock_3, FREP_STEP_SIZE);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1076 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1077
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1078 // adjust DDS3 to keep beatnote within the bandpass filter
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1079 double fDDS3 = f0_DDS3 - Sign1 * Sign3 * N3/N1 * Ndiv * delta_f_lock_3;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1080 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, fDDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1081 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1082
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1083 // allow counter to settle
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1084 settling = 3;
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1085
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1086 // next step
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1087 Measuring_3 += 1;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1088 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1089 break;
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1090
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1091 case N_MEASUREMENT_FREP_MINUS:
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1092 // frep negative step
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1093
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1094 if (settling-- > 0)
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1095 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1096
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1097 if (t3 == 0.0)
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1098 t3 = utc;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1099
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1100 f_rep_minus += Math1 + 250000000 - f_rep_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1101 f_beat_minus += Ch3 - f_beat_slope * (utc - t2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1102 nobs += 1;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1103
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1104 if (utc - t3 > DeltaT_3) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1105 f_rep_minus = f_rep_minus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1106 f_beat_minus = f_beat_minus / nobs;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1107 nobs = 0;
111 8bdd7e38715f Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 109 diff changeset	1108
8bdd7e38715f Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 109 diff changeset	1109 // check delta frep
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1110 double delta_f_rep_m = f_rep_plus - f_rep_minus;
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1111 double delta_f_rep = Sign1 * Ndiv * 2.0 * delta_f_lock_3 / N1;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1112
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1113 logmsg("delta frep: measured=%e expected=%e difference=%e",
118 43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1114 delta_f_rep_m, delta_f_rep, delta_f_rep_m - delta_f_rep);
43b35f4aae78 Fix N3 measurement. Simply frequnecy ramping functions. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 117 diff changeset	1115
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1116 logmsg("f_beat_minus=%e", f_beat_minus);
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1117 logmsg("f_beat_plus =%e", f_beat_plus);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1118
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1119 // compute N3
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1120 double delta_f_beat = f_beat_plus - f_beat_minus + 2.0 * Sign1 * Sign3 * N3/N1 * Ndiv * delta_f_lock_3;
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1121 double delta_f_beat_expected = delta_f_rep * N3;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1122
6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1123 logmsg("delta fbeat: measured=%e expected=%e difference=%e",
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1124 delta_f_beat, delta_f_beat_expected, delta_f_beat - delta_f_beat_expected);
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1125
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1126 N_measured = delta_f_beat / delta_f_rep;
1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1127 SetCtrlVal(CalcNPanel, CALCN_N, N_measured);
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1128
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1129 logmsg("measured N3=%.3f", N_measured);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1130
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1131 // back to nominal frep
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1132 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1133 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1134 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, f0_DDS3);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1135 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1136 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1137 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
47 1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1138
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1139 // done
1d3cd8260cbb Uniform N3 measurement code to N1 and N2 Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 46 diff changeset	1140 Measuring_3 = N_MEASUREMENT_NONE;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1141 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1142 break;
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1143 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1144
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1145 // beatnote sign determination
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1146
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1147 if (Getsign1 == TRUE) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1148 if (utc > tbegin1+2) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1149 if (Math1 > Frepbefore1)
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1150 Sign1 = -1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1151 else
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1152 Sign1 = +1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1153 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency1);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1154 Getsign1 = FALSE;
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1155 SetCtrlVal(MainPanel, PANEL_SIGN1, Sign1);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1156 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1157 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1158 if (Getsign2 == TRUE) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1159 if (utc > tbegin2+2){
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1160 if (Math1 > Frepbefore2) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1161 if (Ch2 > Ch2before)
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1162 Sign2 = +1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1163 else
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1164 Sign2 = -1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1165 } else {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1166 if (Ch2 > Ch2before)
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1167 Sign2 = -1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1168 else
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1169 Sign2 = +1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1170 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1171 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency2);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1172 Getsign2 = FALSE;
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1173 SetCtrlVal(MainPanel, PANEL_SIGN2, Sign2);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1174 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1175 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1176 if (Getsign3 == TRUE) {
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1177 if (utc > tbegin3+2){
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1178 if (Ch3 > Frepbefore3)
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1179 Sign3 = -1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1180 else
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1181 Sign3 = +1.0;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1182 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, Frequency3);
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1183 Getsign3 = FALSE;
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1184 SetCtrlVal(MainPanel, PANEL_SIGN3, Sign3);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1185 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1186 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1187
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1188 // select reference
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1189 double f = 0.0;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1190 switch (dedrift.reference) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1191 case DEDRIFT_REFERENCE_MICROWAVE:
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1192 f = Math2;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1193 break;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1194 case DEDRIFT_REFERENCE_HG:
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1195 f = Ch2 * 1062.5 / 1542.2;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1196 break;
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1197 }
a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1198
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1199 // stop dedrift if the comb is not locked
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1200 if ((dedrift.enabled)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1201 & (dedrift.threshold != 0.0)
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1202 & (freq.previous != 0.0)
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1203 & (fabs(f - freq.previous) > dedrift.threshold)) {
56 6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1204
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1205 if (! dedrift.keep_slope) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1206 dedrift.applied = 0.0;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1207 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1208 SetCtrlVal(MainPanel, PANEL_SLOPE_APPLIED, dedrift.applied);
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1209 }
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1210 if (! dedrift.keep_freq) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1211 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, dedrift.applied);
56 6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1212 }
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1213
1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1214 stat_zero(&freq);
1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1215 SetCtrlVal(MainPanel, PANEL_SLOPE_MEASURED, freq.slope);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1216 dedrift.enabled = FALSE;
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1217 SetCtrlVal(MainPanel, PANEL_MEASURE_SLOPE, 0);
a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1218 }
a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1219
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1220 // dedrifting
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1221 if (dedrift.enabled)
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1222 {
56 6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1223 // update slope measurement
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1224 stat_accumulate(&freq, f);
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1225
60 cd7b5903f168 Display measured slope Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 59 diff changeset	1226 // update indicator
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1227 SetCtrlVal(MainPanel, PANEL_SLOPE_MEASURED, freq.slope);
56 6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1228
6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1229 // update applied slope
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1230 if ((utc - dedrift.t0) > dedrift.interval) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1231
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1232 if (dedrift.invert)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1233 dedrift.applied -= freq.slope;
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	1234 else
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1235 dedrift.applied += freq.slope;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1236
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1237 SetCtrlVal(MainPanel, PANEL_SLOPE_APPLIED, dedrift.applied);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1238
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1239 if (dedrift.doubleslope)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1240 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied * 2.0);
123 35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	1241 else
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1242 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1243
140 3f7eef731ccc Adjust log messages Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 139 diff changeset	1244 logmsg("dedrift update: adjustment=%+3e slope=%+3e", freq.slope, dedrift.applied);
82 47860259afe2 Implement logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 80 diff changeset	1245
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1246 stat_zero(&freq);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1247 dedrift.t0 = utc;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1248 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1249 }
2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1250
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1251 // recenter
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1252 if (recenter.enabled)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1253 {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1254 rollmean_accumulate(&rollmean_ch2, Ch2);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1255 rollmean_accumulate(&rollmean_ch3, Ch3);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1256 rollmean_accumulate(&rollmean_ch4, Ch4);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1257
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1258 if ((utc - recenter.t0) > recenter.interval) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1259
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	1260 if (recenter.lo) {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1261 // adjust DDS2 frequency to keep Ch4 reading at 275 kHz
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1262 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1263 double adj = 275000.0 - rollmean_ch4.mean;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1264 freq = freq + adj;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1265 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, freq);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1266 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
140 3f7eef731ccc Adjust log messages Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 139 diff changeset	1267 logmsg("recenter ch4 to 275 kHz: DDS2 adjustment=%+3e", adj);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1268 }
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1269
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	1270 if (recenter.hg) {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1271 // adjust DDS3 frequency to keep Ch2 reading at 10 kHz
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1272 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1273 double adj = 10000 - rollmean_ch2.mean;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1274 freq = freq + adj;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1275 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1276 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
140 3f7eef731ccc Adjust log messages Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 139 diff changeset	1277 logmsg("recenter Hg beatnote (ch2) to 10 kHz: DDS3 adjustment=%+3e", adj);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1278 }
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1279
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	1280 if (recenter.sr) {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1281 // adjust DDS3 frequency to keep Ch3 reading at 10 kHz
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1282 double freq = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1283 double adj = 10000 - rollmean_ch3.mean;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1284 freq = freq + adj;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1285 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, freq);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1286 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
151 df7ce04af51d Fix log message Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 150 diff changeset	1287 logmsg("recenter Sr beatnote (ch3) to 10 kHz: DDS3 adjustment=%+3e", adj);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1288 }
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1289
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1290 recenter.t0 = utc;
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1291 rollmean_zero(&rollmean_ch2);
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1292 rollmean_zero(&rollmean_ch3);
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1293 rollmean_zero(&rollmean_ch4);
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	1294 }
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1295 }
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1296
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1297 // local time
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1298 struct tm *ltime = localtime(&event.time.tv_sec);
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1299 // round to milliseconds
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1300 int msec = round(event.time.tv_usec / 1000.0);
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1301 while (msec >= 1000) {
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1302 ltime->tm_sec += 1;
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1303 msec -= 1000;
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1304 }
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1305 // format local time
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1306 char timestr[24];
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1307 int len = strftime(timestr, sizeof(timestr), "%d/%m/%Y %H:%M:%S", ltime);
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1308 snprintf(timestr + len, sizeof(timestr) - len, ".%03d", msec);
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1309 // display local time
4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1310 SetCtrlVal(MainPanel, PANEL_TIME, timestr);
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	1311
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1312 // run id derived from current local date in the form YYMMDD
76 5e0c314528bf Refactor data writing to disk. Implement dayly chunking to separate files Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 75 diff changeset	1313 char id[7];
91 4102fe614df2 Fix timestamping. Cleanup data providers Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 89 diff changeset	1314 strftime(id, sizeof(id), "%y%m%d", ltime);
88 9b7588cd4013 Move data acquisition into separate thread Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 87 diff changeset	1315
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	1316 // write datafiles
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	1317 for (struct datafile *d = datafiles; d->data; d++)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	1318 datafile_append(d, id, timestr);
119 f9fb17fb64cc Add Sr frequency logging to disk and to Sr data logger Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 118 diff changeset	1319
f9fb17fb64cc Add Sr frequency logging to disk and to Sr data logger Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 118 diff changeset	1320 // send Sr frequency (Math4) to Sr data logger
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	1321 sr_datalogger_send(&datalogger, utc, Math4);
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1322 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1323 break;
44 2e37910b28bc Simplify logic and reindent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 43 diff changeset	1324 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1325 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1326
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1327 int CVICALLBACK CB_OnFreqPlot (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1328 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1329 {
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1330 switch (event)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1331 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1332 case EVENT_COMMIT:
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1333 for (struct plot *plot = plots; plot->data; plot++) {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1334 if (plot->control == control)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1335 plot_toggle(plot);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1336 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1337 break;
52 30146cc6cd77 Cleanup. Remove some C abominations Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 51 diff changeset	1338 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1339 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1340 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1341
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1342 int CVICALLBACK CB_OnAllanPlot (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1343 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1344 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1345 switch (event)
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1346 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1347 case EVENT_COMMIT:
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1348 for (struct adev *adev = adevs; adev->data; adev++) {
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1349 if (adev->control == control)
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1350 adev_toggle(adev);
bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1351 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1352 break;
134 bd28161e5ac2 Major code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 133 diff changeset	1353 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1354 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1355 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1356
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1357 int CVICALLBACK CB_ChangeDDSOut (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1358 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1359 {
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1360 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1361 case EVENT_COMMIT:
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1362 double frequency;
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1363 GetCtrlVal(MainPanel, control, &frequency);
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1364 switch (control) {
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1365 case PANEL_DDS1:
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1366 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1367 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1368 break;
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1369 case PANEL_DDS2:
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1370 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1371 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1372 break;
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1373 case PANEL_DDS3:
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1374 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1375 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1376 break;
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1377 case PANEL_DDS4:
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1378 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1379 SetCtrlVal(MainPanel, PANEL_DDS4, DDS4xAD9912.frequency[3]);
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1380 break;
1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1381 }
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1382 break;
28 1e4ecf64b485 Remove references to unused DDSBes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 27 diff changeset	1383 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1384 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1385 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1386
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1387 int CVICALLBACK CB_ChangeDDSStep (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1388 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1389 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1390 switch (event)
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1391 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1392 case EVENT_COMMIT:
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1393 double step;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1394 GetCtrlVal(panel, control, &step);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1395 switch (control)
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1396 {
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1397 case PANEL_DDS1STEP:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1398 SetCtrlAttribute(panel, PANEL_DDS1, ATTR_INCR_VALUE, step);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1399 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1400 case PANEL_DDS2STEP:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1401 SetCtrlAttribute(panel, PANEL_DDS2, ATTR_INCR_VALUE, step);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1402 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1403 case PANEL_DDS3STEP:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1404 SetCtrlAttribute(panel, PANEL_DDS3, ATTR_INCR_VALUE, step);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1405 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1406 case PANEL_DDS4STEP:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1407 SetCtrlAttribute(panel, PANEL_DDS4, ATTR_INCR_VALUE, step);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1408 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1409 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1410 break;
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1411 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1412 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1413 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1414
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1415 int CVICALLBACK CB_ChangeMath (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1416 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1417 {
24 b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1418 int len;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1419 char *string;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1420
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1421 switch (event)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1422 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1423 case EVENT_COMMIT:
24 b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1424 GetCtrlAttribute(panel, control, ATTR_STRING_TEXT_LENGTH, &len);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1425 string = (char )malloc(sizeof(char) (len + 1));
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1426 GetCtrlVal(panel, control, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1427 switch (control) {
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1428 case PANEL_MATHSTRING1:
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1429 mupSetExpr(MathParser1, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1430 break;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1431 case PANEL_MATHSTRING2:
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1432 mupSetExpr(MathParser2, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1433 break;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1434 case PANEL_MATHSTRING3:
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1435 mupSetExpr(MathParser3, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1436 break;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1437 case PANEL_MATHSTRING4:
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1438 mupSetExpr(MathParser4, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1439 break;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1440 case PANEL_MATHSTRING5:
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1441 mupSetExpr(MathParser5, string);
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1442 break;
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1443 }
b838371c7a91 Code cleanup and dead code removal Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 23 diff changeset	1444 free(string);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1445 break;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1446 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1447 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1448 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1449
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1450 int CVICALLBACK CB_ChangeN (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1451 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1452 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1453 switch (event)
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1454 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1455 case EVENT_COMMIT:
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1456 switch (control)
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1457 {
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1458 case PANEL_N1CHOICE:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1459 GetCtrlVal(panel, control, &N1);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1460 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1461 case PANEL_N2CHOICE:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1462 GetCtrlVal(panel, control, &N2);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1463 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1464 case PANEL_N3CHOICE:
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1465 GetCtrlVal(panel, control, &N3);
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1466 break;
7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1467 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1468 break;
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1469 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1470 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1471 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1472
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1473 int CVICALLBACK CB_OnAcceptN (int panel, int control, int event,
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1474 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1475 {
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1476 int measure;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1477
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1478 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1479 case EVENT_COMMIT:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1480 GetPanelAttribute(panel, ATTR_CALLBACK_DATA, &measure);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1481 switch (measure) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1482 case LO:
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1483 N1 = round(N_measured);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1484 SetCtrlVal(MainPanel, PANEL_N1CHOICE, N1);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1485 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1486 case HG:
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1487 N2 = round(N_measured);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1488 SetCtrlVal(MainPanel, PANEL_N2CHOICE, N2);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1489 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1490 case SR:
162 1517a56163de Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 161 diff changeset	1491 N3 = round(N_measured);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1492 SetCtrlVal(MainPanel, PANEL_N3CHOICE, N3);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1493 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1494 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1495 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1496 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1497 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1498 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1499
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1500 int CVICALLBACK CB_OnNCalculus (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1501 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1502 {
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1503 int visible;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1504
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1505 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1506 case EVENT_COMMIT:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1507 switch (control) {
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1508 case PANEL_N1CALCULUS:
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1509 GetPanelAttribute(CalcNPanel, ATTR_VISIBLE, &visible);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1510 if (! visible) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1511 SetPanelAttribute(panel, ATTR_CALLBACK_DATA, LO);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1512 SetPanelAttribute(CalcNPanel, ATTR_TITLE, "Measure N_Lo");
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1513 SetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, DeltaT_1);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1514 SetCtrlVal(CalcNPanel, CALCN_SLOPETIME, SlopeTime1);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1515 SetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, delta_f_lock_1 / 1000.0);
132 fbd72d87b4dc Support graceful intrerruption of N3 measurement. Minor user interface fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 130 diff changeset	1516 SetCtrlVal(CalcNPanel, CALCN_N, 0.0);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1517 DisplayPanel(CalcNPanel);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1518 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1519 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1520 case PANEL_N2CALCULUS:
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1521 GetPanelAttribute(CalcNPanel, ATTR_VISIBLE, &visible);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1522 if (! visible) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1523 SetPanelAttribute(panel, ATTR_CALLBACK_DATA, HG);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1524 SetPanelAttribute(CalcNPanel, ATTR_TITLE, "Measure N_Hg");
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1525 SetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, DeltaT_2);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1526 SetCtrlVal(CalcNPanel, CALCN_SLOPETIME, SlopeTime2);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1527 SetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, delta_f_lock_2 / 1000.0);
132 fbd72d87b4dc Support graceful intrerruption of N3 measurement. Minor user interface fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 130 diff changeset	1528 SetCtrlVal(CalcNPanel, CALCN_N, 0.0);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1529 DisplayPanel(CalcNPanel);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1530 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1531 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1532 case PANEL_N3CALCULUS:
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1533 GetPanelAttribute(CalcNPanel, ATTR_VISIBLE, &visible);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1534 if (! visible) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1535 SetPanelAttribute(panel, ATTR_CALLBACK_DATA, SR);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1536 SetPanelAttribute(CalcNPanel, ATTR_TITLE, "Measure N_Sr");
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1537 SetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, DeltaT_3);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1538 SetCtrlVal(CalcNPanel, CALCN_SLOPETIME, SlopeTime3);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1539 SetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, delta_f_lock_3 / 1000.0);
132 fbd72d87b4dc Support graceful intrerruption of N3 measurement. Minor user interface fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 130 diff changeset	1540 SetCtrlVal(CalcNPanel, CALCN_N, 0.0);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1541 DisplayPanel(CalcNPanel);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1542 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1543 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1544 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1545 break;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1546 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1547 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1548 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1549
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1550 int CVICALLBACK CB_OnStartNCalculus (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1551 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1552 {
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1553 int measuring;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1554
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1555 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1556 case EVENT_COMMIT:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1557 GetPanelAttribute(panel, ATTR_CALLBACK_DATA, &measuring);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1558 switch (measuring) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1559 case LO:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1560 GetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, &DeltaT_1);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1561 GetCtrlVal(CalcNPanel, CALCN_SLOPETIME, &SlopeTime1);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1562 GetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, &delta_f_lock_1);
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1563 // convert from kHz to Hz
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1564 delta_f_lock_1 = delta_f_lock_1 * 1000.0;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1565 Measuring_1 = TRUE;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1566 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1567 case HG:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1568 GetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, &DeltaT_2);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1569 GetCtrlVal(CalcNPanel, CALCN_SLOPETIME, &SlopeTime2);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1570 GetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, &delta_f_lock_2);
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1571 // convert from kHz to Hz
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1572 delta_f_lock_2 = delta_f_lock_2 * 1000.0;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1573 Measuring_2 = TRUE;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1574 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1575 case SR:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1576 GetCtrlVal(CalcNPanel, CALCN_INTEGRATIONTIME, &DeltaT_3);
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1577 GetCtrlVal(CalcNPanel, CALCN_SLOPETIME, &SlopeTime3);
159 07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1578 GetCtrlVal(CalcNPanel, CALCN_DELTAFREQ, &delta_f_lock_3);
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1579 // convert from kHz to Hz
07153c41ba16 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 158 diff changeset	1580 delta_f_lock_3 = delta_f_lock_3 * 1000.0;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1581 Measuring_3 = TRUE;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1582 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1583 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1584 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1585 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1586 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1587 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1588
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1589 int CVICALLBACK CB_OnNStop (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1590 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1591 {
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1592 int measuring;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1593
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1594 switch (event) {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1595 case EVENT_COMMIT:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1596 HidePanel(CalcNPanel);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1597 GetPanelAttribute(panel, ATTR_CALLBACK_DATA, &measuring);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1598 switch (measuring) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1599 case LO:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1600 Measuring_1 = FALSE;
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1601 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1602 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1603 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1604 case HG:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1605 Measuring_2 = FALSE;
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1606 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1607 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1608 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, f0_DDS3);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1609 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1610 case SR:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1611 Measuring_3 = FALSE;
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1612 DDS4xAD9912_RampFrequency(&DDS4xAD9912, 1, f0_DDS1, FREP_STEP_SIZE);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1613 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, f0_DDS2);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1614 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, f0_DDS3);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1615 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1616 }
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1617
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1618 // update DDS frequencies display
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1619 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1620 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1621 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1622 SetCtrlVal(MainPanel, PANEL_DDS4, DDS4xAD9912.frequency[3]);
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1623
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1624 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1625 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1626 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1627 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1628
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1629 int CVICALLBACK CB_OnFindSign (int panel, int control, int event,
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1630 void *callbackData, int eventData1, int eventData2)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1631 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1632 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1633 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1634 case EVENT_COMMIT:
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1635 switch (control)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1636 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1637 case PANEL_FINDSIGN1:
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1638 tbegin1 = utc;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1639 Frepbefore1 = Math1;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1640 GetCtrlVal(MainPanel, PANEL_DDS1, &Frequency1) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1641 SetCtrlVal(MainPanel, PANEL_DDS1, Frequency1+Frequencystep1) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1642 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency1+Frequencystep1);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1643 Getsign1 = TRUE;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1644 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1645 case PANEL_FINDSIGN2:
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1646 tbegin2 = utc;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1647 Frepbefore2 = Math1;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1648 Ch2before = Ch2;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1649 GetCtrlVal(MainPanel, PANEL_DDS1, &Frequency2) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1650 SetCtrlVal(MainPanel, PANEL_DDS1, Frequency2+Frequencystep2) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1651 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, Frequency2+Frequencystep2);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1652 Getsign2 = TRUE;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1653 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1654 case PANEL_FINDSIGN3:
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1655 tbegin3 = utc;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1656 Frepbefore3 = Math1;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1657 GetCtrlVal(MainPanel, PANEL_DDS4, &Frequency3) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1658 SetCtrlVal(MainPanel, PANEL_DDS4, Frequency3+Frequencystep3) ;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1659 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 4, Frequency3+Frequencystep3);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1660 Getsign3 = TRUE;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1661 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1662 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1663 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1664 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1665 return 0;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1666 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1667
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1668 int CVICALLBACK CB_OnFind275K (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1669 void *callbackData, int eventData1, int eventData2)
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1670 {
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1671 double frequency;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1672
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1673 switch (event)
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1674 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1675 case EVENT_COMMIT:
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1676 switch (control)
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1677 {
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1678 case PANEL_FIND275K2:
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1679 frequency = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 2) + 275000 - Ch4;
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1680 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 2, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1681 SetCtrlVal(MainPanel, PANEL_DDS2, DDS4xAD9912.frequency[1]);
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1682 break;
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1683 case PANEL_FIND10K3:
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1684 frequency = DDS4xAD9912_GetFrequency(&DDS4xAD9912, 3) + 10000 - Ch2;
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1685 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 3, frequency);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1686 SetCtrlVal(MainPanel, PANEL_DDS3, DDS4xAD9912.frequency[2]);
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1687 break;
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1688 }
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1689 break;
dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1690 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1691 return 0;
42 dcc305411dcc Cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 40 diff changeset	1692 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1693
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	1694 int CVICALLBACK CB_OnChangeNdiv (int panel, int control, int event,
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1695 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1696 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1697 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1698 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1699 case EVENT_COMMIT:
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1700 GetCtrlVal(MainPanel, PANEL_CHANGENDIV, &Ndiv);
158 9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1701 f0_DDS1 = 880000000.0 / Ndiv;
9154291658ef Simplify DDS frequency juggling in N measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 156 diff changeset	1702 DDS4xAD9912_SetFrequency(&DDS4xAD9912, 1, f0_DDS1);
179 75e37ba8c417 Fix real DDS frequency display Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 178 diff changeset	1703 SetCtrlVal(MainPanel, PANEL_DDS1, DDS4xAD9912.frequency[0]);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1704 break;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1705 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1706 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1707 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1708
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	1709 int CVICALLBACK CB_MeasureSlope (int panel, int control, int event,
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1710 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1711 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1712 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1713 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1714 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1715 GetCtrlVal(panel, control, &dedrift.enabled);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1716 if (dedrift.enabled) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1717 dedrift.t0 = utc;
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1718 stat_zero(&freq);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1719 logmsg("dedrift start");
33 09ed37e1da04 Indent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 32 diff changeset	1720 } else {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1721 if (! dedrift.keep_slope) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1722 dedrift.applied = 0.0;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1723 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1724 SetCtrlVal(MainPanel, PANEL_SLOPE_APPLIED, dedrift.applied);
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1725 }
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1726 if (! dedrift.keep_freq) {
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1727 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, dedrift.applied);
70 a945f2b7bef6 Fix slope measurement again Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 69 diff changeset	1728 }
73 1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1729 stat_zero(&freq);
1dfaf5ef0352 Refactor mean and slope measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 70 diff changeset	1730 SetCtrlVal(panel, PANEL_SLOPE_MEASURED, freq.slope);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1731 logmsg("dedrift stop");
33 09ed37e1da04 Indent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 32 diff changeset	1732 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1733 break;
33 09ed37e1da04 Indent Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 32 diff changeset	1734 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1735 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1736 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1737
14 783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1738 int CVICALLBACK CB_OnResetSlope (int panel, int control, int event,
783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1739 void *callbackData, int eventData1, int eventData2)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1740 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1741 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1742 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1743 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1744 dedrift.applied = 0.0;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1745 SetCtrlVal(panel, PANEL_SLOPE_APPLIED, dedrift.applied);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1746 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, dedrift.applied);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1747 logmsg("dedrift reset");
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1748 break;
14 783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1749 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1750 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1751 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1752
14 783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1753 int CVICALLBACK CB_ChangeSlopeTime (int panel, int control, int event,
783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1754 void *callbackData, int eventData1, int eventData2)
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1755 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1756 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1757 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1758 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1759 GetCtrlVal(MainPanel, PANEL_SLOPETIME, &dedrift.interval);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1760 break;
14 783407954cdf Minor code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 10 diff changeset	1761 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1762 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1763 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1764
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1765 int CVICALLBACK CB_OnCROX (int panel, int control, int event,
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1766 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1767 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1768 switch (event)
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1769 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1770 case EVENT_COMMIT:
34 1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1771 switch (control) {
1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1772 case PANEL_CHECKBOX_KEEP:
1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1773 // keep current dedrifting frequency when dedrifting is disabled
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1774 GetCtrlVal(MainPanel, PANEL_CHECKBOX_KEEP, &dedrift.keep_freq);
34 1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1775 break;
1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1776 case PANEL_CHECKBOX_KEEPSLOPE:
1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1777 // keep current dedrifting slope when dedrifting is disabled
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1778 GetCtrlVal(MainPanel, PANEL_CHECKBOX_KEEPSLOPE, &dedrift.keep_slope);
34 1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1779 break;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1780 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1781 break;
34 1e4b8ba97faf Cleanup code handling dedrifing options Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 33 diff changeset	1782 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1783 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1784 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1785
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1786 int CVICALLBACK CB_RecenterEnable (int panel, int control, int event,
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1787 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1788 {
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1789 switch (event)
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1790 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1791 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1792 GetCtrlVal(panel, control, &recenter.enabled);
136 7b9cf3d4346e Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 135 diff changeset	1793 recenter.t0 = utc;
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1794 rollmean_zero(&rollmean_ch2);
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1795 rollmean_zero(&rollmean_ch3);
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	1796 rollmean_zero(&rollmean_ch4);
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1797 break;
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1798 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1799 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1800 }
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1801
56 6e73fb3d94fa Simplyfy slope measurement code Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 55 diff changeset	1802 int CVICALLBACK CB_OnStopSlopeCancellingOnUnlocked (int panel, int control, int event,
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1803 void *callbackData, int eventData1, int eventData2)
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1804 {
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1805 int value;
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1806 switch (event)
20 3a7f088d4960 Get rid of unused variables. Some minor coding style improvements Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 17 diff changeset	1807 {
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1808 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1809 GetCtrlVal(MainPanel, PANEL_CHECKBOX_STOPIFAUTODE, &value);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1810 dedrift.threshold = value ? 100.0 : 0.0;
20 3a7f088d4960 Get rid of unused variables. Some minor coding style improvements Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 17 diff changeset	1811 break;
3a7f088d4960 Get rid of unused variables. Some minor coding style improvements Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 17 diff changeset	1812 }
0 d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1813 return 0;
d9aae7d7f2c6 Import Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: diff changeset	1814 }
2 bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1815
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1816 int CVICALLBACK CB_OnSlopeReference (int panel, int control, int event,
2 bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1817 void *callbackData, int eventData1, int eventData2)
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1818 {
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1819 switch (event)
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1820 {
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1821 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1822 GetCtrlVal(MainPanel, PANEL_SLOPE_REFERENCE, &dedrift.reference);
2 bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1823 break;
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1824 }
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1825 return 0;
bd7501b65f56 Implement reference selection (microwave or Hg cavity) for slope cancelling Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 1 diff changeset	1826 }
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1827
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1828 int CVICALLBACK CB_OnEstimateN (int panel, int control, int event,
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1829 void *callbackData, int eventData1, int eventData2)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1830 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1831 int visible;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1832
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1833 switch (event)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1834 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1835 case EVENT_COMMIT:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1836 // reset N estimate
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1837 SetCtrlVal(EstimateNPanel, ESTIMATEN_N, 0.0);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1838 // set current frep
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1839 SetCtrlVal(EstimateNPanel, ESTIMATEN_FREP, 250e6 + Math1);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1840 switch (control) {
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1841 case PANEL_ESTIMATE_N2:
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1842 SetCtrlVal(EstimateNPanel, ESTIMATEN_WAVELENGTH, HG_WAVELENGTH);
178 03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1843 SetPanelAttribute(EstimateNPanel, ATTR_TITLE, "Estimate N_Hg");
03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1844 SetPanelAttribute(EstimateNPanel, ATTR_CALLBACK_DATA, HG);
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1845 break;
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1846 case PANEL_ESTIMATE_N3:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1847 SetCtrlVal(EstimateNPanel, ESTIMATEN_WAVELENGTH, SR_WAVELENGTH);
178 03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1848 SetPanelAttribute(EstimateNPanel, ATTR_TITLE, "Estimate N_Sr");
03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1849 SetPanelAttribute(EstimateNPanel, ATTR_CALLBACK_DATA, SR);
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1850 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1851 }
178 03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1852 GetPanelAttribute(EstimateNPanel, ATTR_VISIBLE , &visible);
03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1853 if (! visible)
03dcca7e5ba4 Fix N estimate interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 174 diff changeset	1854 DisplayPanel(EstimateNPanel);
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1855 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1856 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1857 return 0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1858 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1859
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1860 int CVICALLBACK CB_OnNEstimateCancel (int panel, int control, int event,
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1861 void *callbackData, int eventData1, int eventData2)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1862 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1863 int visible;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1864
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1865 switch (event)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1866 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1867 case EVENT_COMMIT:
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1868 GetPanelAttribute(panel, ATTR_VISIBLE, &visible);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1869 if (visible)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1870 HidePanel(panel);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1871 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1872 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1873 return 0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1874 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1875
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1876 int CVICALLBACK CB_OnNEstimateSet (int panel, int control, int event,
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1877 void *callbackData, int eventData1, int eventData2)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1878 {
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1879 int estimate;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1880
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1881 switch (event)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1882 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1883 case EVENT_COMMIT:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1884 GetPanelAttribute(panel, ATTR_CALLBACK_DATA, &estimate);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1885 switch (estimate) {
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1886 case HG:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1887 GetCtrlVal(panel, ESTIMATEN_N, &N2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1888 SetCtrlVal(MainPanel, PANEL_N3CHOICE, N2);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1889 break;
161 6ee23cb3d6bb Coding style fixes Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 160 diff changeset	1890 case SR:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1891 GetCtrlVal(panel, ESTIMATEN_N, &N3);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1892 SetCtrlVal(MainPanel, PANEL_N3CHOICE, N3);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1893 break;
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1894 }
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1895 HidePanel(panel);
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1896 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1897 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1898 return 0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1899 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1900
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1901 int CVICALLBACK CB_OnNEstimate (int panel, int control, int event,
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1902 void *callbackData, int eventData1, int eventData2)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1903 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1904 double frep, wl, N;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1905
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1906 switch (event)
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1907 {
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1908 case EVENT_COMMIT:
160 f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1909 GetCtrlVal(panel, ESTIMATEN_FREP, &frep);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1910 GetCtrlVal(panel, ESTIMATEN_WAVELENGTH, &wl);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1911 N = round(SPEED_OF_LIGHT / wl / 1e-9 / frep);
f609fb29536b Simplification and code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 159 diff changeset	1912 SetCtrlVal(panel, ESTIMATEN_N, N);
17 9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1913 break;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1914 }
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1915 return 0;
9cadd12e7722 Implement N3 measurement. Large code cleanup. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 14 diff changeset	1916 }
30 56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1917
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1918 int CVICALLBACK CB_SetSlope (int panel, int control, int event,
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1919 void *callbackData, int eventData1, int eventData2)
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1920 {
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1921 switch (event)
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1922 {
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1923 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1924 GetCtrlVal(panel, control, &dedrift.applied);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1925 DDSFox_SetSweepRate(&DDS1xAD9956, dedrift.applied);
30 56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1926 break;
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1927 }
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1928 return 0;
56095062acd4 Allow manual setting of frequency dedrifting rate Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 29 diff changeset	1929 }
39 2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1930
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1931 int CVICALLBACK CB_InvertSlopeSign (int panel, int control, int event,
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1932 void *callbackData, int eventData1, int eventData2)
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1933 {
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1934 switch (event)
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1935 {
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1936 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1937 GetCtrlVal(panel, control, &dedrift.invert);
39 2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1938 break;
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1939 }
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1940 return 0;
2e1b3148d6e6 Add setting to invert the sign of the measured slope on dedrifting Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 37 diff changeset	1941 }
48 70980f27e1a4 Simplify dedrifting interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 47 diff changeset	1942
80 46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1943 int CVICALLBACK CB_ResetDedriftDDS (int panel, int control, int event,
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1944 void *callbackData, int eventData1, int eventData2)
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1945 {
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1946 switch (event)
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1947 {
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1948 case EVENT_COMMIT:
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1949 // stop slope measurement and reset slope
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1950 dedrift.enabled = FALSE;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1951 SetCtrlVal(panel, PANEL_MEASURE_SLOPE, 0);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1952 dedrift.applied = 0.0;
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1953 SetCtrlVal(panel, PANEL_SLOPE_APPLIED, dedrift.applied);
80 46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1954 // reset DDS
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1955 DDSFox_Reset(&DDS1xAD9956);
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1956 DDSFox_SetProfile(&DDS1xAD9956);
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1957 DDSFox_SetDiv(&DDS1xAD9956, 1);
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	1958 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, 0.0);
80 46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1959 break;
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1960 }
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1961 return 0;
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1962 }
46fe62febcd0 Add dedrifting DDS reset functionality Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 79 diff changeset	1963
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1964 int CVICALLBACK CB_ShowLog (int panel, int control, int event,
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1965 void *callbackData, int eventData1, int eventData2)
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1966 {
122 bdd3ec3c212e Improve user interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 121 diff changeset	1967 int visible;
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1968 switch (event)
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1969 {
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1970 case EVENT_COMMIT:
122 bdd3ec3c212e Improve user interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 121 diff changeset	1971 GetCtrlVal(panel, PANEL_SHOWLOG, &visible);
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	1972 logger_panel_visible(visible);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1973 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1974 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1975 return 0;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1976 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1977
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1978 int CVICALLBACK CB_OnLoggingPanelEvent(int panel, int event,
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1979 void *callbackData, int eventData1, int eventData2)
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1980 {
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1981 switch (event)
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1982 {
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1983 case EVENT_CLOSE:
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	1984 logger_panel_visible(0);
122 bdd3ec3c212e Improve user interface Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 121 diff changeset	1985 SetCtrlVal(MainPanel, PANEL_SHOWLOG, 0);
84 c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1986 break;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1987 }
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1988 return 0;
c03263186dd7 Rework and cleanup N measurement panels handling. Move logs to dedicated panel. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 82 diff changeset	1989 }
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1990
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1991 int CVICALLBACK CB_Sign3 (int panel, int control, int event,
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1992 void *callbackData, int eventData1, int eventData2)
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1993 {
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1994 switch (event)
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1995 {
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1996 case EVENT_COMMIT:
125 37535873ee83 Rename variables from SigneX to SignX Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 124 diff changeset	1997 GetCtrlVal(panel, control, &Sign3);
109 2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1998 break;
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	1999 }
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	2000 return 0;
2a9f8a811d87 Fix N3 measurement Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 105 diff changeset	2001 }
123 35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2002
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2003 int CVICALLBACK CB_SlopeX2 (int panel, int control, int event,
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2004 void *callbackData, int eventData1, int eventData2)
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2005 {
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2006 switch (event)
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2007 {
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2008 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	2009 GetCtrlVal(panel, control, &dedrift.doubleslope);
123 35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2010 break;
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2011 }
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2012 return 0;
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2013 }
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2014
142 fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2015 int CVICALLBACK CB_SaveData (int panel, int control, int event,
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2016 void *callbackData, int eventData1, int eventData2)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2017 {
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2018 switch (event)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2019 {
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2020 case EVENT_COMMIT:
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2021 for (struct datafile *d = datafiles; d->data; d++) {
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2022 if (d->control == control)
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2023 GetCtrlVal(panel, control, &(d->write));
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2024 }
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2025 break;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2026 }
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2027 return 0;
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2028 }
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2029
fd085d61e4ca Rework data logging Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 140 diff changeset	2030
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2031 int CVICALLBACK CB_RecenterInterval (int panel, int control, int event,
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2032 void *callbackData, int eventData1, int eventData2)
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2033 {
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2034 switch (event)
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2035 {
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2036 case EVENT_COMMIT:
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2037 GetCtrlVal(panel, control, &recenter.interval);
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2038 break;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2039 }
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2040 return 0;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2041 }
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2042
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2043 int CVICALLBACK CB_RecenterChannel (int panel, int control, int event,
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2044 void *callbackData, int eventData1, int eventData2)
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2045 {
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2046 switch (event)
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2047 {
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2048 case EVENT_COMMIT:
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2049 switch (control)
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2050 {
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2051 case PANEL_RECENTER_LO:
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2052 GetCtrlVal(panel, control, &recenter.lo);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2053 break;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2054 case PANEL_RECENTER_HG:
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2055 GetCtrlVal(panel, control, &recenter.hg);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2056 break;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2057 case PANEL_RECENTER_SR:
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2058 GetCtrlVal(panel, control, &recenter.sr);
139 e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2059 break;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2060 }
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2061 break;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2062 }
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2063 return 0;
e04123ab79ef Fix recenter Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 136 diff changeset	2064 }
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2065
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2066 int CVICALLBACK CB_SrDatalogger (int panel, int control, int event,
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2067 void *callbackData, int eventData1, int eventData2)
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2068 {
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2069 switch (event)
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2070 {
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2071 case EVENT_COMMIT:
169 97112b45b838 Get Sr data logger parameters from configuration file. Code reorganization. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 168 diff changeset	2072 GetCtrlVal(panel, control, &datalogger.enabled);
144 be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2073 break;
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2074 }
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2075 return 0;
be87c8e78266 Code cleanup Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 143 diff changeset	2076 }
123 35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2077 int CVICALLBACK CB_DedriftDDSFreq (int panel, int control, int event,
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2078 void *callbackData, int eventData1, int eventData2)
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2079 {
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2080 switch (event)
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2081 {
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2082 case EVENT_COMMIT:
133 7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	2083 GetCtrlVal(panel, control, &dedrift.freq0);
7540703b8473 Major code cleanup. Implement beatnote recentering. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 132 diff changeset	2084 DDSFox_Set(&DDS1xAD9956, dedrift.freq0, dedrift.applied);
123 35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2085 break;
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2086 }
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2087 return 0;
35861fe64d14 Allow to set dedrift DDS central frequency. Add option to double applied slope. Daniele Nicolodi <daniele.nicolodi@obspm.fr> parents: 122 diff changeset	2088 }

Mercurial > hg > fxanalyse

annotate FXAnalyse.c @ 183:791ca26fee6a