SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Pins-related cleanup, formatting

Browse source
This commit is contained in:
Scott Lahteine 2017-05-20 19:30:36 -05:00
parent ea906e4da7
commit 52e20aeab3
6 changed files with 17 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/pinsDebug.h
View file

@ -357,7 +357,7 @@ static void pwm_details(uint8_t pin) {
// on pins that have two PWMs, print info on second PWM // on pins that have two PWMs, print info on second PWM
#if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY #if AVR_ATmega2560_FAMILY || AVR_AT90USB1286_FAMILY
// looking for port B7 - PWMs 0A and 1C // looking for port B7 - PWMs 0A and 1C
if ( ('B' == digitalPinToPort(pin) + 64) && (0x80 == digitalPinToBitMask(pin))) { if (digitalPinToPort(pin) == 2 && digitalPinToBitMask(pin) == 0x80) {
#ifndef TEENSYDUINO_IDE #ifndef TEENSYDUINO_IDE
SERIAL_PROTOCOLPGM("\n ."); SERIAL_PROTOCOLPGM("\n .");
SERIAL_PROTOCOL_SP(18); SERIAL_PROTOCOL_SP(18);

2
Marlin/pins_BRAINWAVE.h
View file

@ -41,7 +41,7 @@
* *
* "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share * "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
* the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such * the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
* that PWM1A, PWM1B & PWM1C can not be used. * that PWM1A, PWM1B & PWM1C can't be used.
* *
* Installation: * Installation:
* *

2
Marlin/pins_BRAINWAVE_PRO.h
View file

@ -63,7 +63,7 @@
* *
* "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share * "Marlin_AT90USB" makes PWM0A available rather than the usual PWM1C. These PWMs share
* the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such * the same physical pin. Marlin uses TIMER1 to generate interrupts and sets it up such
* that PWM1A, PWM1B & PWM1C can not be used. * that PWM1A, PWM1B & PWM1C can't be used.
* *
* Installation: * Installation:
* *

4
Marlin/pins_RUMBA.h
View file

@ -100,7 +100,7 @@
#endif #endif
#if TEMP_SENSOR_2 == -1 #if TEMP_SENSOR_2 == -1
#define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple) #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_BED is defined as thermocouple)
#else #else
#define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used) #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
#endif #endif
@ -109,7 +109,7 @@
//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used) //#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
#if TEMP_SENSOR_BED == -1 #if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple) #define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can't be used when TEMP_SENSOR_2 is defined as thermocouple)
#else #else
#define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used) #define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
#endif #endif

2
Marlin/pins_TEENSYLU.h
View file

@ -68,7 +68,7 @@
* *
* NOTE - the "Marlin_AT90USB" pin maps make PWM0A available rather than the usual PWM1C. * NOTE - the "Marlin_AT90USB" pin maps make PWM0A available rather than the usual PWM1C.
* These PWMs share the same physical pin. Marlin uses TIMER1 to generate * These PWMs share the same physical pin. Marlin uses TIMER1 to generate
* interrupts and sets it up such that PWM1A, PWM1B & PWM1C can not be used. * interrupts and sets it up such that PWM1A, PWM1B & PWM1C can't be used.
*/ */
/** /**

22
buildroot/share/pin_interrupt_test/pin_interrupt_test.ino
View file

@ -1,26 +1,26 @@
// Search pins uasable for endstop-interupts // Search pins usable for endstop-interrupts
// Compile with the same settings you'd use with Marlin. // Compile with the same build settings you'd use for Marlin.
#if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA) #if defined(ARDUINO_AVR_MEGA2560) || defined(ARDUINO_AVR_MEGA)
#undef digitalPinToPCICR #undef digitalPinToPCICR
#define digitalPinToPCICR(p) ( (((p) >= 10) && ((p) <= 15)) || \ #define digitalPinToPCICR(p) ( ((p) >= 10 && (p) <= 15) || \
(((p) >= 50) && ((p) <= 53)) || \ ((p) >= 50 && (p) <= 53) || \
(((p) >= 62) && ((p) <= 69)) ? (&PCICR) : ((uint8_t *)0) ) ((p) >= 62 && (p) <= 69) ? &PCICR : (uint8_t *)0)
#endif #endif
void setup() { void setup() {
Serial.begin(9600); Serial.begin(9600);
Serial.println("PINs causing interrups are:"); Serial.println("PINs causing interrups are:");
for(int i=2; i<NUM_DIGITAL_PINS; i++){ for (int i = 2; i < NUM_DIGITAL_PINS; i++) {
if( digitalPinToPCICR(i) != NULL || (int)digitalPinToInterrupt(i) != -1 ) { if (digitalPinToPCICR(i) || (int)digitalPinToInterrupt(i) != -1) {
for (int j= 0; j<NUM_ANALOG_INPUTS; j++){ for (int j = 0; j < NUM_ANALOG_INPUTS; j++) {
if(analogInputToDigitalPin(j) == i) { if (analogInputToDigitalPin(j) == i) {
Serial.print("A"); Serial.print('A');
Serial.print(j); Serial.print(j);
Serial.print(" = "); Serial.print(" = ");
} }
} }
Serial.print("D"); Serial.print('D');
Serial.println(i); Serial.println(i);
} }
} }