Oliver Keller
/
muonhunter-K8
experimental fork
Diff: main.cpp
- Revision:
- 2:66a2e52ad175
- Parent:
- 1:549e331aefab
- Child:
- 3:0a89a80bea94
--- a/main.cpp Tue Oct 04 11:21:03 2016 +0000 +++ b/main.cpp Tue Oct 04 16:45:02 2016 +0000 @@ -16,9 +16,9 @@ bool mdet = 0; bool buzzer = 0; -int muon_total; -int gm1_total; -int gm2_total; +volatile int muon_total; +volatile int gm1_total; +volatile int gm2_total; //storing a detections in a FIFO queue queue<Detection> detections; @@ -168,6 +168,7 @@ } } + int main() { //start main timer main_t.start(); @@ -181,12 +182,13 @@ hv1monitor.attach(&hv1monitor_, 0.1); hv2monitor.attach(&hv2monitor_, 0.1); + //ticker to monitor memory usage -memory_checker.attach(&memory_checker_, 0.1); +memory_checker.attach(&memory_checker_, 0.2); while(1){ if(detections.size() > 1){ Detection temp = detections.front(); - pc.printf("%d, %d, %f\n", detections.size(), temp.get_channel(), temp.get_time()); + pc.printf("%d, %d, %f, %f, %f \nr", detections.size(), temp.get_channel(), temp.get_time(), v1, v2); detections.pop(); } wait(1);