Subversion Repository Public Repository

amptest

This repository has no backups
This repository's network speed is throttled to 100KB/sec

1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
#include <Arduino.h>

#if defined(__SAM3X8E__)
#include <DueTimer.h>
#endif

#include "mode.h"
#include "dac.h"
#include "amptimer.h"

struct SSweep
{
	bool enable;

	double startFreq;   // Hz
	double endFreq;     // Hz
	double sweepRate;   // Hz/sec

	double currFreq;    // current frequency
	bool dir;           // current direction. false - mean from start to end

	SSweep()
	{
		enable = false;

		startFreq = 0.5;
		endFreq = 10;
		sweepRate = 0.5;

		currFreq = startFreq;
		dir = false;
	}
};

#define SWEEP_STEPS_MAX_COUNT       2000


double m_freq = 0;

SSweep m_sweep;



#if !defined(__SAM3X8E__)
	int tick_mult = 1;
	int tick_count = 0;
	uint32_t  tmr_tick_in_count = 20;

	int sweep_tick_mult = 1;
	int sweep_tick_count = 0;
	uint32_t  sweep_tmr_tick_in_count = 20;
#endif



#if defined(__SAM3X8E__)
void Timer1Interrupt()
{
#else
ISR(TIMER1_OVF_vect)
{
	TCNT1 = tmr_tick_in_count;

	if (tick_mult > 1)
	{
		tick_count++;

		if (tick_count < tick_mult)
			return;
	}

	tick_count = 0;

#endif


	uint32_t val = getNextDAC() >> 4; // conv resolution from 16 to 12 bit 

	dac_write(val);


}

#if defined(__SAM3X8E__)
void Timer2Interrupt()
{
	if (!m_sweep.enable)
		return;

#else
ISR(TIMER5_OVF_vect)
{
	TCNT5 = sweep_tmr_tick_in_count;

	if (sweep_tick_mult > 1)
	{
		sweep_tick_count++;

		if (sweep_tick_count < sweep_tick_mult)
			return;
	}

	sweep_tick_count = 0;

#endif

	double diff = m_sweep.sweepRate / (double)SWEEP_STEPS_MAX_COUNT;

	if (m_sweep.endFreq < m_sweep.startFreq) diff *= -1.0;

	double nextFreq = m_sweep.dir ? m_sweep.currFreq - diff : m_sweep.currFreq + diff;

	double maxfreq = max(m_sweep.endFreq, m_sweep.startFreq);
	double minfreq = min(m_sweep.endFreq, m_sweep.startFreq);

	if (nextFreq > maxfreq || nextFreq < minfreq)
	{
		nextFreq = m_sweep.currFreq;
		m_sweep.dir = !m_sweep.dir;
	}

	m_sweep.currFreq = nextFreq;



//    static int dbg_step = 0; dbg_step++;
//    if ((dbg_step % 16) == 0)
//		Serial.println(nextFreq, 3);
//    dbg_step = dbg_step % 16;



	setFreq(nextFreq);


}


void timer_init()
{
#if defined(__SAM3X8E__)
	Timer1.attachInterrupt(Timer1Interrupt);
	Timer2.attachInterrupt(Timer2Interrupt);
#else
	TCCR1B = 0x00;
	TCCR5B = 0x00;
#endif
}



double getFreq()
{
	return m_freq;
}


#define MIN_FREQ            0.01
#define MAX_FREQ            200.0
#define MIN_SWEEP_RATE      0.01
#define MAX_SWEEP_RATE      20.0


void setFreq(double freq) // [0.01 - 200.0]
{
	if (freq < MIN_FREQ) freq = MIN_FREQ;
	if (freq > MAX_FREQ) freq = MAX_FREQ;

	m_freq = freq;


#if defined(__SAM3X8E__)

	Timer1.stop();
	Timer1.setFrequency(freq * getTabSize());
	Timer1.start();

#else

	int mult = 1;

	uint32_t pulses = (uint32_t)(F_CPU / (freq * getTabSize()));

	while (pulses > 40000)
	{
		pulses /= 2;
		mult *= 2;
	}

	tmr_tick_in_count = 65535 - pulses; 

	tick_mult = mult;

#endif // __SAM3X8E__


}


void setSweepEnable(bool bEnable)
{
	m_sweep.enable = bEnable;
}

void setSweep(double start, double end, double rate)
{
	if (start < MIN_FREQ) start = MIN_FREQ;
	if (start > MAX_FREQ) start = MAX_FREQ;
	if (end < MIN_FREQ) end = MIN_FREQ;
	if (end > MAX_FREQ) end = MAX_FREQ;
	if (rate < MIN_SWEEP_RATE) rate = MIN_SWEEP_RATE;
	if (rate > MAX_SWEEP_RATE) rate = MAX_SWEEP_RATE;

	m_sweep.startFreq = start;
	m_sweep.endFreq = end;
	m_sweep.sweepRate = rate;

	m_sweep.currFreq = m_sweep.startFreq;
	m_sweep.dir = false; // false - mean from start to end; true - from end to start


#if defined(__SAM3X8E__)

	Timer2.stop();
	Timer2.setFrequency(rate * SWEEP_STEPS_MAX_COUNT);
	Timer2.start();

#else

	int mult = 1;

	uint32_t pulses = (uint32_t)(F_CPU / (rate * SWEEP_STEPS_MAX_COUNT));//

	while (pulses > 40000)
	{
		pulses /= 2;
		mult *= 2;
	}

	sweep_tmr_tick_in_count = 65535 - pulses;

	sweep_tick_mult = mult;

#endif // __SAM3X8E__
}


void setSweep(const char* szSweep)
{
	if (strstr(szSweep, "?") != NULL)
	{
		return;
	}
	else if (strstr(szSweep, "no") != NULL)
	{
		setSweepEnable(false);
		return;
	}

	double startFreq = atof(szSweep);
	double endFreq = 0;
	double sweepRate = 0;
	
	char* szNext = strstr(szSweep, ";");

	if (szNext != NULL)
	{
		szNext += 1;

		endFreq = atof(szNext);

		szNext = strstr(szNext, ";");

		if (szNext != NULL)
		{
			szNext += 1;

			sweepRate = atof(szNext);

			setSweep(startFreq, endFreq, sweepRate);

			setSweepEnable(true);
		}
	}

}


char sweepparams[50];

const char* getSweepParams()
{
	if (m_sweep.enable)
		sprintf(sweepparams, "%0.3f;%0.3f;%0.3f;", m_sweep.startFreq, m_sweep.endFreq, m_sweep.sweepRate);
	else
		strcpy(sweepparams, "no");

	return sweepparams;
}

Commits for amptest/trunk/amptimer.cpp

Diff revisions: vs.
Revision Author Commited Message
3 Diff Diff DimirtiusGu picture DimirtiusGu Sat 12 Nov, 2022 18:41:39 +0000

- расширен диапазон частот
- переименованы режимы

2 DimirtiusGu picture DimirtiusGu Wed 20 Jul, 2022 00:52:33 +0000