Oliver Keller
/
muonhunter-K8
Important changes to repositories hosted on mbed.com
Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.
To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.
It is also possible to export all your personal repositories from the account settings page.
Revision 7:6a0958c2be7e, committed 2016-12-21
- Comitter:
- OliverKeller
- Date:
- Wed Dec 21 15:34:09 2016 +0000
- Parent:
- 6:e95598c44a7f
- Commit message:
- added nokia display, disabled queue (save quite some flash space)
Changed in this revision
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/NOKIA_5110.lib Wed Dec 21 15:34:09 2016 +0000 @@ -0,0 +1,1 @@ +http://developer.mbed.org/users/Fuzball/code/NOKIA_5110/#9cfce382e741
--- a/detection.cpp Sat Oct 08 13:34:52 2016 +0000
+++ b/detection.cpp Wed Dec 21 15:34:09 2016 +0000
@@ -1,14 +1,15 @@
-class Detection{
- public:
+class Detection
+{
+public:
int channel;
- float time;
+ int time;
float temp;
float pressure;
-
- Detection(int channel_, float time_){
+
+ Detection(int channel_, int time_) {
channel = channel_;
time = time_;
temp = 0;
pressure = 0;
- }
- };
\ No newline at end of file
+ }
+};
\ No newline at end of file
--- a/hvcontrol.cpp Sat Oct 08 13:34:52 2016 +0000
+++ b/hvcontrol.cpp Wed Dec 21 15:34:09 2016 +0000
@@ -1,22 +1,22 @@
#include "mbed.h"
-struct HVControl{
+struct HVControl {
int freq, max_freq, min_freq; // oscillator parameters
float voltage_ref, divider_value, voltage, thresh, safe_voltage; //hv probe parameters
PinName oscillator_pin, measure_pin;
-
- int period(int f){
- double T=0;
- if (f < 1){
- T = 1;
- }else{
- T = 1000000/f;
+
+ int period(int f) {
+ double T=0;
+ if (f < 1) {
+ T = 1;
+ } else {
+ T = 1000000/f;
}
- return (int)(T);
+ return (int)(T);
}
-
+
int *hvparams; //array is indexed with the frequency
-
+
HVControl(PinName oscillator_pin_, PinName measure_pin_) {
max_freq = 10000; //default maximum frequency
min_freq = 1000; //default minimum frequency
@@ -28,69 +28,84 @@
oscillator_pin = oscillator_pin_;
measure_pin = measure_pin_;
freq = max_freq;
- }
-
- float from_adc_voltage(float adc_v){ return adc_v * divider_value * voltage_ref; }
-
- float to_adc_voltage(float voltage_){ return voltage_/(divider_value * voltage_ref); }
-
- bool measure(void){
+ }
+
+ float from_adc_voltage(float adc_v) {
+ return adc_v * divider_value * voltage_ref;
+ }
+
+ float to_adc_voltage(float voltage_) {
+ return voltage_/(divider_value * voltage_ref);
+ }
+
+ bool measure(void) {
AnalogIn probe(measure_pin);
voltage = from_adc_voltage(probe.read());
- if(voltage > thresh){ return 0; }
- else{ return 1; }
+ if(voltage > thresh) {
+ return 0;
+ } else {
+ return 1;
}
-
- void set_frequency(int f){
- if(f > max_freq){
+ }
+
+ void set_frequency(int f) {
+ if(f > max_freq) {
f = max_freq;
- }
- if(f < min_freq){
+ }
+ if(f < min_freq) {
f = min_freq;
- }
+ }
PwmOut pwm(oscillator_pin);
int p = period(f);
freq = f;
pwm.period_us(p);
pwm.pulsewidth_us((int)(p/2));
- }
-
- int freq_to_index(int f){ return (f/100)-10; }
-
- int index_to_freq(int f){ return (f+10)*100; }
-
- void calibrate(void){
+ }
+
+ int freq_to_index(int f) {
+ return (f/100)-10;
+ }
+
+ int index_to_freq(int f) {
+ return (f+10)*100;
+ }
+
+ void calibrate(void) {
hvparams = new int[69];
shutdown();
- for(int f=7800; f>=1000; f-=100){
+ for(int f=7800; f>=1000; f-=100) {
set_frequency(f);
wait(1);
- if(measure()){
+ if(measure()) {
hvparams[freq_to_index(f)]=(int)voltage;
- }else{
- shutdown();
- break;
- }
+ } else {
+ shutdown();
+ break;
}
}
-
- void shutdown(void){
+ }
+
+ void shutdown(void) {
DigitalOut pwm_(oscillator_pin);
pwm_.write(1);
freq = 0;
measure();
- while(voltage > safe_voltage){
+ while(voltage > safe_voltage) {
measure();
wait(1);
- }
}
-
- float get_voltage(void){
+ }
+
+ float get_voltage(void) {
measure();
- return voltage;
+ return voltage;
+ }
+
+ int *get_hvparams(void) {
+ return hvparams;
}
-
- int *get_hvparams(void){ return hvparams; }
-
- int get_frequency(void){ return freq; }
+
+ int get_frequency(void) {
+ return freq;
+ }
};
\ No newline at end of file
--- a/main.cpp Sat Oct 08 13:34:52 2016 +0000
+++ b/main.cpp Wed Dec 21 15:34:09 2016 +0000
@@ -1,44 +1,42 @@
#include "mbed.h"
#include "hvcontrol.cpp"
#include "detection.cpp"
-#include <queue>
+//#include <queue>
+#include "NOKIA_5110.h"
//set the frequency of the oscillators below
-int f1 = 4300;
-int f2 = 4350;
+int f1 = 3600; //3500;
+int f2 = 3497;
//set the coincidence times in us below
-int coincidence_wait = 150;
-bool buzzer = 1;
+int coincidence_wait = 50; //150;
+bool buzzer = 0;
/* NO USER CONFIGURABLE OPTIONS BELOW
*/
//typically around 2 min data
//assuming normal background
-#define DETECTION_MEMORY_LIMIT 128
+#define DETECTION_MEMORY_LIMIT 32 //128
//doesn't log the GM hits with a timestamp
//only counts them when set to 1
-#define DETECT_MUONS_ONLY 0
-
-//set the coincidence time window in us
+#define DETECT_MUONS_ONLY 1
bool mdet = 0;
-
-
-volatile int muon_total;
-volatile int gm1_total;
-volatile int gm2_total;
+/*volatile*/ int muon_total;
+/*volatile*/ int gm1_total;
+/*volatile*/ int gm2_total;
+int minutes = 0; //global minutes counter
//storing a detections in a FIFO queue
-queue<Detection> detections;
+//queue<Detection> detections;
//High voltage controls
HVControl hv1(PA_3, PA_0);
HVControl hv2(PB_1, PA_1);
-Serial rpi(PA_9,PA_10);
+//Serial rpi(PA_9,PA_10);
Timer coincidence_timer;
Timer main_t;
@@ -47,7 +45,7 @@
// Ticker debug;
Ticker hv1monitor;
Ticker hv2monitor;
-Ticker memory_checker;
+//Ticker memory_checker;
DigitalOut led(LED1);
DigitalOut GM1_led(PA_12);
@@ -63,148 +61,257 @@
volatile float v2 = 0;
//ui functions
-void reset_counters (void){
+void reset_counters (void)
+{
muon_total = 0;
gm1_total = 0;
gm2_total = 0;
- }
-
-void muon_buzz(void){
+}
+
+void muon_buzz(void)
+{
C_led = 1;
-
- if(buzzer){
- for(int i = 0; i < 32; i++){
- Buzzer = !Buzzer;
- wait(0.002);
- }} else {
- wait(0.05);
- }
-
- C_led = 0;
+
+ if(buzzer) {
+ for(int i = 0; i < 32; i++) {
+ Buzzer = !Buzzer;
+ wait(0.002);
+ }
+ } else {
+ wait(0.05);
}
-
-void GM1_buzz(void){
+ C_led = 0;
+}
+
+void GM1_buzz(void)
+{
GM1_led = 1;
- if(buzzer){
- for(int i = 0; i < 16; i++)
- { Buzzer = !Buzzer;
- wait(0.001);
- }} else {
- wait(0.05);
- }
- GM1_led = 0;
+ if(buzzer) {
+ for(int i = 0; i < 16; i++) {
+ Buzzer = !Buzzer;
+ wait(0.001);
+ }
+ } else {
+ wait(0.05);
}
-
-void GM2_buzz(void){
+ GM1_led = 0;
+}
+
+void GM2_buzz(void)
+{
GM2_led = 1;
- if(buzzer){
- for(int i = 0; i < 16; i++)
- { Buzzer = !Buzzer;
- wait(0.001);
- }} else {
- wait(0.05);
- }
- GM2_led = 0;
+ if(buzzer) {
+ for(int i = 0; i < 16; i++) {
+ Buzzer = !Buzzer;
+ wait(0.001);
+ }
+ } else {
+ wait(0.05);
}
-
-
+ GM2_led = 0;
+}
+
+
//adds a detection onto the queue
-void add_detection(int channel, float time){
- Detection* det = new Detection(channel, time);
- detections.push(*det);
- delete det;
- }
-
+void add_detection(int channel, float time)
+{
+ //Detection* det = new Detection(channel, time);
+ //detections.push(*det);
+ //delete det;
+}
+
//callback for GM1 detection
-void GM1_hit(void){
+void GM1_hit(void)
+{
coincidence_timer.start();
- while(coincidence_timer.read_us() < coincidence_wait){
- if(GM2 == 0){
- add_detection(3, main_t.read());
+ while(coincidence_timer.read_us() < coincidence_wait) {
+ if(GM2 == 0 && !mdet) {
+ add_detection(3, main_t.read_us());
muon_buzz();
muon_total++;
gm2_total++;
mdet = 1;
- }
+ }
wait(1e-7);
- }
+ }
coincidence_timer.stop();
coincidence_timer.reset();
if(mdet == 0) GM1_buzz();
if ( !DETECT_MUONS_ONLY ) add_detection(1, main_t.read());
gm1_total++;
mdet = 0;
- }
+}
//callback for GM2 detection
-void GM2_hit(void){
- coincidence_timer.start();
- while(coincidence_timer.read_us() < coincidence_wait){
- if(GM1 == 0){
+void GM2_hit(void)
+{
+ coincidence_timer.start();
+ while(coincidence_timer.read_us() < coincidence_wait) {
+ if(GM1 == 0 && !mdet) {
add_detection(3, main_t.read());
muon_buzz();
muon_total++;
gm1_total++;
mdet = 1;
- }
+ }
wait(1e-7);
- }
+ }
coincidence_timer.stop();
- coincidence_timer.reset();
+ coincidence_timer.reset();
if(mdet == 0) GM2_buzz();
if ( !DETECT_MUONS_ONLY ) add_detection(2, main_t.read());
gm2_total++;
mdet = 0;
- }
-
+}
+
// high voltage software monitors
-void hv1monitor_(void){
- if(hv1.measure()){
- if(v1 - hv1.get_voltage() > 100){ hv1.shutdown(); } //unusual voltage drop detected
- }else{ hv1.shutdown(); }
+void hv1monitor_(void)
+{
+ if(hv1.measure()) {
+ if(v1 - hv1.get_voltage() > 100) {
+ hv1.shutdown(); //unusual voltage drop detected
+ }
+ } else {
+ hv1.shutdown();
+ }
v1 = hv1.get_voltage();
- }
+}
-void hv2monitor_(void){
- if(hv2.measure()){
- if(v2 - hv2.get_voltage() > 100){ hv2.shutdown(); } //unusual voltage drop detected
- }else{ hv2.shutdown(); }
+void hv2monitor_(void)
+{
+ if(hv2.measure()) {
+ if(v2 - hv2.get_voltage() > 100) {
+ hv2.shutdown(); //unusual voltage drop detected
+ }
+ } else {
+ hv2.shutdown();
+ }
v2 = hv2.get_voltage();
- }
+}
//discarding older items if buffer gets too big
-void memory_checker_(void){
- if ( detections.size() > (DETECTION_MEMORY_LIMIT - (DETECTION_MEMORY_LIMIT/8)) ){
- while ( detections.size() > (DETECTION_MEMORY_LIMIT - (DETECTION_MEMORY_LIMIT/4)) ){
- detections.pop();
- }
- }
- }
-
-
-int main() {
-//start main timer
-main_t.start();
+//void memory_checker_(void)
+//{
+// if ( detections.size() > (DETECTION_MEMORY_LIMIT - (DETECTION_MEMORY_LIMIT/8)) ) {
+// while ( detections.size() > (DETECTION_MEMORY_LIMIT - (DETECTION_MEMORY_LIMIT/4)) ) {
+// detections.pop();
+// }
+// }
+//}
-hv1.set_frequency(f1);
-hv2.set_frequency(f2);
-GM1.fall(&GM1_hit);
-GM2.fall(&GM2_hit);
+char* itoa(int value, char* result, int base)
+{
+ // check that the base if valid
+ if ( base < 2 || base > 36 ) {
+ *result = '\0';
+ return result;
+ }
+
+ char* ptr = result, *ptr1 = result, tmp_char;
+ int tmp_value;
+
+ do {
+ tmp_value = value;
+ value /= base;
+ *ptr++ = "zyxwvutsrqponmlkjihgfedcba9876543210123456789abcdefghijklmnopqrstuvwxyz"[35 + (tmp_value - value * base)];
+ } while ( value );
+
+ // Apply negative sign
+ if ( tmp_value < 0 )
+ *ptr++ = '-';
+ *ptr-- = '\0';
+
+ while ( ptr1 < ptr ) {
+ tmp_char = *ptr;
+ *ptr-- = *ptr1;
+ *ptr1++ = tmp_char;
+ }
+
+ return result;
+}
+
+int main()
+{
+ //start main timer
+ pc.baud(230400);
+ main_t.start();
+ LcdPins myPins;
+
+ myPins.rst = PA_6;
+ myPins.sce = PA_4;
+ myPins.dc = PB_4;
+ myPins.mosi = PA_7;//SPI_MOSI;
+ myPins.miso = NC;
+ myPins.sclk = PA_5;//SPI_SCK;
-//tickers to monitor the high voltage
-hv1monitor.attach(&hv1monitor_, 0.1);
-hv2monitor.attach(&hv2monitor_, 0.1);
+ // Start the LCD
+ NokiaLcd myLcd( myPins );
+ myLcd.InitLcd(); // LCD is reset and DDRAM is cleared
+ myLcd.DrawString("MUON HUNTER V2");
+ myLcd.SetXY(0,1);
+ myLcd.DrawString("TIME ");
+ myLcd.SetXY(0,3);
+ myLcd.DrawString("MUON COUNT");
+ myLcd.SetXY(0,4);
+ myLcd.DrawString("GM1 COUNT");
+ myLcd.SetXY(0,5);
+ myLcd.DrawString("GM2 COUNT");
+
+ hv1.set_frequency(f1);
+ hv2.set_frequency(f2);
+ GM1.fall(&GM1_hit);
+ GM2.fall(&GM2_hit);
+ //tickers to monitor the high voltage
+ hv1monitor.attach(&hv1monitor_, 0.1);
+ hv2monitor.attach(&hv2monitor_, 0.1);
+
+ char number[10];
+
+ //ticker to monitor memory usage
+ //memory_checker.attach(&memory_checker_, 0.2);
+ while(1) {
-//ticker to monitor memory usage
-memory_checker.attach(&memory_checker_, 0.2);
- while(1){
- while(!detections.empty()){
- Detection temp = detections.front();
- pc.printf("Ch: %d, Time: %.2fs, V1: %.1fV, V2: %.1fV \n\r", temp.channel, temp.time, v1, v2);
- pc.printf("Total GM1: %d, Total GM2: %d, Total Coinc: %d \n\r \n\r", gm1_total, gm2_total, muon_total);
- detections.pop();
- }
+ myLcd.SetXY(5*6,1);
+ unsigned int seconds = (int) main_t.read();
+ //int minutes = (seconds/60);
+ if (seconds >= 60) {
+ main_t.reset();
+ minutes++;
+ }
+ if (minutes < 10)
+ myLcd.DrawChar('0');
+ itoa(minutes, number, 10);
+ myLcd.DrawString(number);
+ myLcd.DrawChar(':');
+ if ((seconds%60) < 10)
+ myLcd.DrawChar('0');
+ itoa(seconds%60, number,10);
+ myLcd.DrawString(number);
+
+ myLcd.SetXY(11*6,3);
+ itoa(muon_total, number, 10);
+ myLcd.DrawString(number);
+
+ myLcd.SetXY(11*6,4);
+ itoa(gm1_total, number, 10);
+ myLcd.DrawString(number);
+
+ myLcd.SetXY(11*6,5);
+ itoa(gm2_total, number, 10);
+ myLcd.DrawString(number);
+
+
+// while(!detections.empty()){
+// Detection temp = detections.front();
+//
+// pc.printf("Ch: %d, Time: %.2fs, V1: %.1fV, V2: %.1fV \n\r", temp.channel, temp.time, v1, v2);
+// pc.printf("Total GM1: %d, Total GM2: %d, Total Coinc: %d \n\r \n\r", gm1_total, gm2_total, muon_total);
+// detections.pop();
+// }
+
+ pc.printf("%.fs, GM1: %d, GM2: %d, Muons: %d \n\r", main_t.read(), gm1_total, gm2_total, muon_total);
+ pc.printf("V1: %.1fV, V2: %.1fV \n\r", v1, v2);
wait(1);
- }
+ }
}
\ No newline at end of file