From: bg Date: Sat, 19 Oct 2013 03:41:55 +0000 (+0200) Subject: removing temperature feature X-Git-Url: https://git.cryptolib.org/?p=labortage2013badge.git;a=commitdiff_plain;h=3fab3abc63b0bed22742265a0998a3b3381da980 removing temperature feature --- diff --git a/firmware/main.c b/firmware/main.c index 1018397..056a762 100644 --- a/firmware/main.c +++ b/firmware/main.c @@ -261,20 +261,6 @@ int8_t button_get_debounced(volatile uint8_t debounce_count) { return v ? 0 : 1; } -static -void init_temperature_sensor(void){ - ADMUX = 0x8F; - ADCSRA = 0x87; -} - -static -uint16_t read_temperture_sensor(void){ - ADCSRA |= 0x40; - while(ADCSRA & 0x40) - ; - return ADC; -} - usbMsgLen_t usbFunctionSetup(uchar data[8]) { usbRequest_t *rq = (usbRequest_t *)data; @@ -385,10 +371,6 @@ usbMsgLen_t usbFunctionSetup(uchar data[8]) uni_buffer.w8[0] = button_get_debounced(25); usbMsgPtr = uni_buffer.w8; return 1; - case CUSTOM_RQ_READ_TMPSENS: - uni_buffer.w16[0] = read_temperture_sensor(); - usbMsgPtr = uni_buffer.w8; - return 2; } } @@ -523,7 +505,6 @@ int main(void) DDRB &= ~_BV(BUTTON_PIN); /* make button pin input */ PORTB |= _BV(BUTTON_PIN); /* turn on pull-up resistor */ - init_temperature_sensor(); counter_init(); usbInit(); usbDeviceDisconnect(); /* enforce re-enumeration, do this while interrupts are disabled! */