diff --git a/g2core/board/gquintic/gquintic-c-pinout.h b/g2core/board/gquintic/gquintic-c-pinout.h index eaad3896..292f8ff5 100755 --- a/g2core/board/gquintic/gquintic-c-pinout.h +++ b/g2core/board/gquintic/gquintic-c-pinout.h @@ -65,6 +65,9 @@ * Please look in /platform/atmel_sam/motate_chip_pin_functions.h */ + +#include + // We don't have all of the inputs, so we have to indicate as much: #define INPUT1_AVAILABLE 1 #define INPUT2_AVAILABLE 1 @@ -85,7 +88,7 @@ #define XIO_HAS_SPI 0 #define XIO_HAS_I2C 0 -#define TEMPERATURE_OUTPUT_ON 1 // NO ADC yet +#define TEMPERATURE_OUTPUT_ON 0 // needs more testing // Some pins, if the PWM capability is turned on, it will cause timer conflicts. // So we have to explicitly enable them as PWM pins. @@ -120,11 +123,11 @@ namespace Motate { // _MAKE_MOTATE_PIN(kLED_RGBWPixelPinNumber, 'A', 0); // -_MAKE_MOTATE_PIN(kHeaterOutput1_PinNumber, 'A', 1); // TC 0,1 -_MAKE_MOTATE_PIN(kHeaterOutput2_PinNumber, 'A', 2); // PWM 0,1 +_MAKE_MOTATE_PIN(kOutput1_PinNumber, 'A', 1); // TC 0,1 +_MAKE_MOTATE_PIN(kOutput2_PinNumber, 'A', 2); // PWM 0,1 _MAKE_MOTATE_PIN(kI2C1_SDAPinNumber, 'A', 3); // _MAKE_MOTATE_PIN(kI2C1_SCLPinNumber, 'A', 4); // -_MAKE_MOTATE_PIN(kHeaterOutput11_PinNumber, 'A', 5); // PWM 1,3 +_MAKE_MOTATE_PIN(kOutput11_PinNumber, 'A', 5); // PWM 1,3 _MAKE_MOTATE_PIN(kExternalClock1_PinNumber, 'A', 6); // CPU_CLK _MAKE_MOTATE_PIN(kOutput7_PinNumber, 'A', 7); // PWM 0,3 _MAKE_MOTATE_PIN(kSerial_RTSPinNumber, 'A', 8); // @@ -136,25 +139,25 @@ _MAKE_MOTATE_PIN(kOutput8_PinNumber, 'A', 13); // PWM 0,2 _MAKE_MOTATE_PIN(kSocket1_StepPinNumber, 'A', 14); // _MAKE_MOTATE_PIN(kOutput3_PinNumber, 'A', 15); // TC 1,0 _MAKE_MOTATE_PIN(kOutput4_PinNumber, 'A', 16); // TC 1,1 -_MAKE_MOTATE_PIN(kADC2_Neg_PinNumber, 'A', 17); // AFEC0,6 -_MAKE_MOTATE_PIN(kADC2_Pos_PinNumber, 'A', 18); // AFEC0,7 -_MAKE_MOTATE_PIN(kADC1_Neg_PinNumber, 'A', 19); // AFEC0,8 -_MAKE_MOTATE_PIN(kADC1_Pos_PinNumber, 'A', 20); // AFEC0,9 -_MAKE_MOTATE_PIN(kADC3_Pos_PinNumber, 'A', 21); // AFEC0,1 +_MAKE_MOTATE_PIN(kADC4_PinNumber, 'A', 17); // AFEC0,6 +_MAKE_MOTATE_PIN(kADC3_PinNumber, 'A', 18); // AFEC0,7 +_MAKE_MOTATE_PIN(kADC2_PinNumber, 'A', 19); // AFEC0,8 +_MAKE_MOTATE_PIN(kADC1_PinNumber, 'A', 20); // AFEC0,9 +_MAKE_MOTATE_PIN(kUnassigned1, 'A', 21); // AFEC0,1 _MAKE_MOTATE_PIN(kSocket1_EnablePinNumber, 'A', 22); // -//_MAKE_MOTATE_PIN(kOutput10_PinNumber, 'A', 23); // PWM 1,2 -_MAKE_MOTATE_PIN(kServo1_PinNumber, 'A', 23); // +_MAKE_MOTATE_PIN(kOutput10_PinNumber, 'A', 23); // PWM 1,2 +// _MAKE_MOTATE_PIN(kServo1_PinNumber, 'A', 23); // _MAKE_MOTATE_PIN(kSocket3_EnablePinNumber, 'A', 24); // _MAKE_MOTATE_PIN(kSocket2_DirPinNumber, 'A', 25); // _MAKE_MOTATE_PIN(kOutput5_PinNumber, 'A', 26); // TC 2,0 _MAKE_MOTATE_PIN(kSocket3_DirPinNumber, 'A', 27); // On Timer 2! -_MAKE_MOTATE_PIN(kUnassigned1, 'A', 28); // DIAG1 -_MAKE_MOTATE_PIN(kUnassigned2, 'A', 29); // NO PHYSICAL PIN +_MAKE_MOTATE_PIN(kUnassigned2, 'A', 28); // DIAG1 +_MAKE_MOTATE_PIN(kUnassigned3, 'A', 29); // NO PHYSICAL PIN _MAKE_MOTATE_PIN(kInput1_PinNumber, 'A', 30); // _MAKE_MOTATE_PIN(kInput4_PinNumber, 'A', 31); // _MAKE_MOTATE_PIN(kSerial_CTSPinNumber, 'B', 0); // -_MAKE_MOTATE_PIN(kUnassigned9, 'B', 1); // AFEC1,0 - was kADC3_Neg_PinNumber, now INTERRUPT_OUT +_MAKE_MOTATE_PIN(kUnassigned4, 'B', 1); // AFEC1,0 _MAKE_MOTATE_PIN(kSocket1_SPISlaveSelectPinNumber, 'B', 2); // _MAKE_MOTATE_PIN(kOutputSAFE_PinNumber, 'B', 3); // //_MAKE_MOTATE_PIN( , 'B', 4); // TDI @@ -167,10 +170,10 @@ _MAKE_MOTATE_PIN(kOutputSAFE_PinNumber, 'B', 3); // //_MAKE_MOTATE_PIN( , 'B', 11); // USB_D+ //_MAKE_MOTATE_PIN( , 'B', 12); // ERASE _MAKE_MOTATE_PIN(kLED_USBRXPinNumber, 'B', 13); // LED_1 (Heartbeat) - PWM2 -_MAKE_MOTATE_PIN(kSocket4_SPISlaveSelectPinNumber, 'B', 14); // NOT CONNECTED +_MAKE_MOTATE_PIN(kUnassigned5, 'B', 14); // NOT CONNECTED -_MAKE_MOTATE_PIN(kUSBVBUS_PinNumber 'D', 0); // USB_VBUS +_MAKE_MOTATE_PIN(kUSBVBUS_PinNumber, 'D', 0); // USB_VBUS _MAKE_MOTATE_PIN(kInput9_PinNumber, 'D', 1); // _MAKE_MOTATE_PIN(kInput10_PinNumber, 'D', 2); // _MAKE_MOTATE_PIN(kInput8_PinNumber, 'D', 3); // @@ -180,28 +183,28 @@ _MAKE_MOTATE_PIN(kInput5_PinNumber, 'D', 6); // _MAKE_MOTATE_PIN(kInput3_PinNumber, 'D', 7); // _MAKE_MOTATE_PIN(kInput2_PinNumber, 'D', 8); // ] _MAKE_MOTATE_PIN(kTMC2130_DIAG0_pinNumber, 'D', 9); // DIAG0 -_MAKE_MOTATE_PIN(kUnassigned4, 'D', 10); // +_MAKE_MOTATE_PIN(kUnassigned6, 'D', 10); // _MAKE_MOTATE_PIN(kSocket5_StepPinNumber, 'D', 11); // _MAKE_MOTATE_PIN(kSocket3_SPISlaveSelectPinNumber, 'D', 12); // _MAKE_MOTATE_PIN(kSocket5_DirPinNumber, 'D', 13); // _MAKE_MOTATE_PIN(kSocket5_EnablePinNumber, 'D', 14); // -_MAKE_MOTATE_PIN(kUnassigned5, 'D', 15); // +_MAKE_MOTATE_PIN(kUnassigned7, 'D', 15); // _MAKE_MOTATE_PIN(kSocket4_StepPinNumber, 'D', 16); // _MAKE_MOTATE_PIN(kSocket4_DirPinNumber, 'D', 17); // _MAKE_MOTATE_PIN(kSocket3_StepPinNumber, 'D', 18); // -_MAKE_MOTATE_PIN(kUnassigned6, 'D', 19); // +_MAKE_MOTATE_PIN(kUnassigned8, 'D', 19); // _MAKE_MOTATE_PIN(kSPI0_MISOPinNumber, 'D', 20); // _MAKE_MOTATE_PIN(kSPI0_MOSIPinNumber, 'D', 21); // _MAKE_MOTATE_PIN(kSPI0_SCKPinNumber, 'D', 22); // -_MAKE_MOTATE_PIN(kUnassigned7, 'D', 23); // NO PHYSICAL PIN +_MAKE_MOTATE_PIN(kUnassigned9, 'D', 23); // NO PHYSICAL PIN _MAKE_MOTATE_PIN(kSocket2_StepPinNumber, 'D', 24); // _MAKE_MOTATE_PIN(kSocket2_SPISlaveSelectPinNumber, 'D', 25); // _MAKE_MOTATE_PIN(kOutput9_PinNumber, 'D', 26); // PWM 2 _MAKE_MOTATE_PIN(kSocket1_DirPinNumber, 'D', 27); // _MAKE_MOTATE_PIN(kSocket4_EnablePinNumber, 'D', 28); // -_MAKE_MOTATE_PIN(kUnassigned8, 'D', 29); // NO PHYSICAL PIN -_MAKE_MOTATE_PIN(kADC3_Neg_PinNumber, 'D', 30); // AFEC0,0 - was INTERRUPT_OUT -_MAKE_MOTATE_PIN(kUnassigned10, 'D', 31); // +_MAKE_MOTATE_PIN(kUnassigned10, 'D', 29); // NO PHYSICAL PIN +_MAKE_MOTATE_PIN(kUnassigned11, 'D', 30); // AFEC0,0 - was INTERRUPT_OUT +_MAKE_MOTATE_PIN(kUnassigned12, 'D', 31); // } // namespace Motate