Skip to content

Commit afaeee2

Browse files
committed
[sam] Fixed pinout for Serial4. Fixed keywords. Recompiled shipped libsam binary
1 parent a4b61c7 commit afaeee2

File tree

4 files changed

+38
-37
lines changed

4 files changed

+38
-37
lines changed

build/shared/lib/keywords.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,7 @@ Serial KEYWORD3 Serial
164164
Serial1 KEYWORD3 Serial
165165
Serial2 KEYWORD3 Serial
166166
Serial3 KEYWORD3 Serial
167+
Serial4 KEYWORD3 Serial
167168
begin KEYWORD2 Serial_Begin
168169
end KEYWORD2 Serial_End
169170
peek KEYWORD2 Serial_Peek
Binary file not shown.

hardware/arduino/sam/variants/arduino_due_x/libsam_sam3x8e_gcc_rel.a.txt

Lines changed: 30 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ pmc.o:
2424
00000000 T PMC_IsPeripheralEnabled
2525

2626
pwmc.o:
27-
00000000 r C.9.6844
27+
00000000 r C.9.6937
2828
00000000 t FindClockConfiguration
2929
00000000 T PWMC_ConfigureChannel
3030
00000000 T PWMC_ConfigureChannelExt
@@ -52,14 +52,14 @@ pwmc.o:
5252
00000000 T PWMC_SetSyncChannelUpdateUnlock
5353
00000000 T PWMC_WriteBuffer
5454
U __assert_func
55-
00000000 r __func__.5653
56-
00000000 r __func__.5664
57-
00000000 r __func__.5679
58-
00000000 r __func__.5690
59-
00000000 r __func__.5701
60-
00000000 r __func__.5708
61-
00000000 r __func__.5792
62-
00000000 r __func__.5798
55+
00000000 r __func__.5717
56+
00000000 r __func__.5728
57+
00000000 r __func__.5743
58+
00000000 r __func__.5754
59+
00000000 r __func__.5765
60+
00000000 r __func__.5772
61+
00000000 r __func__.5856
62+
00000000 r __func__.5862
6363

6464
rtc.o:
6565
00000000 T RTC_ClearSCCR
@@ -75,9 +75,9 @@ rtc.o:
7575
00000000 T RTC_SetTime
7676
00000000 T RTC_SetTimeAlarm
7777
U __assert_func
78-
00000000 r __func__.5650
79-
00000000 r __func__.5659
80-
00000000 r __func__.5664
78+
00000000 r __func__.5714
79+
00000000 r __func__.5723
80+
00000000 r __func__.5728
8181

8282
rtt.o:
8383
00000000 T RTT_EnableIT
@@ -86,8 +86,8 @@ rtt.o:
8686
00000000 T RTT_SetAlarm
8787
00000000 T RTT_SetPrescaler
8888
U __assert_func
89-
00000000 r __func__.5657
90-
00000000 r __func__.5665
89+
00000000 r __func__.5721
90+
00000000 r __func__.5729
9191

9292
spi.o:
9393
U PMC_EnablePeripheral
@@ -108,9 +108,9 @@ tc.o:
108108
00000000 T TC_Start
109109
00000000 T TC_Stop
110110
U __assert_func
111-
00000000 r __func__.5652
112-
00000000 r __func__.5658
113-
00000000 r __func__.5664
111+
00000000 r __func__.5716
112+
00000000 r __func__.5722
113+
00000000 r __func__.5728
114114

115115
timetick.o:
116116
00000000 T GetTickCount
@@ -137,18 +137,18 @@ twi.o:
137137
00000000 T TWI_TransferComplete
138138
00000000 T TWI_WriteByte
139139
U __assert_func
140-
00000000 r __func__.6025
141-
00000000 r __func__.6040
142-
00000000 r __func__.6044
143-
00000000 r __func__.6051
144-
00000000 r __func__.6055
145-
00000000 r __func__.6060
146-
00000000 r __func__.6068
147-
00000000 r __func__.6082
148-
00000000 r __func__.6087
149-
00000000 r __func__.6091
150-
00000000 r __func__.6096
151-
00000000 r __func__.6100
140+
00000000 r __func__.6089
141+
00000000 r __func__.6104
142+
00000000 r __func__.6108
143+
00000000 r __func__.6115
144+
00000000 r __func__.6119
145+
00000000 r __func__.6124
146+
00000000 r __func__.6132
147+
00000000 r __func__.6146
148+
00000000 r __func__.6151
149+
00000000 r __func__.6155
150+
00000000 r __func__.6160
151+
00000000 r __func__.6164
152152

153153
usart.o:
154154
00000000 T USART_Configure
@@ -167,7 +167,7 @@ usart.o:
167167
00000000 T USART_Write
168168
00000000 T USART_WriteBuffer
169169
U __assert_func
170-
00000000 r __func__.5946
170+
00000000 r __func__.6010
171171

172172
wdt.o:
173173
00000000 T WDT_Disable

hardware/arduino/sam/variants/arduino_due_x/variant.cpp

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -35,12 +35,12 @@
3535
* 11 TIOA8 | PD7
3636
* 12 TIOB8 | PD8
3737
* 13 TIOB0 | PB27
38-
* 14 TX3 TXD2 | PD4
39-
* 15 RX3 RXD2 | PD5
38+
* 14 TX3 TXD3 | PD4
39+
* 15 RX3 RXD3 | PD5
4040
* 16 TX2 TXD1 | PA13
4141
* 17 RX2 RXD1 | PA12
42-
* 18 TX1 | PA11
43-
* 19 RX1 | PA10
42+
* 18 TX1 TXD0 | PA11
43+
* 19 RX1 RXD0 | PA10
4444
* 20 SDA | PB12 (this pin is level adapted to 5V)
4545
* 21 SCL | PB13 (this pin is level adapted to 5V)
4646
* 22 | PB26
@@ -260,7 +260,7 @@ extern const PinDescription g_APinDescription[]=
260260
{ 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 },
261261
// 83 - USART1 (Serial3) all pins
262262
{ 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 },
263-
// 84 - USART2 (Serial4) all pins
263+
// 84 - USART3 (Serial4) all pins
264264
{ 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 },
265265

266266
// END
@@ -290,7 +290,7 @@ RingBuffer rx_buffer4 ;
290290

291291
USARTClass Serial2( USART0, USART0_IRQn, ID_USART0, &rx_buffer2 ) ;
292292
USARTClass Serial3( USART1, USART1_IRQn, ID_USART1, &rx_buffer3 ) ;
293-
USARTClass Serial4( USART2, USART2_IRQn, ID_USART2, &rx_buffer4 ) ;
293+
USARTClass Serial4( USART3, USART3_IRQn, ID_USART3, &rx_buffer4 ) ;
294294

295295
// IT handlers
296296
void USART0_Handler( void )
@@ -303,7 +303,7 @@ void USART1_Handler( void )
303303
Serial3.IrqHandler() ;
304304
}
305305

306-
void USART2_Handler( void )
306+
void USART3_Handler( void )
307307
{
308308
Serial4.IrqHandler() ;
309309
}

0 commit comments

Comments
 (0)