]> git.cryptolib.org Git - labortage2013badge.git/commitdiff
removing temperature feature
authorbg <daniel.otte@rub.de>
Sat, 19 Oct 2013 03:41:55 +0000 (05:41 +0200)
committerbg <daniel.otte@rub.de>
Sat, 19 Oct 2013 03:41:55 +0000 (05:41 +0200)
firmware/main.c

index 10183973c8b8b5a5552b3fa5df41f095339eaebf..056a7628228f059bbc145d2b7c10f2aeed42046a 100644 (file)
@@ -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! */