fxanalyse: FXAnalyse.c annotate

annotate FXAnalyse.c @ 222:db051dbf8d6e

Bitwise vs logical and fix

author	Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date	Thu, 18 Sep 2014 18:02:20 +0200
parents	c14f5a95850d
children	7875436125dd

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

Mercurial > hg > fxanalyse

annotate FXAnalyse.c @ 222:db051dbf8d6e