diff --git a/firmware/command_ctrl.ino b/firmware/command_ctrl.ino index b52d0b7..1f79024 100644 --- a/firmware/command_ctrl.ino +++ b/firmware/command_ctrl.ino @@ -275,6 +275,8 @@ void cc_startMeasurement() Serial.write(tmp); } + si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0 + } void cc_getConfig() @@ -425,4 +427,4 @@ void cc_clearReadDataBuffer() } /*****************************************************************************/ - + diff --git a/tools/2m_scan.bat b/tools/2m_scan.bat index 93b433d..43f3d5c 100644 --- a/tools/2m_scan.bat +++ b/tools/2m_scan.bat @@ -1,5 +1,5 @@ @echo off -C:\Python27\python.exe meas.py -o 70cm.csv -s 144000000 -e 146100000 -i 50 -p 5000 -d COM16 -m +C:\Python27\python.exe meas.py -o 2m.csv -s 144000000 -e 146100000 -i 1 -p 5000 -d COM16 -m pause diff --git a/tools/meas.py b/tools/meas.py index 4f14082..431a10d 100644 --- a/tools/meas.py +++ b/tools/meas.py @@ -529,7 +529,7 @@ if __name__ == "__main__": min_vswr[1] = m[0] # the frequency # R = meas_data[0] * 5V / 1023 * I - r = (m[1] * 5.0 / 1023.0) / i + r = 20.0 * vswr # (m[1] * 5.0 / 1023.0) / i meas_r.append(r) # P = meas_data[0] * 5V ^ 2 / r diff --git a/tools/sample_data/aaron_gummiwurst_2m.xlsx b/tools/sample_data/aaron_gummiwurst_2m.xlsx new file mode 100644 index 0000000..6798e68 Binary files /dev/null and b/tools/sample_data/aaron_gummiwurst_2m.xlsx differ diff --git a/tools/sample_data/kai_gp_2m.xlsx b/tools/sample_data/kai_gp_2m.xlsx new file mode 100644 index 0000000..4d1ddbf Binary files /dev/null and b/tools/sample_data/kai_gp_2m.xlsx differ