Skip to content

Commit 30aa4a6

Browse files
victorpvvictorpv
committed
Merge pull request #6 from rogerclarkmelbourne/master
Sync to Roger's
2 parents 92d0470 + c3428ca commit 30aa4a6

54 files changed

Lines changed: 6442 additions & 187 deletions

File tree

Some content is hidden

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

‎STM32F1/boards.txt‎

Lines changed: 24 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -82,34 +82,6 @@ mapleRET6.upload.altID=1
8282
mapleRET6.upload.auto_reset=true
8383

8484

85-
##############################################################
86-
genericSTM32.name=STM32F103C8 (deprecated - use Generic STM32F103C)
87-
88-
genericSTM32.menu.upload_method.serialMethod=Serial
89-
genericSTM32.menu.upload_method.serialMethod.upload.protocol=maple_serial
90-
genericSTM32.menu.upload_method.serialMethod.upload.tool=serial_upload
91-
genericSTM32.menu.upload_method.serialMethod.build.extra_flags=-DMCU_STM32F103CB -mthumb -march=armv7-m -D__STM32F1__
92-
93-
genericSTM32.menu.upload_method.STLinkMethod=STLink
94-
genericSTM32.menu.upload_method.STLinkMethod.upload.protocol=STLink
95-
genericSTM32.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
96-
genericSTM32.menu.upload_method.STLinkMethod.build.extra_flags=-DMCU_STM32F103CB -mthumb -march=armv7-m -D__STM32F1__ -DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
97-
98-
99-
genericSTM32.upload.maximum_size=108000
100-
genericSTM32.upload.use_1200bps_touch=false
101-
genericSTM32.upload.file_type=bin
102-
genericSTM32.upload.ram.maximum_size=17000
103-
genericSTM32.upload.flash.maximum_size=108000
104-
genericSTM32.upload.auto_reset=true
105-
106-
genericSTM32.build.board=STM32F103C8
107-
genericSTM32.build.core=maple
108-
109-
genericSTM32.build.ldscript=ld/jtag.ld
110-
genericSTM32.build.variant=maple_mini
111-
genericSTM32.build.vect=VECT_TAB_ADDR=0x8000000
112-
11385
##############################################################
11486

11587
microduino32_flash.name=Microduino Core STM32 to Flash
@@ -209,7 +181,7 @@ genericSTM32F103C.menu.upload_method.serialMethod.upload.tool=serial_upload
209181
genericSTM32F103C.menu.upload_method.STLinkMethod=STLink
210182
genericSTM32F103C.menu.upload_method.STLinkMethod.upload.protocol=STLink
211183
genericSTM32F103C.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
212-
genericSTM32F103C.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
184+
genericSTM32F103C.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
213185

214186

215187
genericSTM32F103C.menu.upload_method.BMPMethod=BMP (Black Magic Probe)
@@ -220,7 +192,7 @@ genericSTM32F103C.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE
220192
genericSTM32F103C.menu.upload_method.DFUUploadMethod=Maple DFU
221193
genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
222194
genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
223-
genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB
195+
genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
224196
genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
225197
genericSTM32F103C.menu.upload_method.DFUUploadMethod.build.ldscript=ld/bootloader_20.ld
226198
genericSTM32F103C.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
@@ -256,12 +228,17 @@ genericSTM32F103R.menu.upload_method.serialMethod.upload.tool=serial_upload
256228
genericSTM32F103R.menu.upload_method.STLinkMethod=STLink
257229
genericSTM32F103R.menu.upload_method.STLinkMethod.upload.protocol=STLink
258230
genericSTM32F103R.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
259-
genericSTM32F103R.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
231+
genericSTM32F103R.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
232+
233+
genericSTM32F103R.menu.upload_method.BMPMethod=BMP (Black Magic Probe)
234+
genericSTM32F103R.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
235+
genericSTM32F103R.menu.upload_method.BMPMethod.upload.tool=bmp_upload
236+
genericSTM32F103R.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
260237

261238
genericSTM32F103R.menu.upload_method.DFUUploadMethod=Maple DFU
262239
genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
263240
genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
264-
genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB
241+
genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
265242
genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
266243
genericSTM32F103R.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103re-bootloader.ld
267244
genericSTM32F103R.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
@@ -301,7 +278,7 @@ genericSTM32F103V.menu.device_variant.STM32F103VD.build.ldscript=ld/stm32f103vd.
301278

302279

303280
genericSTM32F103V.menu.device_variant.STM32F103VE=STM32F103VE
304-
genericSTM32F103V.menu.device_variant.STM32F103VE.build.cpu_flags=-DMCU_STM32F103VE -DSERIAL_USB
281+
genericSTM32F103V.menu.device_variant.STM32F103VE.build.cpu_flags=-DMCU_STM32F103VE
305282
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.maximum_size=524288
306283
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.ram.maximum_size=65536
307284
genericSTM32F103V.menu.device_variant.STM32F103VE.upload.flash.maximum_size=524288
@@ -316,12 +293,17 @@ genericSTM32F103V.menu.upload_method.serialMethod.upload.tool=serial_upload
316293
genericSTM32F103V.menu.upload_method.STLinkMethod=STLink
317294
genericSTM32F103V.menu.upload_method.STLinkMethod.upload.protocol=STLink
318295
genericSTM32F103V.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
319-
genericSTM32F103V.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1
296+
genericSTM32F103V.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
297+
298+
genericSTM32F103V.menu.upload_method.BMPMethod=BMP (Black Magic Probe)
299+
genericSTM32F103V.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
300+
genericSTM32F103V.menu.upload_method.BMPMethod.upload.tool=bmp_upload
301+
genericSTM32F103V.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
320302

321303
genericSTM32F103V.menu.upload_method.DFUUploadMethod=Maple DFU
322304
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
323305
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
324-
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB
306+
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
325307
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
326308
genericSTM32F103V.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103veDFU.ld
327309
genericSTM32F103V.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
@@ -370,14 +352,18 @@ genericSTM32F103Z.menu.upload_method.serialMethod.upload.tool=serial_upload
370352
genericSTM32F103Z.menu.upload_method.STLinkMethod=STLink
371353
genericSTM32F103Z.menu.upload_method.STLinkMethod.upload.protocol=STLink
372354
genericSTM32F103Z.menu.upload_method.STLinkMethod.upload.tool=stlink_upload
373-
genericSTM32F103Z.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB
355+
genericSTM32F103Z.menu.upload_method.STLinkMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG=1 -DSERIAL_USB -DGENERIC_BOOTLOADER
356+
357+
genericSTM32F103Z.menu.upload_method.BMPMethod=BMP (Black Magic Probe)
358+
genericSTM32F103Z.menu.upload_method.BMPMethod.upload.protocol=gdb_bmp
359+
genericSTM32F103Z.menu.upload_method.BMPMethod.upload.tool=bmp_upload
360+
genericSTM32F103Z.menu.upload_method.BMPMethod.build.upload_flags=-DCONFIG_MAPLE_MINI_NO_DISABLE_DEBUG
374361

375362
genericSTM32F103Z.menu.upload_method.DFUUploadMethod=Maple DFU
376363
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.protocol=maple_dfu
377364
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.tool=maple_upload
378-
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB
365+
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.upload_flags=-DSERIAL_USB -DGENERIC_BOOTLOADER
379366
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.vect=VECT_TAB_ADDR=0x8002000
380367
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.build.ldscript=ld/stm32f103z_dfu.ld
381368
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.usbID=1EAF:0003
382369
genericSTM32F103Z.menu.upload_method.DFUUploadMethod.upload.altID=2
383-

‎STM32F1/libraries/Adafruit_ILI9341/Adafruit_ILI9341.cpp‎

Lines changed: 23 additions & 51 deletions
Original file line numberDiff line numberDiff line change
@@ -253,7 +253,7 @@ void Adafruit_ILI9341::begin(void) {
253253
writedata(0x10); //SAP[2:0];BT[3:0]
254254

255255
writecommand(ILI9341_VMCTR1); //VCM control
256-
writedata(0x3e); //¶Ô±È¶Èµ÷½Ú
256+
writedata(0x3e); //???????
257257
writedata(0x28);
258258

259259
writecommand(ILI9341_VMCTR2); //VCM control2
@@ -327,11 +327,9 @@ void Adafruit_ILI9341::begin(void) {
327327
void Adafruit_ILI9341::setAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1,
328328
uint16_t y1) {
329329

330-
byte buf[4];
331330
writecommand(ILI9341_CASET); // Column addr set
332331
*dcport |= dcpinmask;
333332
*csport &= ~cspinmask;
334-
335333
SPI.write(x0 >> 8);
336334
SPI.write(x0 & 0xFF); // XSTART
337335
SPI.write(x1 >> 8);
@@ -340,13 +338,11 @@ void Adafruit_ILI9341::setAddrWindow(uint16_t x0, uint16_t y0, uint16_t x1,
340338
writecommand(ILI9341_PASET); // Row addr set
341339
*dcport |= dcpinmask;
342340
*csport &= ~cspinmask;
343-
344341
SPI.write(y0>>8);
345342
SPI.write(y0); // YSTART
346343
SPI.write(y1>>8);
347344
SPI.write(y1); // YEND
348345

349-
350346
writecommand(ILI9341_RAMWR); // write to RAM
351347
}
352348

@@ -437,58 +433,33 @@ void Adafruit_ILI9341::fillScreen(uint16_t color) {
437433
}
438434

439435
// fill a rectangle
440-
void Adafruit_ILI9341::fillRect(int16_t x, int16_t y, int16_t w, int16_t h, uint16_t color) {
436+
void Adafruit_ILI9341::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
437+
uint16_t color) {
441438
int numPixels;
439+
// rudimentary clipping (drawChar w/big text requires this)
440+
if((x >= _width) || (y >= _height)) return;
441+
if((x + w - 1) >= _width) w = _width - x;
442+
if((y + h - 1) >= _height) h = _height - y;
442443

443-
unsigned char *buff;
444-
445-
// rudimentary clipping (drawChar w/big text requires this)
446-
if((x >= _width) || (y >= _height)) return;
447-
if((x + w - 1) >= _width) w = _width - x;
448-
if((y + h - 1) >= _height) h = _height - y;
444+
if (hwSPI) spi_begin();
445+
setAddrWindow(x, y, x+w-1, y+h-1);
449446

450-
if (hwSPI) spi_begin();
451-
setAddrWindow(x, y, x+w-1, y+h-1);
447+
uint8_t hi = color >> 8, lo = color;
452448

453-
uint8_t hi = color >> 8, lo = color;
449+
*dcport |= dcpinmask;
450+
*csport &= ~cspinmask;
454451

455-
*dcport |= dcpinmask;
456-
*csport &= ~cspinmask;
457-
if (true)
458-
{
459-
// Use DMA
460-
byte txBuf[h*2];// Buffer to be sent via DMA
461-
byte rxBuf[h*2];// Buffer to be sent via DMA
462-
463-
// need to build a buffer of the required height (h)
464-
// Note I suspect there is a faster way to do this
465-
for(int i=0;i<h*2;i++)
466-
{
467-
txBuf[i++] = hi&0xff;
468-
txBuf[i] = lo&0xff;
469-
}
470-
// Tansfer each line by DMA
471-
for(int i=0;i<w;i++)
472-
{
473-
//memcpy(rxBuf,txBuf,h*2);
474-
SPI.DMATransfer(txBuf,rxBuf,h*2);
475-
}
476-
}
477-
else
452+
for(y=h; y>0; y--)
453+
{
454+
for(x=w; x>0; x--)
478455
{
479-
// Non DMA method (currently not used)
480-
for(y=h; y>0; y--)
481-
{
482-
for(x=w; x>0; x--)
483-
{
484-
SPI.write(hi);
485-
SPI.write(lo);
486-
}
487-
}
488-
}
489-
490-
if (hwSPI) spi_end();
491-
*csport |= cspinmask;
456+
SPI.write(hi);
457+
SPI.write(lo);
458+
}
459+
}
460+
461+
if (hwSPI) spi_end();
462+
*csport |= cspinmask;
492463
}
493464

494465

@@ -658,3 +629,4 @@ uint8_t Adafruit_ILI9341::readcommand8(uint8_t c, uint8_t index) {
658629
}
659630
660631
*/
632+

‎STM32F1/libraries/Adafruit_ILI9341/Adafruit_ILI9341.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,3 +167,4 @@ class Adafruit_ILI9341 : public Adafruit_GFX {
167167
};
168168

169169
#endif
170+

0 commit comments

Comments
 (0)