font_encoder: Update pre-built binary (Linux)

Contributed by "Volodymyr Shylov" <shilow@ukr.net>

.gitignore

@@ -3,6 +3,7 @@ build
 .dep
 .cproject
 .project
+.vscode
 *.sublime*
 *.stackdump
 *.lst
@@ -15,3 +16,7 @@ docs/html
 docs/html.zip
 docs/*.db
 docs/*.tmp
+
+# CLion
+.idea/
+cmake-build-*/

boards/addons/gdisp/board_SSD1312_stm32cubehal.h

@@ -0,0 +1,92 @@
+#pragma once
+
+#include <stm32f4xx_hal.h>
+#include <string.h>
+
+// The command byte to put on the front of each page line
+#define SSD1312_PAGE_PREFIX	0x40		// Co = 0, D/C = 1
+
+static I2C_HandleTypeDef i2cHandle;
+
+static GFXINLINE void init_board(GDisplay *g)
+{
+    (void) g;
+
+    // GPIO
+    {
+        GPIO_InitTypeDef GPIO_InitStruct = {0};
+
+        __HAL_RCC_GPIOB_CLK_ENABLE();
+
+        // I2C SCL
+        GPIO_InitStruct.Pin         = GPIO_PIN_8;
+        GPIO_InitStruct.Mode        = GPIO_MODE_AF_PP;
+        GPIO_InitStruct.Pull        = GPIO_PULLUP;
+        GPIO_InitStruct.Speed       = GPIO_SPEED_FAST;
+        GPIO_InitStruct.Alternate   = GPIO_AF4_I2C1;
+        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+
+        // I2C SDA
+        GPIO_InitStruct.Pin         = GPIO_PIN_9;
+        GPIO_InitStruct.Mode        = GPIO_MODE_AF_OD;
+        GPIO_InitStruct.Pull        = GPIO_PULLUP;
+        GPIO_InitStruct.Speed       = GPIO_SPEED_FAST;
+        GPIO_InitStruct.Alternate   = GPIO_AF4_I2C1;
+        HAL_GPIO_Init(GPIOB, &GPIO_InitStruct);
+    }
+
+    // I2C1
+    {
+        __HAL_RCC_I2C1_CLK_ENABLE();
+
+        i2cHandle.Instance             = I2C1;
+        i2cHandle.Init.AddressingMode  = I2C_ADDRESSINGMODE_7BIT;
+        i2cHandle.Init.ClockSpeed      = 400000;
+        i2cHandle.Init.DualAddressMode = I2C_DUALADDRESS_DISABLE;
+        i2cHandle.Init.DutyCycle       = I2C_DUTYCYCLE_2;
+        i2cHandle.Init.GeneralCallMode = I2C_GENERALCALL_DISABLE;
+        i2cHandle.Init.NoStretchMode   = I2C_NOSTRETCH_DISABLE;
+        if (HAL_I2C_Init(&i2cHandle) != HAL_OK)
+            gfxHalt("I2C HAL init error");
+    }
+}
+
+static GFXINLINE void post_init_board(GDisplay *g)
+{
+    (void) g;
+}
+
+static GFXINLINE void setpin_reset(GDisplay *g, gBool state)
+{
+    (void) g;
+    (void) state;
+}
+
+static GFXINLINE void acquire_bus(GDisplay *g)
+{
+    (void) g;
+}
+
+static GFXINLINE void release_bus(GDisplay *g)
+{
+    (void) g;
+}
+
+static GFXINLINE void write_cmd(GDisplay *g, gU8 *data, gU16 length)
+{
+    (void) g;
+
+    gU8 buf[4];		// length is always <= 3
+    buf[0] = 0x00;
+    memcpy(buf+1, data, length);
+
+    HAL_I2C_Master_Transmit(&i2cHandle, (0x3c << 1), buf, length+1, 10000);
+}
+
+static GFXINLINE void write_data(GDisplay *g, gU8 *data, gU16 length)
+{
+    (void) g;
+
+    HAL_I2C_Master_Transmit(&i2cHandle, (0x3c << 1), data, length, 10000);
+}
+

boards/base/FireBull-STM32F103-FB/chibios_board/board.mk

@@ -1,3 +1,3 @@
-BOARDINC = $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board
-BOARDSRC = $(BOARDINC)/board.c \
-
+BOARDINC = $(GFXLIB)/boards/base/FireBull-STM32F103-FB/chibios_board
+BOARDSRC = $(BOARDINC)/board.c \
+

boards/base/FreeBSD-SDL/board.mk

@@ -0,0 +1,6 @@
+GFXINC  +=
+GFXSRC  +=
+GFXDEFS += -DGFX_USE_OS_FREEBSD=GFXON
+GFXLIBS += rt
+
+include $(GFXLIB)/drivers/multiple/SDL/driver.mk

boards/base/FreeBSD-SDL/example/Makefile

@@ -0,0 +1,52 @@
+# Possible Targets:	all clean Debug cleanDebug Release cleanRelease
+
+##############################################################################################
+# Settings
+#
+
+# General settings
+	# See $(GFXLIB)/tools/gmake_scripts/readme.txt for the list of variables
+	OPT_OS					= freebsd
+	OPT_LINK_OPTIMIZE		= yes
+	# Change this next setting (or add the explicit compiler flags) if you are not compiling for x86 linux
+	OPT_CPU					= x64
+
+# uGFX settings
+	# See $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk for the list of variables
+	GFXLIB					= ../uGFX
+	GFXBOARD				= FreeBSD-SDL
+	GFXDEMO					= modules/gdisp/basics
+
+# Linux settings
+	# See $(GFXLIB)/tools/gmake_scripts/os_linux.mk for the list of variables
+
+##############################################################################################
+# Set these for your project
+#
+
+ARCH     =
+XCC      = gcc10
+XAS      = gcc10
+XLD      = gcc10
+SRCFLAGS = -ggdb -O0
+CFLAGS   = `sdl2-config --libs --cflags`
+CXXFLAGS =
+ASFLAGS  =
+LDFLAGS  =
+
+SRC      =
+OBJS     =
+DEFS     =
+LIBS     =
+INCPATH  =
+LIBPATH  =
+
+##############################################################################################
+# These should be at the end
+#
+
+include $(GFXLIB)/tools/gmake_scripts/library_ugfx.mk
+include $(GFXLIB)/tools/gmake_scripts/os_$(OPT_OS).mk
+include $(GFXLIB)/tools/gmake_scripts/compiler_gcc.mk
+# *** EOF ***
+

boards/base/FreeBSD-SDL/readme.txt

@@ -0,0 +1,22 @@
+This directory contains the interface for FreeBSD using SDL.
+
+As of today, this is simply a wrapper around the Linux drivers/support.
+
+On this board uGFX currently supports:
+	- GDISP via the SDL driver
+	- GINPUT-touch via the SDL driver
+	- GINPUT-keyboard via the SDL driver
+
+
+The folowing packages are required to run uGFX using this driver on
+a 64-bit FreeBSD system using SDL:
+	+ devel/gcc10
+	+ devel/sdl2
+
+
+The following should be added to the CFLAGS of the target makefile:
+	CFLAGS = `sdl2-config --libs --cflags`
+
+
+There is an example Makefile and project in the examples directory.
+

boards/base/Marlin/chibios_board/board.c

@@ -1,88 +1,88 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
-                 2011,2012,2013 Giovanni Di Sirio.
-
-    This file is part of ChibiOS/RT.
-
-    ChibiOS/RT is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 3 of the License, or
-    (at your option) any later version.
-
-    ChibiOS/RT is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-#if HAL_USE_PAL || defined(__DOXYGEN__)
-/**
- * @brief   PAL setup.
- * @details Digital I/O ports static configuration as defined in @p board.h.
- *          This variable is used by the HAL when initializing the PAL driver.
- */
-const PALConfig pal_default_config =
-{
-  {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
-   VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},
-  {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
-   VAL_GPIOB_ODR,   VAL_GPIOB_AFRL,   VAL_GPIOB_AFRH},
-  {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
-   VAL_GPIOC_ODR,   VAL_GPIOC_AFRL,   VAL_GPIOC_AFRH},
-  {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
-   VAL_GPIOD_ODR,   VAL_GPIOD_AFRL,   VAL_GPIOD_AFRH},
-  {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
-   VAL_GPIOE_ODR,   VAL_GPIOE_AFRL,   VAL_GPIOE_AFRH},
-  {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
-   VAL_GPIOF_ODR,   VAL_GPIOF_AFRL,   VAL_GPIOF_AFRH},
-  {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
-   VAL_GPIOG_ODR,   VAL_GPIOG_AFRL,   VAL_GPIOG_AFRH},
-  {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
-   VAL_GPIOH_ODR,   VAL_GPIOH_AFRL,   VAL_GPIOH_AFRH},
-  {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
-   VAL_GPIOI_ODR,   VAL_GPIOI_AFRL,   VAL_GPIOI_AFRH}
-};
-#endif
-
-/**
- * @brief   Early initialization code.
- * @details This initialization must be performed just after stack setup
- *          and before any other initialization.
- */
-void __early_init(void) {
-
-  stm32_clock_init();
-}
-
-#if HAL_USE_SDC
-/*
-* Card detection through the card internal pull-up on D3.
-*/
-bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
-
-(void)sdcp;
-return (bool_t)!palReadPad(GPIOD, GPIOD_SDIO_CD_N);
-}
-
-/*
-* Card write protection detection is not possible, the card is always
-* reported as not protected.
-*/
-bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
-
-(void)sdcp;
-return 0;
-}
-#endif /* HAL_USE_SDC */
-
-/**
- * @brief   Board-specific initialization code.
- */
-void boardInit(void) {
-}
+/*
+    ChibiOS/RT - Copyright (C) 2006,2007,2008,2009,2010,
+                 2011,2012,2013 Giovanni Di Sirio.
+
+    This file is part of ChibiOS/RT.
+
+    ChibiOS/RT is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 3 of the License, or
+    (at your option) any later version.
+
+    ChibiOS/RT is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "ch.h"
+#include "hal.h"
+
+#if HAL_USE_PAL || defined(__DOXYGEN__)
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+const PALConfig pal_default_config =
+{
+  {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
+   VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},
+  {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
+   VAL_GPIOB_ODR,   VAL_GPIOB_AFRL,   VAL_GPIOB_AFRH},
+  {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
+   VAL_GPIOC_ODR,   VAL_GPIOC_AFRL,   VAL_GPIOC_AFRH},
+  {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
+   VAL_GPIOD_ODR,   VAL_GPIOD_AFRL,   VAL_GPIOD_AFRH},
+  {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
+   VAL_GPIOE_ODR,   VAL_GPIOE_AFRL,   VAL_GPIOE_AFRH},
+  {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
+   VAL_GPIOF_ODR,   VAL_GPIOF_AFRL,   VAL_GPIOF_AFRH},
+  {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
+   VAL_GPIOG_ODR,   VAL_GPIOG_AFRL,   VAL_GPIOG_AFRH},
+  {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
+   VAL_GPIOH_ODR,   VAL_GPIOH_AFRL,   VAL_GPIOH_AFRH},
+  {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
+   VAL_GPIOI_ODR,   VAL_GPIOI_AFRL,   VAL_GPIOI_AFRH}
+};
+#endif
+
+/**
+ * @brief   Early initialization code.
+ * @details This initialization must be performed just after stack setup
+ *          and before any other initialization.
+ */
+void __early_init(void) {
+
+  stm32_clock_init();
+}
+
+#if HAL_USE_SDC
+/*
+* Card detection through the card internal pull-up on D3.
+*/
+bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
+
+(void)sdcp;
+return (bool_t)!palReadPad(GPIOD, GPIOD_SDIO_CD_N);
+}
+
+/*
+* Card write protection detection is not possible, the card is always
+* reported as not protected.
+*/
+bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
+
+(void)sdcp;
+return 0;
+}
+#endif /* HAL_USE_SDC */
+
+/**
+ * @brief   Board-specific initialization code.
+ */
+void boardInit(void) {
+}

boards/base/Marlin/chibios_board/board.mk

@@ -1,3 +1,3 @@
-BOARDINC = $(GFXLIB)/boards/base/Marlin/chibios_board
-BOARDSRC = $(BOARDINC)/board.c \
-
+BOARDINC = $(GFXLIB)/boards/base/Marlin/chibios_board
+BOARDSRC = $(BOARDINC)/board.c \
+

boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.c

@@ -1,106 +1,106 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-#include "hal.h"
-
-#if HAL_USE_PAL || defined(__DOXYGEN__)
-/**
- * @brief   PAL setup.
- * @details Digital I/O ports static configuration as defined in @p board.h.
- *          This variable is used by the HAL when initializing the PAL driver.
- */
-const PALConfig pal_default_config =
-{
-  {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
-   VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},
-  {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
-   VAL_GPIOB_ODR,   VAL_GPIOB_AFRL,   VAL_GPIOB_AFRH},
-  {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
-   VAL_GPIOC_ODR,   VAL_GPIOC_AFRL,   VAL_GPIOC_AFRH},
-  {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
-   VAL_GPIOD_ODR,   VAL_GPIOD_AFRL,   VAL_GPIOD_AFRH},
-  {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
-   VAL_GPIOE_ODR,   VAL_GPIOE_AFRL,   VAL_GPIOE_AFRH},
-  {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
-   VAL_GPIOF_ODR,   VAL_GPIOF_AFRL,   VAL_GPIOF_AFRH},
-  {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
-   VAL_GPIOG_ODR,   VAL_GPIOG_AFRL,   VAL_GPIOG_AFRH},
-  {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
-   VAL_GPIOH_ODR,   VAL_GPIOH_AFRL,   VAL_GPIOH_AFRH},
-  {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
-   VAL_GPIOI_ODR,   VAL_GPIOI_AFRL,   VAL_GPIOI_AFRH}
-};
-#endif
-
-/**
- * @brief   Early initialization code.
- * @details This initialization must be performed just after stack setup
- *          and before any other initialization.
- */
-void __early_init(void) {
-
-  stm32_clock_init();
-}
-
-#if HAL_USE_SDC || defined(__DOXYGEN__)
-/**
- * @brief   SDC card detection.
- */
-bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
-
-  (void)sdcp;
-  /* TODO: Fill the implementation.*/
-  return TRUE;
-}
-
-/**
- * @brief   SDC card write protection detection.
- */
-bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
-
-  (void)sdcp;
-  /* TODO: Fill the implementation.*/
-  return FALSE;
-}
-#endif /* HAL_USE_SDC */
-
-#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)
-/**
- * @brief   MMC_SPI card detection.
- */
-bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
-
-  (void)mmcp;
-  return !palReadPad(GPIOD, GPIOD_SD_CD);
-}
-
-/**
- * @brief   MMC_SPI card write protection detection.
- */
-bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
-
-  (void)mmcp;
-  /* Board has no write protection detection */
-  return FALSE;
-}
-#endif
-
-/**
- * @brief   Board-specific initialization code.
- * @todo    Add your board-specific code, if any.
- */
-void boardInit(void) {
-}
+/*
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "hal.h"
+
+#if HAL_USE_PAL || defined(__DOXYGEN__)
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+const PALConfig pal_default_config =
+{
+  {VAL_GPIOA_MODER, VAL_GPIOA_OTYPER, VAL_GPIOA_OSPEEDR, VAL_GPIOA_PUPDR,
+   VAL_GPIOA_ODR,   VAL_GPIOA_AFRL,   VAL_GPIOA_AFRH},
+  {VAL_GPIOB_MODER, VAL_GPIOB_OTYPER, VAL_GPIOB_OSPEEDR, VAL_GPIOB_PUPDR,
+   VAL_GPIOB_ODR,   VAL_GPIOB_AFRL,   VAL_GPIOB_AFRH},
+  {VAL_GPIOC_MODER, VAL_GPIOC_OTYPER, VAL_GPIOC_OSPEEDR, VAL_GPIOC_PUPDR,
+   VAL_GPIOC_ODR,   VAL_GPIOC_AFRL,   VAL_GPIOC_AFRH},
+  {VAL_GPIOD_MODER, VAL_GPIOD_OTYPER, VAL_GPIOD_OSPEEDR, VAL_GPIOD_PUPDR,
+   VAL_GPIOD_ODR,   VAL_GPIOD_AFRL,   VAL_GPIOD_AFRH},
+  {VAL_GPIOE_MODER, VAL_GPIOE_OTYPER, VAL_GPIOE_OSPEEDR, VAL_GPIOE_PUPDR,
+   VAL_GPIOE_ODR,   VAL_GPIOE_AFRL,   VAL_GPIOE_AFRH},
+  {VAL_GPIOF_MODER, VAL_GPIOF_OTYPER, VAL_GPIOF_OSPEEDR, VAL_GPIOF_PUPDR,
+   VAL_GPIOF_ODR,   VAL_GPIOF_AFRL,   VAL_GPIOF_AFRH},
+  {VAL_GPIOG_MODER, VAL_GPIOG_OTYPER, VAL_GPIOG_OSPEEDR, VAL_GPIOG_PUPDR,
+   VAL_GPIOG_ODR,   VAL_GPIOG_AFRL,   VAL_GPIOG_AFRH},
+  {VAL_GPIOH_MODER, VAL_GPIOH_OTYPER, VAL_GPIOH_OSPEEDR, VAL_GPIOH_PUPDR,
+   VAL_GPIOH_ODR,   VAL_GPIOH_AFRL,   VAL_GPIOH_AFRH},
+  {VAL_GPIOI_MODER, VAL_GPIOI_OTYPER, VAL_GPIOI_OSPEEDR, VAL_GPIOI_PUPDR,
+   VAL_GPIOI_ODR,   VAL_GPIOI_AFRL,   VAL_GPIOI_AFRH}
+};
+#endif
+
+/**
+ * @brief   Early initialization code.
+ * @details This initialization must be performed just after stack setup
+ *          and before any other initialization.
+ */
+void __early_init(void) {
+
+  stm32_clock_init();
+}
+
+#if HAL_USE_SDC || defined(__DOXYGEN__)
+/**
+ * @brief   SDC card detection.
+ */
+bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
+
+  (void)sdcp;
+  /* TODO: Fill the implementation.*/
+  return TRUE;
+}
+
+/**
+ * @brief   SDC card write protection detection.
+ */
+bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
+
+  (void)sdcp;
+  /* TODO: Fill the implementation.*/
+  return FALSE;
+}
+#endif /* HAL_USE_SDC */
+
+#if HAL_USE_MMC_SPI || defined(__DOXYGEN__)
+/**
+ * @brief   MMC_SPI card detection.
+ */
+bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
+
+  (void)mmcp;
+  return !palReadPad(GPIOD, GPIOD_SD_CD);
+}
+
+/**
+ * @brief   MMC_SPI card write protection detection.
+ */
+bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
+
+  (void)mmcp;
+  /* Board has no write protection detection */
+  return FALSE;
+}
+#endif
+
+/**
+ * @brief   Board-specific initialization code.
+ * @todo    Add your board-specific code, if any.
+ */
+void boardInit(void) {
+}

boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board/board.mk

@@ -1,6 +1,6 @@
-# Required include directories
-BOARDINC = $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board
-
-# List of all the board related files.
-BOARDSRC = $(BOARDINC)/board.c \
+# Required include directories
+BOARDINC = $(GFXLIB)/boards/base/Mikromedia-STM32-M4-ILI9341/ChibiOS_Board
+
+# List of all the board related files.
+BOARDSRC = $(BOARDINC)/board.c \
             $(BOARDINC)/flash_memory.c

boards/base/Olimex-STM32-LCD/chibios_board/board.c

@@ -1,88 +1,88 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-#include "ch.h"
-#include "hal.h"
-
-/**
- * @brief   PAL setup.
- * @details Digital I/O ports static configuration as defined in @p board.h.
- *          This variable is used by the HAL when initializing the PAL driver.
- */
-#if HAL_USE_PAL || defined(__DOXYGEN__)
-const PALConfig pal_default_config =
-{
-  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
-  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
-  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
-  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
-  {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
-  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},
-  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},
-};
-#endif
-
-/*
- * Early initialization code.
- * This initialization must be performed just after stack setup and before
- * any other initialization.
- */
-void __early_init(void) {
-  stm32_clock_init();
-}
-
-#if HAL_USE_SDC || defined(__DOXYGEN__)
-/**
- * @brief   SDC card detection.
- */
-bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
-  (void)sdcp;
-
-  return TRUE;
-}
-
-/**
- * @brief   SDC card write protection detection.
- */
-bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
-  (void)sdcp;
-
-  return FALSE;
-}
-#endif /* HAL_USE_SDC */
-
-#if HAL_USE_MMC_SPI
-/* Board-related functions related to the MMC_SPI driver.*/
-bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
-  (void)mmcp;
-
-  return TRUE;
-}
-
-bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
-  (void)mmcp;
-
-  return FALSE;
-}
-#endif
-
-/*
- * Board-specific initialization code.
- */
-void boardInit(void) {
-
-}
-
+/*
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#include "ch.h"
+#include "hal.h"
+
+/**
+ * @brief   PAL setup.
+ * @details Digital I/O ports static configuration as defined in @p board.h.
+ *          This variable is used by the HAL when initializing the PAL driver.
+ */
+#if HAL_USE_PAL || defined(__DOXYGEN__)
+const PALConfig pal_default_config =
+{
+  {VAL_GPIOAODR, VAL_GPIOACRL, VAL_GPIOACRH},
+  {VAL_GPIOBODR, VAL_GPIOBCRL, VAL_GPIOBCRH},
+  {VAL_GPIOCODR, VAL_GPIOCCRL, VAL_GPIOCCRH},
+  {VAL_GPIODODR, VAL_GPIODCRL, VAL_GPIODCRH},
+  {VAL_GPIOEODR, VAL_GPIOECRL, VAL_GPIOECRH},
+  {VAL_GPIOFODR, VAL_GPIOFCRL, VAL_GPIOFCRH},
+  {VAL_GPIOGODR, VAL_GPIOGCRL, VAL_GPIOGCRH},
+};
+#endif
+
+/*
+ * Early initialization code.
+ * This initialization must be performed just after stack setup and before
+ * any other initialization.
+ */
+void __early_init(void) {
+  stm32_clock_init();
+}
+
+#if HAL_USE_SDC || defined(__DOXYGEN__)
+/**
+ * @brief   SDC card detection.
+ */
+bool_t sdc_lld_is_card_inserted(SDCDriver *sdcp) {
+  (void)sdcp;
+
+  return TRUE;
+}
+
+/**
+ * @brief   SDC card write protection detection.
+ */
+bool_t sdc_lld_is_write_protected(SDCDriver *sdcp) {
+  (void)sdcp;
+
+  return FALSE;
+}
+#endif /* HAL_USE_SDC */
+
+#if HAL_USE_MMC_SPI
+/* Board-related functions related to the MMC_SPI driver.*/
+bool_t mmc_lld_is_card_inserted(MMCDriver *mmcp) {
+  (void)mmcp;
+
+  return TRUE;
+}
+
+bool_t mmc_lld_is_write_protected(MMCDriver *mmcp) {
+  (void)mmcp;
+
+  return FALSE;
+}
+#endif
+
+/*
+ * Board-specific initialization code.
+ */
+void boardInit(void) {
+
+}
+

boards/base/Olimex-STM32-LCD/chibios_board/board.h

@@ -1,196 +1,196 @@
-/*
-    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
-
-    Licensed under the Apache License, Version 2.0 (the "License");
-    you may not use this file except in compliance with the License.
-    You may obtain a copy of the License at
-
-        http://www.apache.org/licenses/LICENSE-2.0
-
-    Unless required by applicable law or agreed to in writing, software
-    distributed under the License is distributed on an "AS IS" BASIS,
-    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-    See the License for the specific language governing permissions and
-    limitations under the License.
-*/
-
-#ifndef _BOARD_H_
-#define _BOARD_H_
-
-/*
- * Setup for the Olimex STM32-LCD proto board.
- */
-
-/*
- * Board identifier.
- */
-#define BOARD_OLIMEX_STM32_LCD
-#define BOARD_NAME              "Olimex STM32-LCD"
-
-/*
- * Board frequencies.
- */
-#define STM32_LSECLK            32768
-#define STM32_HSECLK            8000000
-
-/*
- * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h.
- */
-#define STM32F10X_HD
-
-/*
- * IO pins assignments.
- */
-#define GPIOA_SPI1NSS           4
-
-#define GPIOB_SPI2NSS           12
-
-#define GPIOA_USB_P             0
-#define GPIOD_USB_DISC          2
-
-#define GPIOE_TFT_RST			2
-#define GPIOD_TFT_LIGHT			13
-#define GPIOC_TFT_YD			0
-#define GPIOC_TFT_YU			1
-#define GPIOC_TFT_XL			2
-#define GPIOC_TFT_XR			3
-
-/*
- * I/O ports initial setup, this configuration is established soon after reset
- * in the initialization code.
- *
- * The digits have the following meaning:
- *   0 - Analog input.
- *   1 - Push Pull output 10MHz.
- *   2 - Push Pull output 2MHz.
- *   3 - Push Pull output 50MHz.
- *   4 - Digital input.
- *   5 - Open Drain output 10MHz.
- *   6 - Open Drain output 2MHz.
- *   7 - Open Drain output 50MHz.
- *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
- *   9 - Alternate Push Pull output 10MHz.
- *   A - Alternate Push Pull output 2MHz.
- *   B - Alternate Push Pull output 50MHz.
- *   C - Reserved.
- *   D - Alternate Open Drain output 10MHz.
- *   E - Alternate Open Drain output 2MHz.
- *   F - Alternate Open Drain output 50MHz.
- * Please refer to the STM32 Reference Manual for details.
- */
-
-/*
- * Port A setup.
- * Everything input with pull-up except:
- * PA0  - Normal input      (USB P).
- * PA2  - Alternate output  (USART2 TX).
- * PA3  - Normal input      (USART2 RX).
- * PA11 - Normal input      (USB DM).
- * PA12 - Normal input      (USB DP).
- */
-#define VAL_GPIOACRL            0x88884B84      /*  PA7...PA0 */
-#define VAL_GPIOACRH            0x88844888      /* PA15...PA8 */
-#define VAL_GPIOAODR            0xFFFFFFFF
-
-/*
- * Port B setup.
- * Everything input with pull-up except:
- */
-#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
-#define VAL_GPIOBCRH            0x88888888      /* PB15...PB8 */
-#define VAL_GPIOBODR            0xFFFFFFFF
-
-/*
- * Port C setup.
- * Everything input with pull-up except:
- * PC0  - Analog Input		(TP_YD).
- * PC1  - Analog Input		(TP_YU).
- * PC2  - Analog Input		(TP_XL).
- * PC3  - Analog Input		(TP_XR).
- * PC8  - Alternate PP 50M	(SD_D0).
- * PC9  - Alternate PP 50M	(SD_D1).
- * PC10 - Alternate PP 50M	(SD_D2).
- * PC11 - Alternate PP 50M	(SD_D3).
- * PC12 - Alternate PP 50M	(SD_CLK).
- * PC14 - Normal input		(XTAL).
- * PC15 - Normal input		(XTAL).
- */
-#define VAL_GPIOCCRL            0x88880000      /*  PC7...PC0 */
-#define VAL_GPIOCCRH            0x448BBBBB	    /* PC15...PC8 */
-#define VAL_GPIOCODR            0xFFFFFFFF
-
-/*
- * Port D setup.
- * Everything input with pull-up except:
- * PD2  - Alternate PP 50M	(SD_CMD)
- * PD0  - Alternate PP 50M  (FSMC_D2)
- * PD1  - Alternate PP 50M  (FSMC_D3)
- * PD4  - Alternate PP 50M	(TFT_RD)
- * PD5  - Alternate PP 50M	(TFT_WR)
- * PD7  - Alternate PP 50M  (TFT_CS)
- * PD8  - Alternate PP 50M  (FSMC_D13)
- * PD9  - Alternate PP 50M  (FSMC_D14)
- * PD10 - Alternate PP 50M  (FSMC_D15)
- * PD14 - Alternate PP 50M  (FSMC_D0)
- * PD15 - Alternate PP 50M  (FSMC_D1)
- */
-#define VAL_GPIODCRL            0xBBBB8BBB      /*  PD7...PD0 */
-#define VAL_GPIODCRH            0xBB388BBB      /* PD15...PD8 */
-#define VAL_GPIODODR            0xFFFFFFFF
-
-/*
- * Port E setup.
- * Everything input with pull-up except:
- * PE2  - Digital Output	(TFT_RST)
- * PE3  - Alternate PP 50M  (TFT_RS)
- * PE7  - Alternate PP 50M	(FSMC_D4)
- * PE8  - Alternate PP 50M  (FSMC_D5)
- * PE9  - Alternate PP 50M  (FSMC_D6)
- * PE10 - Alternate PP 50M  (FSMC_D7)
- * PE11 - Alternate PP 50M  (FSMC_D8)
- * PE12 - Alternate PP 50M  (FSMC_D9)
- * PE13 - Alternate PP 50M  (FSMC_D10)
- * PE14 - Alternate PP 50M  (FSMC_D11)
- * PE15 - Alternate PP 50M  (FSMC_D12)
- */
-#define VAL_GPIOECRL            0xB888B388      /*  PE7...PE0 */
-#define VAL_GPIOECRH            0xBBBBBBBB      /* PE15...PE8 */
-#define VAL_GPIOEODR            0xFFFFFFFF
-
-/*
- * Port F setup.
- * Everything input with pull-up expect:
- */
-#define VAL_GPIOFCRL            0x88888888      /*  PF7...PF0 */
-#define VAL_GPIOFCRH            0x88888888      /* PF15...PF8 */
-#define VAL_GPIOFODR            0xFFFFFFFF
-
-/*
- * Port G setup.
- * Everything input with pull-up expect:
- */
-#define VAL_GPIOGCRL            0x88888888      /*  PG7...PG0 */
-#define VAL_GPIOGCRH            0x88888888      /* PG15...PG8 */
-#define VAL_GPIOGODR            0xFFFFFFFF
-
-/*
- * USB bus activation macro, required by the USB driver.
- */
-#define usb_lld_connect_bus(usbp) palClearPad(GPIOD, GPIOD_USB_DISC)
-
-/*
- * USB bus de-activation macro, required by the USB driver.
- */
-#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOD, GPIOD_USB_DISC)
-
-#if !defined(_FROM_ASM_)
-#ifdef __cplusplus
-extern "C" {
-#endif
-  void boardInit(void);
-#ifdef __cplusplus
-}
-#endif
-#endif /* _FROM_ASM_ */
-
-#endif /* _BOARD_H_ */
+/*
+    ChibiOS/RT - Copyright (C) 2006-2013 Giovanni Di Sirio
+
+    Licensed under the Apache License, Version 2.0 (the "License");
+    you may not use this file except in compliance with the License.
+    You may obtain a copy of the License at
+
+        http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+*/
+
+#ifndef _BOARD_H_
+#define _BOARD_H_
+
+/*
+ * Setup for the Olimex STM32-LCD proto board.
+ */
+
+/*
+ * Board identifier.
+ */
+#define BOARD_OLIMEX_STM32_LCD
+#define BOARD_NAME              "Olimex STM32-LCD"
+
+/*
+ * Board frequencies.
+ */
+#define STM32_LSECLK            32768
+#define STM32_HSECLK            8000000
+
+/*
+ * MCU type, supported types are defined in ./os/hal/platforms/hal_lld.h.
+ */
+#define STM32F10X_HD
+
+/*
+ * IO pins assignments.
+ */
+#define GPIOA_SPI1NSS           4
+
+#define GPIOB_SPI2NSS           12
+
+#define GPIOA_USB_P             0
+#define GPIOD_USB_DISC          2
+
+#define GPIOE_TFT_RST			2
+#define GPIOD_TFT_LIGHT			13
+#define GPIOC_TFT_YD			0
+#define GPIOC_TFT_YU			1
+#define GPIOC_TFT_XL			2
+#define GPIOC_TFT_XR			3
+
+/*
+ * I/O ports initial setup, this configuration is established soon after reset
+ * in the initialization code.
+ *
+ * The digits have the following meaning:
+ *   0 - Analog input.
+ *   1 - Push Pull output 10MHz.
+ *   2 - Push Pull output 2MHz.
+ *   3 - Push Pull output 50MHz.
+ *   4 - Digital input.
+ *   5 - Open Drain output 10MHz.
+ *   6 - Open Drain output 2MHz.
+ *   7 - Open Drain output 50MHz.
+ *   8 - Digital input with PullUp or PullDown resistor depending on ODR.
+ *   9 - Alternate Push Pull output 10MHz.
+ *   A - Alternate Push Pull output 2MHz.
+ *   B - Alternate Push Pull output 50MHz.
+ *   C - Reserved.
+ *   D - Alternate Open Drain output 10MHz.
+ *   E - Alternate Open Drain output 2MHz.
+ *   F - Alternate Open Drain output 50MHz.
+ * Please refer to the STM32 Reference Manual for details.
+ */
+
+/*
+ * Port A setup.
+ * Everything input with pull-up except:
+ * PA0  - Normal input      (USB P).
+ * PA2  - Alternate output  (USART2 TX).
+ * PA3  - Normal input      (USART2 RX).
+ * PA11 - Normal input      (USB DM).
+ * PA12 - Normal input      (USB DP).
+ */
+#define VAL_GPIOACRL            0x88884B84      /*  PA7...PA0 */
+#define VAL_GPIOACRH            0x88844888      /* PA15...PA8 */
+#define VAL_GPIOAODR            0xFFFFFFFF
+
+/*
+ * Port B setup.
+ * Everything input with pull-up except:
+ */
+#define VAL_GPIOBCRL            0x88888888      /*  PB7...PB0 */
+#define VAL_GPIOBCRH            0x88888888      /* PB15...PB8 */
+#define VAL_GPIOBODR            0xFFFFFFFF
+
+/*
+ * Port C setup.
+ * Everything input with pull-up except:
+ * PC0  - Analog Input		(TP_YD).
+ * PC1  - Analog Input		(TP_YU).
+ * PC2  - Analog Input		(TP_XL).
+ * PC3  - Analog Input		(TP_XR).
+ * PC8  - Alternate PP 50M	(SD_D0).
+ * PC9  - Alternate PP 50M	(SD_D1).
+ * PC10 - Alternate PP 50M	(SD_D2).
+ * PC11 - Alternate PP 50M	(SD_D3).
+ * PC12 - Alternate PP 50M	(SD_CLK).
+ * PC14 - Normal input		(XTAL).
+ * PC15 - Normal input		(XTAL).
+ */
+#define VAL_GPIOCCRL            0x88880000      /*  PC7...PC0 */
+#define VAL_GPIOCCRH            0x448BBBBB	    /* PC15...PC8 */
+#define VAL_GPIOCODR            0xFFFFFFFF
+
+/*
+ * Port D setup.
+ * Everything input with pull-up except:
+ * PD2  - Alternate PP 50M	(SD_CMD)
+ * PD0  - Alternate PP 50M  (FSMC_D2)
+ * PD1  - Alternate PP 50M  (FSMC_D3)
+ * PD4  - Alternate PP 50M	(TFT_RD)
+ * PD5  - Alternate PP 50M	(TFT_WR)
+ * PD7  - Alternate PP 50M  (TFT_CS)
+ * PD8  - Alternate PP 50M  (FSMC_D13)
+ * PD9  - Alternate PP 50M  (FSMC_D14)
+ * PD10 - Alternate PP 50M  (FSMC_D15)
+ * PD14 - Alternate PP 50M  (FSMC_D0)
+ * PD15 - Alternate PP 50M  (FSMC_D1)
+ */
+#define VAL_GPIODCRL            0xBBBB8BBB      /*  PD7...PD0 */
+#define VAL_GPIODCRH            0xBB388BBB      /* PD15...PD8 */
+#define VAL_GPIODODR            0xFFFFFFFF
+
+/*
+ * Port E setup.
+ * Everything input with pull-up except:
+ * PE2  - Digital Output	(TFT_RST)
+ * PE3  - Alternate PP 50M  (TFT_RS)
+ * PE7  - Alternate PP 50M	(FSMC_D4)
+ * PE8  - Alternate PP 50M  (FSMC_D5)
+ * PE9  - Alternate PP 50M  (FSMC_D6)
+ * PE10 - Alternate PP 50M  (FSMC_D7)
+ * PE11 - Alternate PP 50M  (FSMC_D8)
+ * PE12 - Alternate PP 50M  (FSMC_D9)
+ * PE13 - Alternate PP 50M  (FSMC_D10)
+ * PE14 - Alternate PP 50M  (FSMC_D11)
+ * PE15 - Alternate PP 50M  (FSMC_D12)
+ */
+#define VAL_GPIOECRL            0xB888B388      /*  PE7...PE0 */
+#define VAL_GPIOECRH            0xBBBBBBBB      /* PE15...PE8 */
+#define VAL_GPIOEODR            0xFFFFFFFF
+
+/*
+ * Port F setup.
+ * Everything input with pull-up expect:
+ */
+#define VAL_GPIOFCRL            0x88888888      /*  PF7...PF0 */
+#define VAL_GPIOFCRH            0x88888888      /* PF15...PF8 */
+#define VAL_GPIOFODR            0xFFFFFFFF
+
+/*
+ * Port G setup.
+ * Everything input with pull-up expect:
+ */
+#define VAL_GPIOGCRL            0x88888888      /*  PG7...PG0 */
+#define VAL_GPIOGCRH            0x88888888      /* PG15...PG8 */
+#define VAL_GPIOGODR            0xFFFFFFFF
+
+/*
+ * USB bus activation macro, required by the USB driver.
+ */
+#define usb_lld_connect_bus(usbp) palClearPad(GPIOD, GPIOD_USB_DISC)
+
+/*
+ * USB bus de-activation macro, required by the USB driver.
+ */
+#define usb_lld_disconnect_bus(usbp) palSetPad(GPIOD, GPIOD_USB_DISC)
+
+#if !defined(_FROM_ASM_)
+#ifdef __cplusplus
+extern "C" {
+#endif
+  void boardInit(void);
+#ifdef __cplusplus
+}
+#endif
+#endif /* _FROM_ASM_ */
+
+#endif /* _BOARD_H_ */

boards/base/Olimex-STM32-LCD/chibios_board/board.mk

@@ -1,3 +1,3 @@
-BOARDINC = $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board
-BOARDSRC = $(BOARDINC)/board.c \
-
+BOARDINC = $(GFXLIB)/boards/base/Olimex-STM32-LCD/chibios_board
+BOARDSRC = $(BOARDINC)/board.c \
+

boards/base/STM32F429i-Discovery/chibios/board.mk

@@ -1,7 +1,7 @@
-GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
-GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \
-			$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c
-
-GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
-include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
-include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk
+GFXINC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios
+GFXSRC  +=	$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f429i_discovery_sdram.c \
+			$(GFXLIB)/boards/base/STM32F429i-Discovery/chibios/stm32f4xx_fmc.c
+
+GFXDEFS += -DGFX_USE_OS_CHIBIOS=GFXON
+include $(GFXLIB)/drivers/gdisp/STM32LTDC/driver.mk
+include $(GFXLIB)/drivers/ginput/touch/STMPE811/driver.mk

boards/base/STM32F429i-Discovery/chibios/board_STM32LTDC.h

@@ -1,212 +1,212 @@
-/*
- * This file is subject to the terms of the GFX License. If a copy of
- * the license was not distributed with this file, you can obtain one at:
- *
- *              http://ugfx.io/license.html
- */
-
-#ifndef _GDISP_LLD_BOARD_H
-#define _GDISP_LLD_BOARD_H
-
-#include "stm32f4xx_fmc.h"
-#include "stm32f429i_discovery_sdram.h"
-#include <string.h>
-
-#define SPI_PORT	&SPID5
-#define DC_PORT		GPIOD
-#define DC_PIN		GPIOD_LCD_WRX
-
-static const SPIConfig spi_cfg = {
-	NULL,
-	GPIOC,
-	GPIOC_SPI5_LCD_CS,
-	((1 << 3) & SPI_CR1_BR) | SPI_CR1_SSM | SPI_CR1_SSI | SPI_CR1_MSTR
-};
-
-static const ltdcConfig driverCfg = {
-	240, 320,
-	10, 2,
-	20, 2,
-	10, 4,
-	0,
-	0x000000,
-	{
-		(LLDCOLOR_TYPE *)SDRAM_BANK_ADDR,	// frame
-		240, 320,							// width, height
-		240 * LTDC_PIXELBYTES,				// pitch
-		LTDC_PIXELFORMAT,					// fmt
-		0, 0,								// x, y
-		240, 320,							// cx, cy
-		0x00000000,							// defcolor
-		0x000000,							// keycolor
-		LTDC_BLEND_FIX1_FIX2,				// blending
-		0,									// palette
-		0,									// palettelen
-		0xFF,								// alpha
-		LTDC_LEF_ENABLE						// flags
-	},
-#if STM32LTDC_USE_LAYER2 || STM32LTDC_USE_DOUBLEBUFFERING
-	{										// Foreground layer config (if turned on)
-		(LLDCOLOR_TYPE *)(SDRAM_BANK_ADDR+(240 * 320 * LTDC_PIXELBYTES)), // Frame buffer address
-		240, 320,							// width, height
-		240 * LTDC_PIXELBYTES,				// pitch
-		LTDC_PIXELFORMAT,					// fmt
-		0, 0,								// x, y
-		240, 320,							// cx, cy
-		0x00000000,							// Default color (ARGB8888)
-		0x000000,							// Color key (RGB888)
-		LTDC_BLEND_MOD1_MOD2,				// Blending factors
-		0,									// Palette (RGB888, can be NULL)
-		0,									// Palette length
-		0xFF,								// Constant alpha factor
-		LTDC_LEF_ENABLE						// Layer configuration flags
-	}
-#else
-	LTDC_UNUSED_LAYER_CONFIG
-#endif
-};
-
-#include "ili9341.h"
-
-static void acquire_bus(GDisplay *g) {
-	(void) g;
-
-	spiSelect(SPI_PORT);
-}
-
-static void release_bus(GDisplay *g) {
-	(void) g;
-
-	spiUnselect(SPI_PORT);
-}
-
-static void write_index(GDisplay *g, gU8 index) {
-	static gU8	sindex;
-	(void) g;
-
-	palClearPad(DC_PORT, DC_PIN);
-	sindex = index;
-	spiSend(SPI_PORT, 1, &sindex);
-}
-
-static void write_data(GDisplay *g, gU8 data) {
-	static gU8	sdata;