Skip to content

Commit 823744f

Browse files
arprussarpruss
authored
Merge pull request #1 from rogerclarkmelbourne/master
update
2 parents 18d1654 + 4db3994 commit 823744f

File tree

290 files changed

+1083
-32523
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+1083
-32523
lines changed

‎STM32F1/boards.txt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ mapleMini.menu.bootloader_version.bootloader20.upload.maximum_data_size=20480
3838
mapleMini.menu.bootloader_version.bootloader20.upload.altID=2
3939

4040
#-- CPU Clock frequency
41-
mapleMini.menu.cpu_speed.speed_72mhz=72Mhz (Normal)
41+
mapleMini.menu.cpu_speed.speed_72mhz=72MHz (Normal)
4242
mapleMini.menu.cpu_speed.speed_72mhz.build.f_cpu=72000000L
4343

44-
mapleMini.menu.cpu_speed.speed_48mhz=48Mhz (Slow - with USB)
44+
mapleMini.menu.cpu_speed.speed_48mhz=48MHz (Slow - with USB)
4545
mapleMini.menu.cpu_speed.speed_48mhz.build.f_cpu=48000000L
4646

47-
mapleMini.menu.cpu_speed.speed_128mhz=Overclocked 128Mhz NO USB SERIAL. MANUAL RESET NEEDED TO UPLOAD
47+
mapleMini.menu.cpu_speed.speed_128mhz=Overclocked 128MHz NO USB SERIAL. MANUAL RESET NEEDED TO UPLOAD
4848
mapleMini.menu.cpu_speed.speed_128mhz.build.f_cpu=128000000L
4949

5050
#-- Optimizations

‎STM32F1/cores/maple/HardwareSerial.cpp‎

Lines changed: 0 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -37,59 +37,6 @@
3737
#include <libmaple/timer.h>
3838
#include <libmaple/usart.h>
3939

40-
#if 0
41-
42-
#define DEFINE_HWSERIAL(name, n) \
43-
HardwareSerial name(USART##n, \
44-
BOARD_USART##n##_TX_PIN, \
45-
BOARD_USART##n##_RX_PIN)
46-
47-
#define DEFINE_HWSERIAL_UART(name, n) \
48-
HardwareSerial name(UART##n, \
49-
BOARD_USART##n##_TX_PIN, \
50-
BOARD_USART##n##_RX_PIN)
51-
52-
#ifdef SERIAL_USB
53-
#if BOARD_HAVE_USART1
54-
DEFINE_HWSERIAL(Serial1, 1);
55-
#endif
56-
#if BOARD_HAVE_USART2
57-
DEFINE_HWSERIAL(Serial2, 2);
58-
#endif
59-
#if BOARD_HAVE_USART3
60-
DEFINE_HWSERIAL(Serial3, 3);
61-
#endif
62-
#if BOARD_HAVE_UART4
63-
DEFINE_HWSERIAL_UART(Serial4, 4);
64-
#endif
65-
#if BOARD_HAVE_UART5
66-
DEFINE_HWSERIAL_UART(Serial5, 5);
67-
#endif
68-
#if BOARD_HAVE_USART6
69-
DEFINE_HWSERIAL_UART(Serial6, 6);
70-
#endif
71-
#else
72-
#if BOARD_HAVE_USART1
73-
DEFINE_HWSERIAL(Serial, 1);
74-
#endif
75-
#if BOARD_HAVE_USART2
76-
DEFINE_HWSERIAL(Serial1, 2);
77-
#endif
78-
#if BOARD_HAVE_USART3
79-
DEFINE_HWSERIAL(Serial2, 3);
80-
#endif
81-
#if BOARD_HAVE_UART4
82-
DEFINE_HWSERIAL_UART(Serial3, 4);
83-
#endif
84-
#if BOARD_HAVE_UART5
85-
DEFINE_HWSERIAL_UART(Serial4, 5);
86-
#endif
87-
#if BOARD_HAVE_USART6
88-
DEFINE_HWSERIAL_UART(Serial5, 6);
89-
#endif
90-
#endif
91-
92-
#endif
9340
HardwareSerial::HardwareSerial(usart_dev *usart_device,
9441
uint8 tx_pin,
9542
uint8 rx_pin) {

‎STM32F1/cores/maple/libmaple/adc_f1.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ adc_dev *ADC3 = &adc3;
7272
adc irq routine.
7373
Added by bubulindo.
7474
*/
75-
void __irq_adc() {
75+
__weak void __irq_adc() {
7676
//get status
7777
uint32 adc_sr = ADC1->regs->SR;
7878
//End Of Conversion
@@ -107,7 +107,7 @@ void __irq_adc() {
107107
added by bubulindo
108108
*/
109109
#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
110-
void __irq_adc3() {
110+
__weak void __irq_adc3() {
111111
//get status
112112
uint32 adc_sr = ADC3->regs->SR;
113113
//End Of Conversion

‎STM32F1/cores/maple/libmaple/dma_f1.c‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -360,48 +360,48 @@ void dma_setup_transfer(dma_dev *dev,
360360
* IRQ handlers
361361
*/
362362

363-
void __irq_dma1_channel1(void) {
363+
__weak void __irq_dma1_channel1(void) {
364364
dma_irq_handler(DMA1, DMA_CH1);
365365
}
366366

367-
void __irq_dma1_channel2(void) {
367+
__weak void __irq_dma1_channel2(void) {
368368
dma_irq_handler(DMA1, DMA_CH2);
369369
}
370370

371-
void __irq_dma1_channel3(void) {
371+
__weak void __irq_dma1_channel3(void) {
372372
dma_irq_handler(DMA1, DMA_CH3);
373373
}
374374

375-
void __irq_dma1_channel4(void) {
375+
__weak void __irq_dma1_channel4(void) {
376376
dma_irq_handler(DMA1, DMA_CH4);
377377
}
378378

379-
void __irq_dma1_channel5(void) {
379+
__weak void __irq_dma1_channel5(void) {
380380
dma_irq_handler(DMA1, DMA_CH5);
381381
}
382382

383-
void __irq_dma1_channel6(void) {
383+
__weak void __irq_dma1_channel6(void) {
384384
dma_irq_handler(DMA1, DMA_CH6);
385385
}
386386

387-
void __irq_dma1_channel7(void) {
387+
__weak void __irq_dma1_channel7(void) {
388388
dma_irq_handler(DMA1, DMA_CH7);
389389
}
390390

391391
#if defined(STM32_HIGH_DENSITY) || defined(STM32_XL_DENSITY)
392-
void __irq_dma2_channel1(void) {
392+
__weak void __irq_dma2_channel1(void) {
393393
dma_irq_handler(DMA2, DMA_CH1);
394394
}
395395

396-
void __irq_dma2_channel2(void) {
396+
__weak void __irq_dma2_channel2(void) {
397397
dma_irq_handler(DMA2, DMA_CH2);
398398
}
399399

400-
void __irq_dma2_channel3(void) {
400+
__weak void __irq_dma2_channel3(void) {
401401
dma_irq_handler(DMA2, DMA_CH3);
402402
}
403403

404-
void __irq_dma2_channel4_5(void) {
404+
__weak void __irq_dma2_channel4_5(void) {
405405
if ((DMA2_BASE->CCR4 & DMA_CCR_EN) && (DMA2_BASE->ISR & DMA_ISR_GIF4)) {
406406
dma_irq_handler(DMA2, DMA_CH4);
407407
}

‎STM32F1/cores/maple/libmaple/exc.S‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@
4141
# SP--> r0
4242

4343
.text
44-
.globl __exc_hardfault
4544
.globl __exc_nmi
4645
.globl __exc_hardfault
4746
.globl __exc_memmanage

‎STM32F1/cores/maple/libmaple/exti.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -212,31 +212,31 @@ void exti_do_select(__IO uint32 *exti_cr, exti_num num, exti_cfg port) {
212212
* Interrupt handlers
213213
*/
214214

215-
void __irq_exti0(void) {
215+
__weak void __irq_exti0(void) {
216216
dispatch_single_exti(EXTI0);
217217
}
218218

219-
void __irq_exti1(void) {
219+
__weak void __irq_exti1(void) {
220220
dispatch_single_exti(EXTI1);
221221
}
222222

223-
void __irq_exti2(void) {
223+
__weak void __irq_exti2(void) {
224224
dispatch_single_exti(EXTI2);
225225
}
226226

227-
void __irq_exti3(void) {
227+
__weak void __irq_exti3(void) {
228228
dispatch_single_exti(EXTI3);
229229
}
230230

231-
void __irq_exti4(void) {
231+
__weak void __irq_exti4(void) {
232232
dispatch_single_exti(EXTI4);
233233
}
234234

235-
void __irq_exti9_5(void) {
235+
__weak void __irq_exti9_5(void) {
236236
dispatch_extis(5, 9);
237237
}
238238

239-
void __irq_exti15_10(void) {
239+
__weak void __irq_exti15_10(void) {
240240
dispatch_extis(10, 15);
241241
}
242242

‎STM32F1/cores/maple/libmaple/i2c_f1.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -76,19 +76,19 @@ void i2c_master_release_bus(const i2c_dev *dev) {
7676
* IRQ handlers
7777
*/
7878

79-
void __irq_i2c1_ev(void) {
79+
__weak void __irq_i2c1_ev(void) {
8080
_i2c_irq_handler(I2C1);
8181
}
8282

83-
void __irq_i2c2_ev(void) {
83+
__weak void __irq_i2c2_ev(void) {
8484
_i2c_irq_handler(I2C2);
8585
}
8686

87-
void __irq_i2c1_er(void) {
87+
__weak void __irq_i2c1_er(void) {
8888
_i2c_irq_error_handler(I2C1);
8989
}
9090

91-
void __irq_i2c2_er(void) {
91+
__weak void __irq_i2c2_er(void) {
9292
_i2c_irq_error_handler(I2C2);
9393
}
9494

‎STM32F1/cores/maple/libmaple/rcc_f1.c‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -134,6 +134,12 @@ void rcc_configure_pll(rcc_pll_cfg *pll_cfg) {
134134
cfgr &= ~(RCC_CFGR_PLLSRC | RCC_CFGR_PLLMUL);
135135
cfgr |= pll_cfg->pllsrc | pll_mul;
136136

137+
#ifdef XTAL16M
138+
// 16MHz crystal (HSE)
139+
// in this case we additionally set the Bit 17 (PLLXTPRE=1) => then HSE clock is divided by 2 before PLL entry
140+
cfgr |= RCC_CFGR_PLLXTPRE;
141+
#endif
142+
137143
RCC_BASE->CFGR = cfgr;
138144
}
139145

0 commit comments

Comments
 (0)