From afaeee22ac9993a282b7854b83b90087ebecf9bc Mon Sep 17 00:00:00 2001 From: Cristian Maglie Date: Fri, 27 Apr 2012 14:25:57 +0200 Subject: [PATCH] [sam] Fixed pinout for Serial4. Fixed keywords. Recompiled shipped libsam binary --- build/shared/lib/keywords.txt | 1 + .../arduino_due_x/libsam_sam3x8e_gcc_rel.a | Bin 58042 -> 58042 bytes .../libsam_sam3x8e_gcc_rel.a.txt | 60 +++++++++--------- .../sam/variants/arduino_due_x/variant.cpp | 14 ++-- 4 files changed, 38 insertions(+), 37 deletions(-) diff --git a/build/shared/lib/keywords.txt b/build/shared/lib/keywords.txt index 730de4e75..e69248cfb 100644 --- a/build/shared/lib/keywords.txt +++ b/build/shared/lib/keywords.txt @@ -164,6 +164,7 @@ Serial KEYWORD3 Serial Serial1 KEYWORD3 Serial Serial2 KEYWORD3 Serial Serial3 KEYWORD3 Serial +Serial4 KEYWORD3 Serial begin KEYWORD2 Serial_Begin end KEYWORD2 Serial_End peek KEYWORD2 Serial_Peek diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a index db4a697f6dcf19eee0e05544979262f97398c337..a4074053f20d58000830479902685325541622eb 100644 GIT binary patch delta 3025 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 diff --git a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt index b102bde18..480bd2f87 100644 --- a/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt +++ b/hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt @@ -24,7 +24,7 @@ pmc.o: 00000000 T PMC_IsPeripheralEnabled pwmc.o: -00000000 r C.9.6844 +00000000 r C.9.6937 00000000 t FindClockConfiguration 00000000 T PWMC_ConfigureChannel 00000000 T PWMC_ConfigureChannelExt @@ -52,14 +52,14 @@ pwmc.o: 00000000 T PWMC_SetSyncChannelUpdateUnlock 00000000 T PWMC_WriteBuffer U __assert_func -00000000 r __func__.5653 -00000000 r __func__.5664 -00000000 r __func__.5679 -00000000 r __func__.5690 -00000000 r __func__.5701 -00000000 r __func__.5708 -00000000 r __func__.5792 -00000000 r __func__.5798 +00000000 r __func__.5717 +00000000 r __func__.5728 +00000000 r __func__.5743 +00000000 r __func__.5754 +00000000 r __func__.5765 +00000000 r __func__.5772 +00000000 r __func__.5856 +00000000 r __func__.5862 rtc.o: 00000000 T RTC_ClearSCCR @@ -75,9 +75,9 @@ rtc.o: 00000000 T RTC_SetTime 00000000 T RTC_SetTimeAlarm U __assert_func -00000000 r __func__.5650 -00000000 r __func__.5659 -00000000 r __func__.5664 +00000000 r __func__.5714 +00000000 r __func__.5723 +00000000 r __func__.5728 rtt.o: 00000000 T RTT_EnableIT @@ -86,8 +86,8 @@ rtt.o: 00000000 T RTT_SetAlarm 00000000 T RTT_SetPrescaler U __assert_func -00000000 r __func__.5657 -00000000 r __func__.5665 +00000000 r __func__.5721 +00000000 r __func__.5729 spi.o: U PMC_EnablePeripheral @@ -108,9 +108,9 @@ tc.o: 00000000 T TC_Start 00000000 T TC_Stop U __assert_func -00000000 r __func__.5652 -00000000 r __func__.5658 -00000000 r __func__.5664 +00000000 r __func__.5716 +00000000 r __func__.5722 +00000000 r __func__.5728 timetick.o: 00000000 T GetTickCount @@ -137,18 +137,18 @@ twi.o: 00000000 T TWI_TransferComplete 00000000 T TWI_WriteByte U __assert_func -00000000 r __func__.6025 -00000000 r __func__.6040 -00000000 r __func__.6044 -00000000 r __func__.6051 -00000000 r __func__.6055 -00000000 r __func__.6060 -00000000 r __func__.6068 -00000000 r __func__.6082 -00000000 r __func__.6087 -00000000 r __func__.6091 -00000000 r __func__.6096 -00000000 r __func__.6100 +00000000 r __func__.6089 +00000000 r __func__.6104 +00000000 r __func__.6108 +00000000 r __func__.6115 +00000000 r __func__.6119 +00000000 r __func__.6124 +00000000 r __func__.6132 +00000000 r __func__.6146 +00000000 r __func__.6151 +00000000 r __func__.6155 +00000000 r __func__.6160 +00000000 r __func__.6164 usart.o: 00000000 T USART_Configure @@ -167,7 +167,7 @@ usart.o: 00000000 T USART_Write 00000000 T USART_WriteBuffer U __assert_func -00000000 r __func__.5946 +00000000 r __func__.6010 wdt.o: 00000000 T WDT_Disable diff --git a/hardware/arduino/sam/variants/arduino_due_x/variant.cpp b/hardware/arduino/sam/variants/arduino_due_x/variant.cpp index 817b9ed18..ae8634e8d 100644 --- a/hardware/arduino/sam/variants/arduino_due_x/variant.cpp +++ b/hardware/arduino/sam/variants/arduino_due_x/variant.cpp @@ -35,12 +35,12 @@ * 11 TIOA8 | PD7 * 12 TIOB8 | PD8 * 13 TIOB0 | PB27 - * 14 TX3 TXD2 | PD4 - * 15 RX3 RXD2 | PD5 + * 14 TX3 TXD3 | PD4 + * 15 RX3 RXD3 | PD5 * 16 TX2 TXD1 | PA13 * 17 RX2 RXD1 | PA12 - * 18 TX1 | PA11 - * 19 RX1 | PA10 + * 18 TX1 TXD0 | PA11 + * 19 RX1 RXD0 | PA10 * 20 SDA | PB12 (this pin is level adapted to 5V) * 21 SCL | PB13 (this pin is level adapted to 5V) * 22 | PB26 @@ -260,7 +260,7 @@ extern const PinDescription g_APinDescription[]= { PIOA, PIO_PA11A_TXD0|PIO_PA10A_RXD0, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC }, // 83 - USART1 (Serial3) all pins { PIOA, PIO_PA13A_TXD1|PIO_PA12A_RXD1, ID_PIOA, PIO_PERIPH_A, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC }, - // 84 - USART2 (Serial4) all pins + // 84 - USART3 (Serial4) all pins { PIOD, PIO_PD4B_TXD3|PIO_PD5B_RXD3, ID_PIOD, PIO_PERIPH_B, PIO_DEFAULT, (PIN_ATTR_DIGITAL|PIN_ATTR_COMBO), NO_ADC, NO_ADC, NO_PWM, NO_TC }, // END @@ -290,7 +290,7 @@ RingBuffer rx_buffer4 ; USARTClass Serial2( USART0, USART0_IRQn, ID_USART0, &rx_buffer2 ) ; USARTClass Serial3( USART1, USART1_IRQn, ID_USART1, &rx_buffer3 ) ; -USARTClass Serial4( USART2, USART2_IRQn, ID_USART2, &rx_buffer4 ) ; +USARTClass Serial4( USART3, USART3_IRQn, ID_USART3, &rx_buffer4 ) ; // IT handlers void USART0_Handler( void ) @@ -303,7 +303,7 @@ void USART1_Handler( void ) Serial3.IrqHandler() ; } -void USART2_Handler( void ) +void USART3_Handler( void ) { Serial4.IrqHandler() ; }