Skip to content

Commit cc4461d

Browse files
RickKimballRickKimball
committed
get in synch with master
1 parent b7fe16a commit cc4461d

File tree

5 files changed

+161
-201
lines changed

5 files changed

+161
-201
lines changed

‎variants/NUCLEO_F030R8/PeripheralPins.c

+11-25
Original file line numberDiff line numberDiff line change
@@ -59,10 +59,7 @@ const PinMap PinMap_ADC[] = {
5959
};
6060

6161
//*** DAC ***
62-
63-
const PinMap PinMap_DAC[] = {
64-
{NC, NC, 0}
65-
};
62+
// No DAC
6663

6764
//*** I2C ***
6865

@@ -86,20 +83,20 @@ const PinMap PinMap_PWM[] = {
8683
{PA2, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM15, 1, 0)}, // TIM15_CH1
8784
{PA3, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM15, 2, 0)}, // TIM15_CH2
8885
{PA4, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
89-
{PA6, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
86+
// {PA6, TIM16, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM16, 1, 0)}, // TIM16_CH1
9087
{PA6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
91-
{PA7, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
92-
{PA7, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
93-
{PA7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
88+
// {PA7, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF4_TIM14, 1, 0)}, // TIM14_CH1
89+
// {PA7, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF5_TIM17, 1, 0)}, // TIM17_CH1
90+
// {PA7, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
9491
{PA7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
9592
{PA8, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 0)}, // TIM1_CH1
9693
{PA9, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 0)}, // TIM1_CH2
9794
{PA10, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 0)}, // TIM1_CH3
9895
{PA11, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 4, 0)}, // TIM1_CH4
9996
{PB0, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
10097
{PB0, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
101-
{PB1, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
102-
{PB1, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
98+
// {PB1, TIM14, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_TIM14, 1, 0)}, // TIM14_CH1
99+
// {PB1, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
103100
{PB1, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 4, 0)}, // TIM3_CH4
104101
{PB4, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 1, 0)}, // TIM3_CH1
105102
{PB5, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 2, 0)}, // TIM3_CH2
@@ -109,10 +106,10 @@ const PinMap PinMap_PWM[] = {
109106
{PB9, TIM17, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM17, 1, 0)}, // TIM17_CH1
110107
{PB13, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 1, 1)}, // TIM1_CH1N
111108
{PB14, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 1, 0)}, // TIM15_CH1
112-
{PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
113-
{PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 1)}, // TIM15_CH1N
109+
// {PB14, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 2, 1)}, // TIM1_CH2N
110+
// {PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF3_TIM15, 1, 1)}, // TIM15_CH1N
114111
{PB15, TIM15, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM15, 2, 0)}, // TIM15_CH2
115-
{PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
112+
// {PB15, TIM1, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF2_TIM1, 3, 1)}, // TIM1_CH3N
116113
{PC6, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 1, 0)}, // TIM3_CH1
117114
{PC7, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF0_MCO, 2, 0)}, // TIM3_CH2
118115
{PC8, TIM3, STM_PIN_DATA_EXT(STM_MODE_AF_PP, GPIO_PULLUP, GPIO_AF1_TIM3, 3, 0)}, // TIM3_CH3
@@ -181,17 +178,7 @@ const PinMap PinMap_SPI_SSEL[] = {
181178
};
182179

183180
//*** CAN ***
184-
185-
const PinMap PinMap_CAN_RD[] = {
186-
{NC, NC, 0}
187-
};
188-
189-
const PinMap PinMap_CAN_TD[] = {
190-
{NC, NC, 0}
191-
};
192-
193-
194-
//*** Timer Map ***
181+
// No CAN
195182

196183
const TimerMap TimerMap_CONFIG[] = {
197184
{TIM1, TIM1_BRK_UP_TRG_COM_IRQn, 1},
@@ -203,4 +190,3 @@ const TimerMap TimerMap_CONFIG[] = {
203190
{TIM17, TIM17_IRQn, 1},
204191
{NULL, 0, 0}
205192
};
206-

‎variants/NUCLEO_F030R8/ldscript.ld

+18-39
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
/*
22
*****************************************************************************
33
**
4+
45
** File : LinkerScript.ld
56
**
6-
** Author : Ac6
7-
**
8-
** Abstract : Linker script for STM32F030R8 Device with
7+
** Abstract : Linker script for STM32F030R8Tx Device with
98
** 64KByte FLASH, 8KByte RAM
109
**
1110
** Set heap size, stack size and stack location according
@@ -15,36 +14,17 @@
1514
**
1615
** Target : STMicroelectronics STM32
1716
**
18-
** Environment : System Workbench for MCU
1917
**
20-
** Distribution: The file is distributed �as is,� without any warranty
18+
** Distribution: The file is distributed as is, without any warranty
2119
** of any kind.
2220
**
23-
*****************************************************************************
24-
**
25-
** <h2><center>&copy; COPYRIGHT(c) 2017 Ac6</center></h2>
26-
**
27-
** Redistribution and use in source and binary forms, with or without modification,
28-
** are permitted provided that the following conditions are met:
29-
** 1. Redistributions of source code must retain the above copyright notice,
30-
** this list of conditions and the following disclaimer.
31-
** 2. Redistributions in binary form must reproduce the above copyright notice,
32-
** this list of conditions and the following disclaimer in the documentation
33-
** and/or other materials provided with the distribution.
34-
** 3. Neither the name of Ac6 nor the names of its contributors
35-
** may be used to endorse or promote products derived from this software
36-
** without specific prior written permission.
37-
**
38-
** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS \"AS IS\"
39-
** AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
40-
** IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
41-
** DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
42-
** FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
43-
** DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
44-
** SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
45-
** CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
46-
** OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
47-
** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
21+
** (c)Copyright Ac6.
22+
** You may use this file as-is or modify it according to the needs of your
23+
** project. Distribution of this file (unmodified or modified) is not
24+
** permitted. Ac6 permit registered System Workbench for MCU users the
25+
** rights to distribute the assembled, compiled & linked contents of this
26+
** file as part of an application binary file, provided that it is built
27+
** using the System Workbench for MCU toolchain.
4828
**
4929
*****************************************************************************
5030
*/
@@ -54,10 +34,9 @@ ENTRY(Reset_Handler)
5434

5535
/* Highest address of the user mode stack */
5636
_estack = 0x20002000; /* end of RAM */
57-
5837
/* Generate a link error if heap and stack don't fit into RAM */
59-
_Min_Heap_Size = 0x200; /* required amount of heap */
60-
_Min_Stack_Size = 0x400; /* required amount of stack */
38+
_Min_Heap_Size = 0x400; /* required amount of heap */
39+
_Min_Stack_Size = 0x860; /* required amount of stack */
6140

6241
/* Specify the memory areas */
6342
MEMORY
@@ -135,8 +114,8 @@ SECTIONS
135114
_sidata = LOADADDR(.data);
136115

137116
/* Initialized data sections goes into RAM, load LMA copy after code */
138-
.data :
139-
{
117+
.data :
118+
{
140119
. = ALIGN(4);
141120
_sdata = .; /* create a global symbol at data start */
142121
*(.data) /* .data sections */
@@ -146,7 +125,7 @@ SECTIONS
146125
_edata = .; /* define a global symbol at data end */
147126
} >RAM AT> FLASH
148127

149-
128+
150129
/* Uninitialized data section */
151130
. = ALIGN(4);
152131
.bss :
@@ -164,7 +143,7 @@ SECTIONS
164143
} >RAM
165144

166145
/* User_heap_stack section, used to check that there is enough RAM left */
167-
/DISCARD/._user_heap_stack :
146+
._user_heap_stack :
168147
{
169148
. = ALIGN(8);
170149
PROVIDE ( end = . );
@@ -174,7 +153,7 @@ SECTIONS
174153
. = ALIGN(8);
175154
} >RAM
176155

177-
156+
178157

179158
/* Remove information from the standard libraries */
180159
/DISCARD/ :
@@ -185,4 +164,4 @@ SECTIONS
185164
}
186165

187166
.ARM.attributes 0 : { *(.ARM.attributes) }
188-
}
167+
}

0 commit comments

Comments
 (0)