klaute/SWRMeter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Compare commits

base: klaute:69ac7c3f8a1a6a7b4483069129c600d216a6519f
Branches Tags
klaute:master
..
compare: klaute:56f8161e9955f57b62aea68d472e6799f0a6ee17
Branches Tags
klaute:master

No commits in common. "69ac7c3f8a1a6a7b4483069129c600d216a6519f" and "56f8161e9955f57b62aea68d472e6799f0a6ee17" have entirely different histories.
69ac7c3f8a ... 56f8161e99

5 changed files with 25 additions and 253 deletions
Show stats Expand all files Collapse all files

83
firmware/command_ctrl.ino
View file

@ -55,10 +55,6 @@ uint8_t cc_commands[] = {
CC_CMD_SAV_DFLT, CC_CMD_SAV_DFLT,
CC_CMD_SET_CLK_CORR, CC_CMD_SET_CLK_CORR,
CC_CMD_GET_CLK_CORR, CC_CMD_GET_CLK_CORR,
CC_CMD_SET_WF_FREQ,
CC_CMD_SET_WF,
CC_CMD_SET_WF_DC,
CC_CMD_EN_WF,
}; };
void (*cc_cmd_functions[])() = { void (*cc_cmd_functions[])() = {
@ -74,10 +70,6 @@ void (*cc_cmd_functions[])() = {
CC_CMD_SAV_DFLT_FUNC, CC_CMD_SAV_DFLT_FUNC,
CC_CMD_SET_CLK_CORR_FUNC, CC_CMD_SET_CLK_CORR_FUNC,
CC_CMD_GET_CLK_CORR_FUNC, CC_CMD_GET_CLK_CORR_FUNC,
CC_CMD_SET_WF_FREQ_FUNC,
CC_CMD_SET_WF_FUNC,
CC_CMD_SET_WF_DC_FUNC,
CC_CMD_SET_EN_WF_FUNC,
}; };
uint8_t cc_cmd_data_to_read[] = { uint8_t cc_cmd_data_to_read[] = {
@ -93,10 +85,6 @@ uint8_t cc_cmd_data_to_read[] = {
CC_CMD_SAV_DFLT_DATA_TO_READ, CC_CMD_SAV_DFLT_DATA_TO_READ,
CC_CMD_SET_CLK_CORR_DATA_TO_READ, CC_CMD_SET_CLK_CORR_DATA_TO_READ,
CC_CMD_GET_CLK_CORR_DATA_TO_READ, CC_CMD_GET_CLK_CORR_DATA_TO_READ,
CC_CMD_SET_WF_FREQ_DATA_TO_READ,
CC_CMD_SET_WF_DATA_TO_READ,
CC_CMD_SET_WF_DC_DATA_TO_READ,
CC_CMD_SET_EN_WF_DATA_TO_READ,
}; };
uint8_t cc_read_data[CC_READ_DATA_MAX]; uint8_t cc_read_data[CC_READ_DATA_MAX];
@ -238,21 +226,12 @@ void cc_startMeasurement()
uint32_t a1_sum = 0; uint32_t a1_sum = 0;
uint16_t i = 0; uint16_t i = 0;
// TODO an diesem punkt muss unterschieden werden ob eine waveform ausgegeben werden soll oder eine frequenz, und welche Art von Kurve if (freq < 8000)
if (freq < WF_FREQ_MAX_HZ)
{ {
if (freq > PWM_MAX_VALUE)
{
setWaveform(WAVEFORM_SINUS);
setWaveformFrequency(freq); setWaveformFrequency(freq);
} else { setWaveform(WAVEFORM_SINUS);
setWaveform(WAVEFORM_DUTYCYCLE);
setWaveformDC((uint8_t)(freq & 0xff));
}
enableWaveformOutput(); enableWaveformOutput();
pollWaveformGenerator(); // manually poll the waveformgenerator
si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0 si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0
//delay(1);
} else { } else {
disableWaveformOutput(); disableWaveformOutput();
si5351.set_freq((uint64_t)freq * 100, SI5351_PLL_FIXED, SI5351_CLK0); si5351.set_freq((uint64_t)freq * 100, SI5351_PLL_FIXED, SI5351_CLK0);
@ -290,7 +269,6 @@ void cc_startMeasurement()
send16BitValue(a1_sum); send16BitValue(a1_sum);
sendEOM(); sendEOM();
disableWaveformOutput();
si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0 si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0
if (freq >= end_freq) if (freq >= end_freq)
@ -326,16 +304,9 @@ void cc_enableClk(void)
sendSOM(); sendSOM();
if (cc_read_data[0] == SI5351_CLK0) if (cc_read_data[0] == SI5351_CLK0)
{ {
if (start_freq < WF_FREQ_MAX_HZ) // < 8kHz if (start_freq < 8000)
{ {
if (start_freq > PWM_MAX_VALUE) // > 8 bit pwm value
{
setWaveform(WAVEFORM_SINUS);
setWaveformFrequency(start_freq); setWaveformFrequency(start_freq);
} else {
setWaveform(WAVEFORM_DUTYCYCLE);
setWaveformDC((uint8_t)(start_freq & 0xff));
}
enableWaveformOutput(); enableWaveformOutput();
si5351.output_enable(SI5351_CLK0, 0); si5351.output_enable(SI5351_CLK0, 0);
} else { } else {
@ -423,54 +394,6 @@ void cc_getClkCorrection(void)
sendEOM(); sendEOM();
} }
void cc_setWFFreq(void)
{
uint16_t tmp_freq = read16BitDataFromBuffer(0);
setWaveformFrequency(tmp_freq);
sendSOM();
Serial.write(MSG_TYPE_ANSWER_OK);
sendEOM();
}
void cc_setWF(void)
{
uint8_t tmp_wf = cc_read_data[0];
setWaveform(tmp_wf);
sendSOM();
Serial.write(MSG_TYPE_ANSWER_OK);
sendEOM();
}
void cc_setWFDC(void)
{
uint8_t tmp_dc = cc_read_data[0];
setWaveformDC(tmp_dc);
sendSOM();
Serial.write(MSG_TYPE_ANSWER_OK);
sendEOM();
}
void cc_enableWF(void)
{
uint8_t tmp_en = cc_read_data[0];
if (tmp_en == 0)
{
disableWaveformOutput();
} else {
enableWaveformOutput();
}
sendSOM();
Serial.write(MSG_TYPE_ANSWER_OK);
sendEOM();
}
/*****************************************************************************/ /*****************************************************************************/
void cc_init() void cc_init()

22
firmware/globals.h
View file

@ -1,16 +1,6 @@
/*****************************************************************************/ /*****************************************************************************/
#define WF_FREQ_MAX_HZ 8000
/*****************************************************************************/
#define PWM_BIT_WIDTH 8
#define PWM_PIN 5 // PWM-Pin für DAC0 auf dem Arduino Nano 328
#define PWM_MAX_VALUE ((1 << PWM_BIT_WIDTH)-1)
/*****************************************************************************/
#define MEAS_LOOP_CNT 20 #define MEAS_LOOP_CNT 20
#define MAIN_LOOP_DELAY_US 63 // 1/63us = ~16kHz #define MAIN_LOOP_DELAY_US 63 // 1/63us = ~16kHz
@ -59,10 +49,6 @@
#define CC_CMD_SAV_DFLT 0x22 #define CC_CMD_SAV_DFLT 0x22
#define CC_CMD_SET_CLK_CORR 0x23 #define CC_CMD_SET_CLK_CORR 0x23
#define CC_CMD_GET_CLK_CORR 0x24 #define CC_CMD_GET_CLK_CORR 0x24
#define CC_CMD_SET_WF_FREQ 0x30
#define CC_CMD_SET_WF 0x31
#define CC_CMD_SET_WF_DC 0x32
#define CC_CMD_EN_WF 0x33
/*****************************************************************************/ /*****************************************************************************/
@ -78,10 +64,6 @@
#define CC_CMD_SAV_DFLT_FUNC &cc_saveDefaults #define CC_CMD_SAV_DFLT_FUNC &cc_saveDefaults
#define CC_CMD_SET_CLK_CORR_FUNC &cc_setClkCorrection #define CC_CMD_SET_CLK_CORR_FUNC &cc_setClkCorrection
#define CC_CMD_GET_CLK_CORR_FUNC &cc_getClkCorrection #define CC_CMD_GET_CLK_CORR_FUNC &cc_getClkCorrection
#define CC_CMD_SET_WF_FREQ_FUNC &cc_setWFFreq
#define CC_CMD_SET_WF_FUNC &cc_setWF
#define CC_CMD_SET_WF_DC_FUNC &cc_setWFDC
#define CC_CMD_SET_EN_WF_FUNC &cc_enableWF
/*****************************************************************************/ /*****************************************************************************/
@ -97,10 +79,6 @@
#define CC_CMD_SAV_DFLT_DATA_TO_READ 0 #define CC_CMD_SAV_DFLT_DATA_TO_READ 0
#define CC_CMD_SET_CLK_CORR_DATA_TO_READ 4 #define CC_CMD_SET_CLK_CORR_DATA_TO_READ 4
#define CC_CMD_GET_CLK_CORR_DATA_TO_READ 0 #define CC_CMD_GET_CLK_CORR_DATA_TO_READ 0
#define CC_CMD_SET_WF_FREQ_DATA_TO_READ 2
#define CC_CMD_SET_WF_DATA_TO_READ 1
#define CC_CMD_SET_WF_DC_DATA_TO_READ 1
#define CC_CMD_SET_EN_WF_DATA_TO_READ 1
/*****************************************************************************/ /*****************************************************************************/

105
firmware/waveformgenerator.ino
View file

@ -1,16 +1,17 @@
#include "Waveforms.h" #include "Waveforms.h"
#define PWM_BIT_WIDTH 8
#define PWM_PIN 5 // PWM-Pin für DAC0 auf dem Arduino Nano 328
uint8_t wf_wave0 = 0; uint8_t wf_wave0 = 0;
uint8_t wf_pos = 0; uint8_t wf_pos = 0;
uint16_t wf_freq = 0; uint16_t wf_freq = 0;
uint8_t wf_dutyCycle = 0;
unsigned long wf_sample_us = 0; unsigned long wf_sample_us = 0;
unsigned long wf_prevMicros = 0; unsigned long wf_prevMicros = 0;
bool wf_outputEnabled = true; // Variable to control waveform output state bool wf_outputEnabled = true; // Variable to control waveform output state
bool wf_pwm_needs_disabling = true;
void initWaveformGenerator() void initWaveformGenerator()
{ {
@ -18,40 +19,28 @@ void initWaveformGenerator()
setWaveform(WAVEFORM_SINUS); setWaveform(WAVEFORM_SINUS);
// Call the function to set default frequency, here you might want to specify a default frequency // Call the function to set default frequency, here you might want to specify a default frequency
setWaveformFrequency(WAVEFORM_DEFAULT_FREQ_HZ); setWaveformFrequency(WAVEFORM_DEFAULT_FREQ_HZ);
setWaveformDC(0);
analogWrite(PWM_PIN, 0);
} }
void setWaveform(uint8_t waveform0) void setWaveform(uint8_t waveform0)
{ {
if (waveform0 >= 0 and waveform0 < WAVEFORM_MAXWAVEFORM_NUM) if (waveform0 >= 0 and waveform0 < WAVEFORM_MAXWAVEFORM_NUM)
{ {
// Set default waveforms
wf_wave0 = waveform0; wf_wave0 = waveform0;
} else { } else {
// Set default waveforms
wf_wave0 = WAVEFORM_SINUS; wf_wave0 = WAVEFORM_SINUS;
} }
} }
void setWaveformFrequency(uint16_t frequency) void setWaveformFrequency(uint16_t frequency)
{ {
if (frequency >= 1 and frequency < WF_FREQ_MAX_HZ) if (frequency >= 1 and frequency < 8000)
{ {
wf_freq = frequency; wf_freq = frequency;
} else { } else {
wf_freq = WAVEFORM_DEFAULT_FREQ_HZ; wf_freq = WAVEFORM_DEFAULT_FREQ_HZ;
} }
wf_sample_us = 1000000UL / ((unsigned long)wf_freq * WAVEFORM_MAX_SAMPLES_NUM); wf_sample_us = 1000000UL / ((unsigned long)wf_freq * WAVEFORM_MAX_SAMPLES_NUM);
if (frequency >= 30 && frequency <= 1000000)
{
setupPWMFrequency(PWM_PIN, frequency);
}
}
void setWaveformDC(uint8_t dc)
{
wf_dutyCycle = dc;
} }
void enableWaveformOutput() void enableWaveformOutput()
@ -64,28 +53,20 @@ void disableWaveformOutput()
wf_outputEnabled = false; wf_outputEnabled = false;
} }
bool isWaveformEnabled()
{
return wf_outputEnabled;
}
void pollWaveformGenerator() void pollWaveformGenerator()
{ {
if (wf_outputEnabled) if (wf_outputEnabled)
{
if (wf_wave0 != WAVEFORM_DUTYCYCLE)
{ {
unsigned long currentMicros = micros(); // Aktuelle Zeit abrufen unsigned long currentMicros = micros(); // Aktuelle Zeit abrufen
if (currentMicros - wf_prevMicros >= wf_sample_us) if (currentMicros - wf_prevMicros >= wf_sample_us)
{ {
wf_prevMicros = currentMicros; wf_prevMicros = currentMicros;
uint16_t sample = map(waveformsTable[wf_wave0][wf_pos], 0, 0xfff, 0, PWM_MAX_VALUE); uint16_t sample = map(waveformsTable[wf_wave0][wf_pos], 0, 0xfff, 0, (1 << PWM_BIT_WIDTH)-1);
sample = constrain(sample, 0, PWM_MAX_VALUE); sample = constrain(sample, 0, (1 << PWM_BIT_WIDTH)-1);
// TODO write the selected waveform on DAC0 analogWrite(PWM_PIN, sample); // write the selected waveform on DAC0
analogWrite(PWM_PIN, sample); // analogWrite(PWM_PIN, 128); // write the selected waveform on DAC0
wf_pos++; wf_pos++;
if (wf_pos == WAVEFORM_MAX_SAMPLES_NUM) // Reset the counter to repeat the wave if (wf_pos == WAVEFORM_MAX_SAMPLES_NUM) // Reset the counter to repeat the wave
@ -93,74 +74,6 @@ void pollWaveformGenerator()
} }
} else { } else {
// WAVEFORM_DUTYCYCLE
if (analogRead(PWM_PIN) != wf_dutyCycle)
analogWrite(PWM_PIN, wf_dutyCycle);
}
if (!wf_pwm_needs_disabling)
wf_pwm_needs_disabling = true;
} else {
if (wf_pwm_needs_disabling)
{
analogWrite(PWM_PIN, 0); analogWrite(PWM_PIN, 0);
wf_pwm_needs_disabling = false;
} }
} }
}
void setupPWMFrequency(uint8_t pin, unsigned long frequency) {
byte prescalerbits = 0b001; // Voreinstellung: kein Prescaler (F_CPU)
unsigned long prescaler_value;
unsigned long ocr;
// Berechne den idealen Prescaler für die gewünschte Frequenz
prescaler_value = F_CPU / frequency;
// Finde den passenden Prescaler
if (prescaler_value < 65536UL) {
prescalerbits = 0b001; // Kein Prescaler (F_CPU)
}
else if ((prescaler_value >>= 3) < 65536UL) {
prescalerbits = 0b010; // Prescaler 8
}
else if ((prescaler_value >>= 3) < 65536UL) {
prescalerbits = 0b011; // Prescaler 64
}
else if ((prescaler_value >>= 2) < 65536UL) {
prescalerbits = 0b100; // Prescaler 256
}
else if ((prescaler_value >>= 2) < 65536UL) {
prescalerbits = 0b101; // Prescaler 1024
}
else {
prescalerbits = 0b101; // Prescaler 1024
frequency = F_CPU / (prescaler_value = 65535UL);
}
// Berechne den Wert für den Output Compare Register (OCR)
ocr = F_CPU / (prescaler_value * frequency) - 1;
// Timer konfigurieren
pinMode(pin, OUTPUT);
if (pin == 5 || pin == 6) {
TCCR0B &= ~0b111; // Prescaler löschen
TCCR0B |= prescalerbits; // Neuen Prescaler setzen
OCR0A = ocr; // Output Compare Register setzen
TCCR0A |= (1 << WGM01); // CTC-Modus aktivieren
}
else if (pin == 9 || pin == 10) {
TCCR1B &= ~0b111; // Prescaler löschen
TCCR1B |= prescalerbits; // Neuen Prescaler setzen
OCR1A = ocr; // Output Compare Register setzen
TCCR1A |= (1 << WGM11); // CTC-Modus aktivieren
}
else if (pin == 3 || pin == 11) {
TCCR2B &= ~0b111; // Prescaler löschen
TCCR2B |= prescalerbits; // Neuen Prescaler setzen
OCR2A = ocr; // Output Compare Register setzen
TCCR2A |= (1 << WGM21); // CTC-Modus aktivieren
}
}

1
firmware/waveforms.h
View file

@ -10,7 +10,6 @@
#define WAVEFORM_SINUS 0 #define WAVEFORM_SINUS 0
#define WAVEFORM_TRIANGULAR 1 #define WAVEFORM_TRIANGULAR 1
#define WAVEFORM_SAWTOOTH 2 #define WAVEFORM_SAWTOOTH 2
#define WAVEFORM_DUTYCYCLE 3
static int waveformsTable[WAVEFORM_MAXWAVEFORM_NUM][WAVEFORM_MAX_SAMPLES_NUM] = { static int waveformsTable[WAVEFORM_MAXWAVEFORM_NUM][WAVEFORM_MAX_SAMPLES_NUM] = {
// Sin wave // Sin wave

41
tools/meas.py
View file

@ -43,14 +43,6 @@ parser.add_argument("-c", "--get_config", default=False, help="", action='store_
parser.add_argument("-l", "--enable_clk", type=int, help="") parser.add_argument("-l", "--enable_clk", type=int, help="")
# disable clk # disable clk
parser.add_argument("-L", "--disable_clk", type=int, help="") parser.add_argument("-L", "--disable_clk", type=int, help="")
# enable/disable WaveForm
parser.add_argument("-W", "--enable_wf", type=int, help="")
# WaveForm form (0 sinus, 1 triangular, 2 sawtooth)
parser.add_argument("-w", "--form_wf", type=int, help="")
# WaveForm frequency (not related to PWM frequency)
parser.add_argument("-q", "--freq_wf", type=int, help="")
# WaveForm PWM duty cycle
parser.add_argument("-D", "--dc_wf", type=int, help="")
# save default config # save default config
parser.add_argument("-S", "--save_config", default=False, help="", action='store_true') parser.add_argument("-S", "--save_config", default=False, help="", action='store_true')
@ -83,10 +75,6 @@ CC_CMD_GET_CONFIG = 0x10
CC_CMD_EN_CLK = 0x20 CC_CMD_EN_CLK = 0x20
CC_CMD_DIS_CLK = 0x21 CC_CMD_DIS_CLK = 0x21
CC_CMD_SAV_DFLT = 0x22 CC_CMD_SAV_DFLT = 0x22
CC_CMD_SET_WF_FREQ = 0x30
CC_CMD_SET_WF = 0x31
CC_CMD_SET_WF_DC = 0x32
CC_CMD_EN_WF = 0x33
############################################################################### ###############################################################################
@ -638,35 +626,6 @@ if __name__ == "__main__":
sendSerialData([CC_CMD_DIS_CLK, args.disable_clk]) sendSerialData([CC_CMD_DIS_CLK, args.disable_clk])
dataSend = dataSend + 1 dataSend = dataSend + 1
if args.enable_wf != None:
if args.enable_wf < 0 or args.enable_wf > 1:
args.enable_wf = 0
print(("Disabling" if args.enable_wf == 0 else "Enabling") + " wave form output")
sendSerialData([CC_CMD_EN_WF, args.enable_wf])
dataSend = dataSend + 1
if args.form_wf != None:
if args.form_wf < 0 or args.form_wf > 3:
args.form_wf = 0
print("Wave form type is set to %d" % (args.form_wf))
sendSerialData([CC_CMD_SET_WF, args.form_wf])
dataSend = dataSend + 1
if args.freq_wf != None:
if args.freq_wf < 0 or args.freq_wf > 7999:
args.freq_wf = 0
print("Wave frequency set to %d" % (args.freq_wf))
sendSerialData([CC_CMD_SET_WF_FREQ, (args.freq_wf & 0x0000ff00) >> 8,
(args.freq_wf & 0x000000ff)])
dataSend = dataSend + 1
if args.dc_wf != None:
if args.dc_wf < 0 or args.dc_wf > 255:
args.dc_wf = 0
print("PWM duty cycle set to %d" % (args.dc_wf))
sendSerialData([CC_CMD_SET_WF_DC, args.dc_wf])
dataSend = dataSend + 1
if args.save_config == True: if args.save_config == True:
print("Save default configuration values...") print("Save default configuration values...")
sendSerialData([CC_CMD_SAV_DFLT]) sendSerialData([CC_CMD_SAV_DFLT])