uGFX/ugfx
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases Wiki Activity

Updates for the Mikrmedia STM32 M4 board

Browse source
This commit is contained in:
inmarket 2013-10-29 01:12:42 +10:00
parent ffee80299d
commit ab4091b366
4 changed files with 10 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.c
View file

@ -70,7 +70,6 @@ void flash_read(uint32_t address, size_t bytes, uint8_t *out) {
sector_read_cmd[1] = (address >> 16) & 0xFF; sector_read_cmd[1] = (address >> 16) & 0xFF;
sector_read_cmd[2] = (address >> 8) & 0xFF; sector_read_cmd[2] = (address >> 8) & 0xFF;
sector_read_cmd[3] = address & 0xFF; sector_read_cmd[3] = address & 0xFF;
uint8_t dummy[1];
spiAcquireBus(&SPID3); spiAcquireBus(&SPID3);
spiStart(&SPID3, &flash_spicfg); spiStart(&SPID3, &flash_spicfg);
@ -81,7 +80,7 @@ void flash_read(uint32_t address, size_t bytes, uint8_t *out) {
spiReleaseBus(&SPID3); spiReleaseBus(&SPID3);
} }
void flash_write(uint32_t address, size_t bytes, uint8_t *data) { void flash_write(uint32_t address, size_t bytes, const uint8_t *data) {
static uint8_t flash_write_cmd[4]; static uint8_t flash_write_cmd[4];
flash_write_enable(); flash_write_enable();
@ -90,7 +89,6 @@ void flash_write(uint32_t address, size_t bytes, uint8_t *data) {
flash_write_cmd[1] = (address >> 16) & 0xFF; flash_write_cmd[1] = (address >> 16) & 0xFF;
flash_write_cmd[2] = (address >> 8) & 0xFF; flash_write_cmd[2] = (address >> 8) & 0xFF;
flash_write_cmd[3] = address & 0xFF; flash_write_cmd[3] = address & 0xFF;
uint8_t dummy[1];
spiAcquireBus(&SPID3); spiAcquireBus(&SPID3);
spiStart(&SPID3, &flash_spicfg); spiStart(&SPID3, &flash_spicfg);
@ -112,14 +110,18 @@ bool flash_tp_calibrated(void) {
} }
void flash_tp_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz) { void flash_tp_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz) {
if (instance) return;
flash_sector_erase(0x0F0000); flash_sector_erase(0x0F0000);
uint8_t calibrated = 0x01; uint8_t calibrated = 0x01;
flash_write(0x0F0000, 1, &calibrated); flash_write(0x0F0000, 1, &calibrated);
flash_write(0x0F0001, sz, calbuf); flash_write(0x0F0001, sz, calbuf);
} }
const char *flash_tp_calibration_load(uint16_t instance) { const char *flash_tp_calibration_load(uint16_t instance) {
static char foo[24]; static uint8_t foo[24];
if (instance) return 0;
if (!flash_tp_calibrated()) return 0;
flash_read(0x0F0001, 24, foo); flash_read(0x0F0001, 24, foo);
return foo; return (char *)foo;
} }

2
boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/flash_memory.h
View file

@ -1,6 +1,6 @@
void flash_sector_erase(uint32_t sector); void flash_sector_erase(uint32_t sector);
void flash_read(uint32_t address, size_t bytes, uint8_t *out); void flash_read(uint32_t address, size_t bytes, uint8_t *out);
void flash_write(uint32_t address, size_t bytes, uint8_t *data); void flash_write(uint32_t address, size_t bytes, const uint8_t *data);
bool flash_tp_calibrated(void); bool flash_tp_calibrated(void);
void flash_tp_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz); void flash_tp_calibration_save(uint16_t instance, const uint8_t *calbuf, size_t sz);
const char *flash_tp_calibration_load(uint16_t instance); const char *flash_tp_calibration_load(uint16_t instance);

8
boards/base/Mikromedia-STM32-M4-ILI9341/board_ILI9341.h
View file

@ -36,14 +36,6 @@ static inline void init_board(GDisplay *g) {
SET_RD; SET_RD;
SET_WR; SET_WR;
CLR_CS; CLR_CS;
/* Hardware reset */
palSetPad(GPIOE, GPIOE_LCD_RST);
chThdSleepMilliseconds(100);
palClearPad(GPIOE, GPIOE_LCD_RST);
chThdSleepMilliseconds(100);
palSetPad(GPIOE, GPIOE_LCD_RST);
chThdSleepMilliseconds(100);
break; break;
} }
} }

2
boards/base/Mikromedia-STM32-M4-ILI9341/readme.txt
View file

@ -12,5 +12,3 @@ As this is not a standard ChibiOS supported board the necessary board files have
been provided in the ChibiOS_Board directory. been provided in the ChibiOS_Board directory.
There is an example Makefile and project in the examples directory. There is an example Makefile and project in the examples directory.
Note: The video driver currently has bugs!