added SBT10A

mnemocron · Apr 12, 2018 · 81a3b88 · 81a3b88
1 parent 12f5965
commit 81a3b88
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 23 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/code/.DS_Store b/code/.DS_Store
diff --git a/code/geiger/detectors.cpp b/code/geiger/detectors.cpp
@@ -29,17 +29,23 @@
 char *aux_detectorName(uint8_t param) {
  switch (param) {
  case GEIGER_TUBE_SBM20: return "SBM20";
- case GEIGER_TUBE_SI29BG:return "SI29BG";
+ case GEIGER_TUBE_SI29BG: return "SI29BG";
  case GEIGER_TUBE_SBM19: return "SBM19";
- case GEIGER_TUBE_STS5: return " STS5";
+ case GEIGER_TUBE_LND712: return "LND712";
+ case GEIGER_TUBE_SBM20M: return "SBM20M";
  case GEIGER_TUBE_SI22G: return "SI22G";
+ case GEIGER_TUBE_STS5: return "STS5";
  case GEIGER_TUBE_SI3BG: return "SI3BG";
  case GEIGER_TUBE_SBM21: return "SBM21";
- case GEIGER_TUBE_SI1G: return " SI1G";
+ case GEIGER_TUBE_SBT9: return "SBT9";
+ case GEIGER_TUBE_SI1G: return "SI1G";
+ case GEIGER_TUBE_SI8B: return "SI8B";
+ case GEIGER_TUBE_SBT10A: return "SBT10A";
  default: return "unknown";
  }
 }
 
+
 uint8_t getDetector(uint8_t param) {
  switch (param) {
  case 0x11: return GEIGER_TUBE_SBM20;
@@ -53,14 +59,19 @@ uint8_t getDetector(uint8_t param) {
 
 float aux_detectorFactor(uint8_t param) {
  switch (param) {
- case GEIGER_TUBE_SBM20: return 0.006315;
- case GEIGER_TUBE_SI29BG: return 0.010000;
- case GEIGER_TUBE_SBM19: return 0.001500;
- case GEIGER_TUBE_STS5: return 0.006666;
- case GEIGER_TUBE_SI22G: return 0.001714;
- case GEIGER_TUBE_SI3BG: return 0.631578;
- case GEIGER_TUBE_SBM21: return 0.048000;
- case GEIGER_TUBE_SI1G: return 0.006000;
+ case GEIGER_TUBE_SBM20: return 0.006315; // CPM 19
+ case GEIGER_TUBE_SI29BG: return 0.010000; // CPM 12
+ case GEIGER_TUBE_SBM19: return 0.001500; // CPM 80
+ case GEIGER_TUBE_LND712: return 0.005940; // CPM 20.20
+ case GEIGER_TUBE_SBM20M: return 0.013333; // CPM 9
+ case GEIGER_TUBE_SI22G: return 0.001714; // CPM 70
+ case GEIGER_TUBE_STS5: return 0.006666; // CPM 18
+ case GEIGER_TUBE_SI3BG: return 0.631578; // CPM 0.19
+ case GEIGER_TUBE_SBM21: return 0.048000; // CPM 2.5
+ case GEIGER_TUBE_SBT9: return 0.010900; // CPM 11
+ case GEIGER_TUBE_SI1G: return 0.006000; // CPM 20
+ case GEIGER_TUBE_SI8B: return 0.001108; // 
+ case GEIGER_TUBE_SBT10A: return 0.001105; // 
  default: 0;
  }
 }

diff --git a/code/geiger/detectors.h b/code/geiger/detectors.h
@@ -28,18 +28,20 @@
 #include <stdint.h>
 
 // define Radiation DETECTORS
-#define GEIGER_TUBE_UNKNOWN 0x0
-#define GEIGER_TUBE_SBM20 0x1
-#define GEIGER_TUBE_SI29BG 0x2
-#define GEIGER_TUBE_SBM19 0x3
-#define GEIGER_TUBE_LND712 0x4
-#define GEIGER_TUBE_SBM20M 0x5
-#define GEIGER_TUBE_SI22G 0x6
-#define GEIGER_TUBE_STS5 0x7
-#define GEIGER_TUBE_SI3BG 0x8
-#define GEIGER_TUBE_SBM21 0x9
-#define GEIGER_TUBE_SBT9 0xA
-#define GEIGER_TUBE_SI1G 0xB
+#define GEIGER_TUBE_UNKNOWN 0x0
+#define GEIGER_TUBE_SBM20 0x1
+#define GEIGER_TUBE_SI29BG 0x2
+#define GEIGER_TUBE_SBM19 0x3
+#define GEIGER_TUBE_LND712 0x4
+#define GEIGER_TUBE_SBM20M 0x5
+#define GEIGER_TUBE_SI22G 0x6
+#define GEIGER_TUBE_STS5 0x7
+#define GEIGER_TUBE_SI3BG 0x8
+#define GEIGER_TUBE_SBM21 0x9
+#define GEIGER_TUBE_SBT9 0xA
+#define GEIGER_TUBE_SI1G 0xB
+#define GEIGER_TUBE_SI8B 0xC
+#define GEIGER_TUBE_SBT10A 0xD
 
 
 char *aux_detectorName(uint8_t param);

diff --git a/pcb/.DS_Store b/pcb/.DS_Store
diff --git a/pcb/1.2.105/.DS_Store b/pcb/1.2.105/.DS_Store