diff --git a/firmware/shared/softtimer.h b/firmware/shared/softtimer.h index 9df270e..936eb26 100644 --- a/firmware/shared/softtimer.h +++ b/firmware/shared/softtimer.h @@ -19,7 +19,7 @@ void softtimer_reset(uint8_t timernum); uint8_t softtimer(uint8_t timernum, uint16_t interval); // SOFTTIMER( , ); -#define SOFTTIMER(n,a) if(softtimer((n),(a*8))) +#define SOFTTIMER(n,a) if(softtimer((n),(a*4))) #endif diff --git a/firmware/slavechip/i2c_simple.c b/firmware/slavechip/i2c_simple.c index ca0a497..8e56ae9 100644 --- a/firmware/slavechip/i2c_simple.c +++ b/firmware/slavechip/i2c_simple.c @@ -7,7 +7,7 @@ void i2c_init() { - TWBR = 0;//bit rate + TWBR = 32;//bit rate TWSR = 0;//Prescaler TWAR = 0x80;//our address 1000 000, don't listen to general call diff --git a/firmware/slavechip/main.c b/firmware/slavechip/main.c index 2f5f80a..21bd302 100644 --- a/firmware/slavechip/main.c +++ b/firmware/slavechip/main.c @@ -1,6 +1,8 @@ #include "main.h" #include "spi.h" #include "muxer.h" +#include "i2c_simple.h" +#include "mcp_adc.h" uint8_t foo; uint16_t bar; @@ -33,12 +35,16 @@ void hardinit() { spi_init(); muxer_init(); + + i2c_init(); sei(); } void softinit() { + mcpadc_init(ADC_GAIN_2|ADC_CONV_SINGLE|ADC_BITS_16); + } @@ -48,6 +54,8 @@ int __attribute__((noreturn)) main(void) { foo = 0x87; bar= 0xfafa; + muxer_set(2); + for(;;){ SOFTTIMER(1,500) {