##// END OF EJS Templates
HG_REPOSITORIES » LPP » INSTRUMENTATION » SOLO_LFR » DEV_PLE
RSS

Clone from http://pc-instru.lpp.polytechnique.fr:5000/DEV_PLE

bug 501 corrected
paul -
r220:c13217e910de R3
parent child
Show More
Show file before | Show file after | Hide comments
@@ -12,7 +12,7 SWVERSION=-1-0
12 DEFINES += SW_VERSION_N1=3 # major
12 DEFINES += SW_VERSION_N1=3 # major
13 DEFINES += SW_VERSION_N2=0 # minor
13 DEFINES += SW_VERSION_N2=0 # minor
14 DEFINES += SW_VERSION_N3=0 # patch
14 DEFINES += SW_VERSION_N3=0 # patch
15 DEFINES += SW_VERSION_N4=8 # internal
15 DEFINES += SW_VERSION_N4=9 # internal
16
16
17 # <GCOV>
17 # <GCOV>
18 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
18 #QMAKE_CFLAGS_RELEASE += -fprofile-arcs -ftest-coverage
Show file before | Show file after | Hide comments
@@ -897,7 +897,7 void setCalibrationData( void ){
897 f1 = 10000;
897 f1 = 10000;
898 fs = 160256.410;
898 fs = 160256.410;
899 Ts = 1. / fs;
899 Ts = 1. / fs;
900 scaleFactor = 0.125 / 0.000654; // 191, 500 mVpp, 2 sinus waves => 250 mVpp each, amplitude = 125 mV
900 scaleFactor = 0.250 / 0.000654; // 191, 500 mVpp, 2 sinus waves => 500 mVpp each, amplitude = 250 mV
901
901
902 time_management_regs->calDataPtr = 0x00;
902 time_management_regs->calDataPtr = 0x00;
903
903
General Comments 0
You need to be logged in to leave comments. Login now