From 36a44f9372307925936e88e9349e2422d557b415 Mon Sep 17 00:00:00 2001 From: Michael Dryden Date: Mon, 10 Nov 2014 17:34:53 -0500 Subject: [PATCH] Set default ADS1255 multiplexer settings depending on board version. --- DSTAT-temp/src/ads1255.c | 8 +++++++- DSTAT1.atsuo | Bin 57344 -> 57344 bytes 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/DSTAT-temp/src/ads1255.c b/DSTAT-temp/src/ads1255.c index d0ba56f..80bfd51 100644 --- a/DSTAT-temp/src/ads1255.c +++ b/DSTAT-temp/src/ads1255.c @@ -86,7 +86,13 @@ void ads1255_reset(){ } void ads1255_setup(uint8_t buff, uint8_t rate, uint8_t pga){ - uint8_t command_buffer[6] = {0x50,0x03,buff,0x01,pga,rate}; + #if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR == 1 + uint8_t command_buffer[6] = {0x50,0x03,buff,0x01,pga,rate}; // write reg 0, write 4 registers, analog buffer, MUX AIN0-AIN1, pga, rate + #endif + + #if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR == 2 + uint8_t command_buffer[6] = {0x50,0x03,buff,0x08,pga,rate}; // write reg 0, write 4 registers, analog buffer, MUX AIN0-AINCOM, pga, rate + #endif usart_spi_select_device(&USARTE1, &spi_device_conf); usart_spi_transmit(&USARTE1, ADS_SDATAC); diff --git a/DSTAT1.atsuo b/DSTAT1.atsuo index e91b2415d9e92234cf3de6d895d7b6ac3c1e4e39..bc336d114d679c8f911ab15af332082573992a49 100644 GIT binary patch delta 1092 zcmaKrT}TvB6vyXl*J+)#-CT7wwY6-Qs7xjL5W_`9Otal&1-DW+h$brtW1xDeQNs-U z%6|{N6yal;saLWOsM%D^vXUsGNXUoip_hz#sp#X5iH!&y80PZ(|L-~XoI9gxysGj2 z#{?@gkkXm-6DNe1QU=2?JbixCfK$wbnj(->mSC)CH&fja5)F$Hb2h~purqPgl47zE z-5KEQY$-)6O&E$RDB0%0LI&Lx5|=M>B?K`lWD`AM$|@PQ6(*JFsR14%LJky9Q1VbE z(WFB6Oi5)FB$y!4GXere(sn@g7TH-BmE0y7x;H4LQ;=qcijVeX6z5Eo=)M=6k*RzA zh@D+Vm9>l1^#Q6HN6QKrZ=z?th_N$H>hUe|ZJFYwRg~l{qIsWU9d9Lu*+|D}R5pTq zE_u#7H_aaYC|5Nn%@(&z9B3)IpMZ;%@t7`K!}^d@5k+sg2%&dN&n^~&)L9!VrcV8j0CJxtR8zK?c zlJU&mlllLRhn`=C9A^y9Li2VYx>v@RhZ{(b_L66t=H$qj2g>L-L5yc)t0)J*_t_Bri|r7QS@i1#LCvDO|sgYMKsG0j7wxxPU=BQ zgZxJL(33?k{ac+flc=dB{Z~eRpi+v09(u@!`_O{^oT~+ALdEGoBc*keaXg9 zqL}@>Q8S;SdA75f+}O>Uy(`?W@HJ(cXNEEoAPtX%@7C}8kX!H_08{irZ4A&PU9S8t#!9#!2$ zDWUywbEr2b&F`XN%%g;7C{bLa8AfgfMb0$5bWAW5QnDhAuK29S*&0c@aJR6t_@+KZ zzN~#Nm`gT)4Ii2u(D(oN`2NVNzSb<9s>#Cm`T|tz>(E>kg6!MSyMa5GxXfMO7~_z* zavS`CkQ#Yhj6O+;IT~0h(WC4}oZ{1m$SREE| zBNQVm>m3}FNDK{;(?o7?h+HT2Zbwhl&Gle=qz#^OE8J0$J4qfz+vZAEHVwHwsF%ta z0;Mx3RWLvor4Q%O+Eq36WmPf~QMybv?mWyxhw-z#2+ckb+Nu#EU%szysS&QYmFvLZ zmI&>|#mV?k--JY&mh{Ds@U)Moy*GH6>P!D=NA}sf`@PaErWWM>pp?r3g@SAr$hTi0 z)L@+oLK)a8{67c`ZjB-@JQEYcxjHqE7~NzPllN?-H<1+ZY3Puyk>Uch+&@8L50>f3 zt|ulQw;o@G_32TPdUjDXk5I$kp&p)9xb&_IzGua#-(x}h%Qu`8`PwX8+kFhFKXltG Z1KgPsS^K(7$S!*76PtzQ5D -- GitLab