fxanalyse: FXAnalyse.c annotate

annotate FXAnalyse.c @ 234:b0b4b2aea43a

Correct normalization for Allan deviation plots

author	Daniele Nicolodi <daniele.nicolodi@obspm.fr>
date	Mon, 27 Oct 2014 18:15:47 +0100
parents	52f882f39c16
children	95572be109a4

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

Mercurial > hg > fxanalyse

annotate FXAnalyse.c @ 234:b0b4b2aea43a