← Back to branch summary

~ubuntu-branches/debian/experimental/arduino/experimental

« back to all changes in this revision

Viewing changes to hardware/arduino/cores/arduino/wiring_analog.c

  • Committer: Package Import Robot
  • Author(s): Scott Howard
  • Date: 2012-03-11 18:19:42 UTC
  • mfrom: (1.1.5) (5.1.14 sid)
  • Revision ID: package-import@ubuntu.com-20120311181942-be2clnbz1gcehixb
Tags: 1:1.0.1~rc1+dfsg-1
New upstream release, experimental.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hardware/arduino/cores/arduino/wiring_analog.c
43
43
 
44
44
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
45
45
        if (pin >= 54) pin -= 54; // allow for channel or pin numbers
 
46
#elif defined(__AVR_ATmega32U4__)
 
47
        if (pin >= 18) pin -= 18; // allow for channel or pin numbers
 
48
#elif defined(__AVR_ATmega1284__)
 
49
        if (pin >= 24) pin -= 24; // allow for channel or pin numbers
46
50
#else
47
51
        if (pin >= 14) pin -= 14; // allow for channel or pin numbers
48
52
#endif
49
 
 
50
 
#if defined(ADCSRB) && defined(MUX5)
 
53
        
 
54
#if defined(__AVR_ATmega32U4__)
 
55
        pin = analogPinToChannel(pin);
 
56
        ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
 
57
#elif defined(ADCSRB) && defined(MUX5)
51
58
        // the MUX5 bit of ADCSRB selects whether we're reading from channels
52
59
        // 0 to 7 (MUX5 low) or 8 to 15 (MUX5 high).
53
60
        ADCSRB = (ADCSRB & ~(1 << MUX5)) | (((pin >> 3) & 0x01) << MUX5);
222
229
                                OCR4C = val; // set pwm duty
223
230
                                break;
224
231
                        #endif
 
232
                                
 
233
                        #if defined(TCCR4A) && defined(COM4D1)
 
234
                        case TIMER4D:
 
235
                                // connect pwm to pin on timer 4, channel D
 
236
                                sbi(TCCR4A, COM4D1);
 
237
                                OCR4D = val; // set pwm duty
 
238
                                break;
 
239
                        #endif
225
240
 
226
241
                        #if defined(TCCR5A) && defined(COM5A1)
227
242
                        case TIMER5A: