jarjonam 5 년 전
부모
커밋
ec42fe8cee
2개의 변경된 파일2개의 추가작업 그리고 1개의 파일을 삭제
  1. 1 0
      pi/server.py
  2. 1 1
      pi/web/main.js

+ 1 - 0
pi/server.py

@@ -25,6 +25,7 @@ def save_waveform():
 	signal_std = np.std(data[state["start"]:state["stop"]])
 	wf_number = chip.get_wf_cnt()
 	timestamp = time.time()
+	print(wf_num, timestamp, last_wf_num, last_timestamp)
 	if(last_wf_number>0 and wf_number - last_wf_number>0):
 		state["board_freq"] = (timestamp - last_timestamp)/(wf_number - last_wf_number)
 	last_wf_number, last_timestamp = wf_number, timestamp

+ 1 - 1
pi/web/main.js

@@ -122,7 +122,7 @@ function onload(){ //Bind events
 	tippy('#N', {delay: [1000, 0], content: "Number of waveforms (typ. 1) to sample in each stabilization cycle.",})
 	tippy('#wfLen', {delay: [1000, 0], content: "Number of points to sample (1-255)",})
 	tippy('#stepMax', {delay: [1000, 0], content: "Maximum step allowed in one stabilization cycle (typ. 200) . Small values may lead to slow response to sharp fluctuations.",})
-	tippy('#Gain', {delay: [1000, 0], content: "At every step Vout += (Vmeasured-Vset)*Gain",})
+	tippy('#Gain', {delay: [1000, 0], content: "At every step Vout += ((signal - ground) - Vset) * Gain",})
 	tippy('#calibrateGain', {delay: [1000, 0], content: "Automatically select a loop gain based on the response function of the system.",})
 	tippy('#autoSetPga', {delay: [1000, 0], content: "When True, the board changes the input gain and offset so that the signal is in an appropiate range (not clipped and going >2000). Set to False to select it manually.",})
 	tippy('#inputGain', {delay: [1000, 0], content: "Allowed values: [1, 2, 4, 8, 16, 32, 64, 128]",})