From 81a3b88b190319ae9a7ca80ff09595476c9b5f63 Mon Sep 17 00:00:00 2001 From: radhoo Date: Thu, 12 Apr 2018 13:41:09 +0300 Subject: [PATCH] added SBT10A --- .DS_Store | Bin 0 -> 6148 bytes code/.DS_Store | Bin 0 -> 10244 bytes code/geiger/detectors.cpp | 33 ++++++++++++++++++++++----------- code/geiger/detectors.h | 26 ++++++++++++++------------ pcb/.DS_Store | Bin 0 -> 6148 bytes pcb/1.2.105/.DS_Store | Bin 0 -> 6148 bytes 6 files changed, 36 insertions(+), 23 deletions(-) create mode 100644 .DS_Store create mode 100644 code/.DS_Store create mode 100644 pcb/.DS_Store create mode 100644 pcb/1.2.105/.DS_Store diff --git a/.DS_Store b/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..f98fcede18be3dd7f0e7c1e480afd3d53a756e76 GIT binary patch literal 6148 zcmeH~%}(4f5XWscEitGfNF1odAyN-qI4oaXxJ3)xDix6x94K9qChDe&Y?RHiht*2q z1^NIjS6beKK15%HduQwcK^JZabt{iF{`+IbNq&;;m@&qiy=0j&k1^(gqdHSiJYYDE zK4KHpYM`1_x!!jy+-DXrAVrw@lJ8@LBy@fDKQm7qdN!e+oawktuQ~ADl7nP|A zZ7G#QfKF>g@qU)}+uq!kl4X?1w9s>#IX)a@GEx1e>dB<5<7sjs-UPC)K?+y2z4^gl zWwXBIudHtjm;6Da0rj=jx5J@uUoWoief)Cv_1pLJiyuEPuMB+-o0Ya%(i`~&m0K96 zVIgxRKSLkJ*8ow@lJP~fj)*p&0uiD33(yTjtK&j|mVrAxE-!4~(-N=*o{a$R4?Z|* zKw25qTL%>S3IK|~5!#@RcL~h#NdwZ#D2#w{lL~55IbAWhNr!%);sVmjs7Ys>E+3qp z%;|>0_0wT~Uxzau7`3G(U`0Nm5DCjbBd literal 0 HcmV?d00001 diff --git a/code/.DS_Store b/code/.DS_Store new file mode 100644 index 0000000000000000000000000000000000000000..b6f6e98d2b5d05551468348de9ff7476fcdbf7bd GIT binary patch literal 10244 zcmeI1%Wl&^6o$_D(>6VwMlR>?vCxn(Q{1FUcN`pc!>zIC^^|KjzVx9{G6`1tAbm#=d7Ox+-Gy+Y&LZxqLF zmc(gth&|kT9S$LcNR(M)G1(kb*S2cFbP7lXmWG(72rF$YsDS|0HERHM0%HZz5hBXr zRbwIby8Lb0spHUTpkP!WwIIP`S2Pxp%@J9ByN35jp{M}bfPDlMWA^Y}3L6WmCob^r zP7RF8F|9k)b z|9_FTOnV^$M4&=|X}j+35IcWG#wz0?RBvGCOEtjlO3bKY3Kpk+1Ym=QyGLxrHbijBcu7}_A}so;*#Y5pD}<-{{Puy-F5l@KLKs(Bb@*M literal 0 HcmV?d00001 diff --git a/code/geiger/detectors.cpp b/code/geiger/detectors.cpp index 61f7986..f9e21a0 100644 --- 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 index ffe73ba..b0d16a8 100644 --- a/code/geiger/detectors.h +++ b/code/geiger/detectors.h @@ -28,18 +28,20 @@ #include // 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 new file mode 100644 index 0000000000000000000000000000000000000000..5eaf1615d3f0e9c803c6fe599a92266f245ef99f GIT binary patch literal 6148 zcmeHK&2G~`5Z+A#@hU&SMRLlnt< zfj$83wb1t{55bFYXJ&VUC~1!%ie{wQZ+3om?QgAJFJp}Rleo*6%^0&l5gP)UTLj~% zOVThNM6Sl@GMBxGrsX)wma@t5FEW5@*J53^!Fr&-tY02M}MuSA|Wywh*UlsddmFUz# zo@bDt$_8O{kS5ciy}FajDokZksIm1J?+#NL=TkqQ$hcJbW^f_aJ?Sb+g(Zge+HBVA zyB(+3-=24zSs(4K&6o4Ju%15OeDnVJ^z765#pUNOSJ!$SIDE27o)}!fS1^8~fEc)k44AFVYTv_Wr$;6Rh=D)L0PYVCD57Vu)~L1)Xz=$D<4r^q zu<t+9+ZL4+qbEcwY@0FYL$?0#Nm0!x6(~73uR~} zNn!{PX%)}kjlx#doLWnG=0!YA#n^I;gT06cNvoVRdC(B?YH-Hp99|SSnZc^&bh~Yr ziVN1Fz1mr@+AAwiU$U1w9cIkT+dD^R7nfJpH@A2950CO2P*}2rO)7npC#ZZta_*)) zPWUPGVAe1>B_ROw(aYuT58_&~0a2;+9k{xHe1P?aRcpTyP!qry>$eBf&!Y)w0>4fG z*9Qvu?KFWOCGZMx Cc(u&{ literal 0 HcmV?d00001