Mercurial > public > ostc4

view Discovery/Src/gfx_fonts.c @ 352:1f24022345d1 fix-merge-mess

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix merge problem The merge in changeset 352 is simply wrong, so revert all changes made in that merge. Signed-off-by: Jan Mulder <jlmulder@xs4all.nl>
author Jan Mulder <jlmulder@xs4all.nl>
date Tue, 08 Oct 2019 16:35:45 +0200
parents 5ca88855da87
children 1c95f811967c
line wrap: on
line source

/**
  ******************************************************************************
  * @file    gfx_fonts.c
  * @author  heinrichs/weikamp, JD Gascuel
  * @version V1.4.0
  * @date    17-Decembre-2017
  * @brief   Font data (and images) stored in UPPER ROM.
  *
  ******************************************************************************
  * @attention
  *
  * <h2><center>&copy; COPYRIGHT(c) 2017 heinrichs weikamp</center></h2>
  *
  ******************************************************************************
  */

/* Includes ------------------------------------------------------------------*/

#include "gfx_fonts.h"

#ifdef DEBUG
# 	define INCLUDE_FONTS_BINARY
#endif

#ifdef INCLUDE_FONTS_BINARY

/* Fonts fixed in upper region */
#include "Fonts/font_awe48.h"
#include "Fonts/font_T24.h"
#include "Fonts/font_T42.h"
#include "Fonts/font_T48_plus.h"
#include "Fonts/font_T54.h"
#include "Fonts/font_T84.h"
#include "Fonts/font_T105.h"
#include "Fonts/font_T144_plus.h"

/* Images fixed in upper region */
#include "Fonts/image_battery.h"
#include "Fonts/image_heinrichs_weikamp.h"
#include "Fonts/image_ostc.h"

#endif // INCLUDE_FONTS_BINARY