Browse Source

Impedance calculation fixed. Two new sample data files added.

klaute 2 years ago
parent
commit
32706429b9

+ 3
- 1
firmware/command_ctrl.ino View File

@@ -275,6 +275,8 @@ void cc_startMeasurement()
275 275
     Serial.write(tmp);
276 276
   }
277 277
 
278
+  si5351.output_enable(SI5351_CLK0, 0); // disable clock output 0
279
+
278 280
 }
279 281
 
280 282
 void cc_getConfig()
@@ -425,4 +427,4 @@ void cc_clearReadDataBuffer()
425 427
 }
426 428
 
427 429
 /*****************************************************************************/
428
-
430
+

+ 1
- 1
tools/2m_scan.bat View File

@@ -1,5 +1,5 @@
1 1
 @echo off
2 2
 
3
-C:\Python27\python.exe meas.py -o 70cm.csv -s 144000000 -e 146100000 -i 50 -p 5000 -d COM16 -m
3
+C:\Python27\python.exe meas.py -o 2m.csv -s 144000000 -e 146100000 -i 1 -p 5000 -d COM16 -m
4 4
 
5 5
 pause

+ 1
- 1
tools/meas.py View File

@@ -529,7 +529,7 @@ if __name__ == "__main__":
529 529
                 min_vswr[1] = m[0] # the frequency
530 530
 
531 531
               # R = meas_data[0] * 5V / 1023 * I
532
-              r = (m[1] * 5.0 / 1023.0) / i
532
+              r = 20.0 * vswr # (m[1] * 5.0 / 1023.0) / i
533 533
               meas_r.append(r)
534 534
 
535 535
               # P = meas_data[0] * 5V ^ 2 / r

BIN
tools/sample_data/aaron_gummiwurst_2m.xlsx View File


BIN
tools/sample_data/kai_gp_2m.xlsx View File