Bläddra i källkod

Better name for ADC macro

Scott Lahteine 10 år sedan
förälder
incheckning
aa9c1f1bed
1 ändrade filer med 8 tillägg och 8 borttagningar
  1. 8
    8
      Marlin/temperature.cpp

+ 8
- 8
Marlin/temperature.cpp Visa fil

1453
 
1453
 
1454
   #define SET_ADMUX_ADCSRA(pin) ADMUX = (1 << REFS0) | (pin & 0x07); ADCSRA |= 1<<ADSC
1454
   #define SET_ADMUX_ADCSRA(pin) ADMUX = (1 << REFS0) | (pin & 0x07); ADCSRA |= 1<<ADSC
1455
   #ifdef MUX5
1455
   #ifdef MUX5
1456
-    #define SET_ADCSRB(pin) if (pin > 7) ADCSRB = 1 << MUX5; else ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
1456
+    #define START_ADC(pin) if (pin > 7) ADCSRB = 1 << MUX5; else ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
1457
   #else
1457
   #else
1458
-    #define SET_ADCSRB(pin) ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
1458
+    #define START_ADC(pin) ADCSRB = 0; SET_ADMUX_ADCSRA(pin)
1459
   #endif
1459
   #endif
1460
 
1460
 
1461
   switch(temp_state) {
1461
   switch(temp_state) {
1462
     case PrepareTemp_0:
1462
     case PrepareTemp_0:
1463
       #if HAS_TEMP_0
1463
       #if HAS_TEMP_0
1464
-        SET_ADCSRB(TEMP_0_PIN);
1464
+        START_ADC(TEMP_0_PIN);
1465
       #endif
1465
       #endif
1466
       lcd_buttons_update();
1466
       lcd_buttons_update();
1467
       temp_state = MeasureTemp_0;
1467
       temp_state = MeasureTemp_0;
1474
       break;
1474
       break;
1475
     case PrepareTemp_BED:
1475
     case PrepareTemp_BED:
1476
       #if HAS_TEMP_BED
1476
       #if HAS_TEMP_BED
1477
-        SET_ADCSRB(TEMP_BED_PIN);
1477
+        START_ADC(TEMP_BED_PIN);
1478
       #endif
1478
       #endif
1479
       lcd_buttons_update();
1479
       lcd_buttons_update();
1480
       temp_state = MeasureTemp_BED;
1480
       temp_state = MeasureTemp_BED;
1487
       break;
1487
       break;
1488
     case PrepareTemp_1:
1488
     case PrepareTemp_1:
1489
       #if HAS_TEMP_1
1489
       #if HAS_TEMP_1
1490
-        SET_ADCSRB(TEMP_1_PIN);
1490
+        START_ADC(TEMP_1_PIN);
1491
       #endif
1491
       #endif
1492
       lcd_buttons_update();
1492
       lcd_buttons_update();
1493
       temp_state = MeasureTemp_1;
1493
       temp_state = MeasureTemp_1;
1500
       break;
1500
       break;
1501
     case PrepareTemp_2:
1501
     case PrepareTemp_2:
1502
       #if HAS_TEMP_2
1502
       #if HAS_TEMP_2
1503
-        SET_ADCSRB(TEMP_2_PIN);
1503
+        START_ADC(TEMP_2_PIN);
1504
       #endif
1504
       #endif
1505
       lcd_buttons_update();
1505
       lcd_buttons_update();
1506
       temp_state = MeasureTemp_2;
1506
       temp_state = MeasureTemp_2;
1513
       break;
1513
       break;
1514
     case PrepareTemp_3:
1514
     case PrepareTemp_3:
1515
       #if HAS_TEMP_3
1515
       #if HAS_TEMP_3
1516
-        SET_ADCSRB(TEMP_3_PIN);
1516
+        START_ADC(TEMP_3_PIN);
1517
       #endif
1517
       #endif
1518
       lcd_buttons_update();
1518
       lcd_buttons_update();
1519
       temp_state = MeasureTemp_3;
1519
       temp_state = MeasureTemp_3;
1526
       break;
1526
       break;
1527
     case Prepare_FILWIDTH:
1527
     case Prepare_FILWIDTH:
1528
       #if HAS_FILAMENT_SENSOR
1528
       #if HAS_FILAMENT_SENSOR
1529
-        SET_ADCSRB(FILWIDTH_PIN);
1529
+        START_ADC(FILWIDTH_PIN);
1530
       #endif
1530
       #endif
1531
       lcd_buttons_update();
1531
       lcd_buttons_update();
1532
       temp_state = Measure_FILWIDTH;
1532
       temp_state = Measure_FILWIDTH;

Laddar…
Avbryt
Spara