Skip to content

Commit

Permalink
Merge pull request #53 from lovyan03/develop
Browse files Browse the repository at this point in the history 
0.2.3
  • Loading branch information
@lovyan03
lovyan03 authored Oct 10, 2020
2 parents 4d01956 + 5adc5ac commit e9333d4
Show file tree
Hide file tree
Showing 34 changed files with 304,373 additions and 3,085 deletions.
11 changes: 6 additions & 5 deletions README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -404,6 +404,7 @@ TFT_eSPIのベースとなった、[AdafruitGFX](https://github.com/adafruit/Ada
多くの技術的なアドバイスやESP-IDF環境での検証に協力してくれた[ciniml](https://github.com/ciniml)氏へ感謝いたします。
不具合の多い開発初期からの動作検証および多数の助言をくださった[mongonta0716](https://github.com/mongonta0716)氏へ感謝いたします。
多数のボードでの動作検証や英語への翻訳および多数の助言をくださった[tobozo](https://github.com/tobozo)氏へ感謝いたします。
フォントデータの作成に協力してくださった[TANAKA Masayuki](https://github.com/tanakamasayuki)氏へ感謝いたします。
Thanks to [Bodmer](https://github.com/Bodmer/), author of the [TFT_eSPI](https://github.com/Bodmer/TFT_eSPI) library, for the inspiration to create this library.
Thanks to [Adafruit Industries](https://github.com/adafruit/) for publishing [AdafruitGFX](https://github.com/adafruit/Adafruit-GFX-Library), which is the basis for TFT_eSPI.
Expand All @@ -413,6 +414,7 @@ Thanks to [Richard Moore](https://github.com/ricmoo/), author of [QRCode](https:
Thanks to [ciniml](https://github.com/ciniml), for many technical tips and help with validation in the ESP-IDF environment.
Thanks to [mongonta0716](https://github.com/mongonta0716), for verifying the work from the beginning of the development with many bugs and for his advice.
Thanks to [tobozo](https://github.com/tobozo), for testing it on various boards, translating it into English and giving me a lot of advice.
Thanks to [TANAKA Masayuki](https://github.com/tanakamasayuki), for creating the font data.
使用ライブラリ included library
Expand All @@ -434,10 +436,9 @@ Thanks to [tobozo](https://github.com/tobozo), for testing it on various boards,
ライセンス License
----------------
main : [BSD](https://github.com/lovyan03/LovyanGFX/blob/master/license.txt)
GFX font and GLCD font : [BSD](https://github.com/adafruit/Adafruit-GFX-Library/blob/master/license.txt) Adafruit Industries
Font 2,4,6,7,8 : [BSD](https://github.com/Bodmer/TFT_eSPI/blob/master/license.txt) Bodmer
main : [FreeBSD](license.txt)
GFX font and GLCD font : [2-clause BSD](https://github.com/adafruit/Adafruit-GFX-Library/blob/master/license.txt) Adafruit Industries
Font 2,4,6,7,8 : [FreeBSD](https://github.com/Bodmer/TFT_eSPI/blob/master/license.txt) Bodmer
converted IPA font : [IPA Font License](src/Fonts/IPA/IPA_Font_License_Agreement_v1.0.txt)
5 changes: 3 additions & 2 deletions examples/HowToUse/2_spi_setting/2_spi_setting.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -131,6 +131,7 @@ static lgfx::Panel_ILI9342 panel;
//static lgfx::Panel_ILI9486L panel;
//static lgfx::Panel_ILI9488 panel;
//static lgfx::Panel_SSD1351 panel;
//static lgfx::Panel_ST7735 panel;
//static lgfx::Panel_ST7735S panel;
//static lgfx::Panel_ST7789 panel;
//static lgfx::Panel_ST7796 panel;
Expand Down Expand Up @@ -218,9 +219,9 @@ void setup(void)
panel.backlight_level = true;

// Set the panel color inversion.
// invertDisplayの初期値を設定します。trueを設定すると反転します。
// パネルの色反転設定です。trueを設定すると色が反転します。(例:黒が白に、青が黄色に)
// 省略時は false。画面の色が反転している場合は設定を変更してください。
panel.invert = false;
panel.reverse_invert = false;

// Set the RGB/BGR color order.
// パネルの色順がを設定します。 RGB=true / BGR=false
Expand Down
94 changes: 56 additions & 38 deletions examples/HowToUse/3_fonts/3_fonts.ino
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,10 @@ void drawGradation(void)
{
// 背景にグラデーションを描画する
lcd.startWrite();
for (int y = 0; y < 512; ++y) {
for (int x = 0; x < 512; ++x) {
lcd.writePixel(x, y, lcd.color888(x>>1, (x + y) >> 2, y>>1));
lcd.setAddrWindow(0, 0, lcd.width(), lcd.height());
for (int y = 0; y < lcd.height(); ++y) {
for (int x = 0; x < lcd.width(); ++x) {
lcd.writeColor(lcd.color888(x>>1, (x + y) >> 2, y>>1), 1);
}
}
lcd.endWrite();
Expand Down Expand Up @@ -85,6 +86,23 @@ void setup(void)
delay(3000);
drawGradation();

// IPAフォントをコンバートした日本語フォントが４種類ｘ９サイズ = 36通りプリセットされています。
// 末尾の数字がサイズを表しており、8, 12, 16, 20, 24, 28, 32, 36, 40 が用意されています。
// fonts::lgfxJapanMincho_16 // 明朝体 固定幅フォント
// fonts::lgfxJapanMinchoP_16 // 明朝体 プロポーショナルフォント
// fonts::lgfxJapanGothic_16 // ゴシック体 固定幅フォント
// fonts::lgfxJapanGothicP_16 // ゴシック体 プロポーショナルフォント

lcd.setCursor(0, 0);
lcd.setFont(&fonts::lgfxJapanMincho_16); lcd.print("明朝体 16 Hello World\nこんにちは世界\n");
//lcd.setFont(&fonts::lgfxJapanMinchoP_16); lcd.print("明朝 P 16 Hello World\nこんにちは世界\n");
lcd.setFont(&fonts::lgfxJapanGothic_16); lcd.print("ゴシック体 16 Hello World\nこんにちは世界\n");
//lcd.setFont(&fonts::lgfxJapanGothicP_16); lcd.print("ゴシック P 16 Hello World\nこんにちは世界\n");


delay(3000);
drawGradation();


// LovyanGFXでは AdafruitGFX フォントも setFont 関数で使用できます。
// (TFT_eSPIとの互換性のために setFreeFont関数も用意しています)
Expand Down Expand Up @@ -240,45 +258,45 @@ void drawNumberTest(const lgfx::IFont* font)
lcd.drawFastHLine(0, 195, 320);

for (int i = 0; i < 200; ++i) {
lcd.setTextDatum( bottom_right ); lcd.drawNumber(i, 80, 45);
lcd.setTextDatum( bottom_center ); lcd.drawNumber(i, 160, 45);
lcd.setTextDatum( bottom_left ); lcd.drawNumber(i, 240, 45);
lcd.setTextDatum( baseline_right ); lcd.drawNumber(i, 80, 95);
lcd.setTextDatum( baseline_center ); lcd.drawNumber(i, 160, 95);
lcd.setTextDatum( baseline_left ); lcd.drawNumber(i, 240, 95);
lcd.setTextDatum( middle_right ); lcd.drawNumber(i, 80, 145);
lcd.setTextDatum( middle_center ); lcd.drawNumber(i, 160, 145);
lcd.setTextDatum( middle_left ); lcd.drawNumber(i, 240, 145);
lcd.setTextDatum( top_right ); lcd.drawNumber(i, 80, 195);
lcd.setTextDatum( top_center ); lcd.drawNumber(i, 160, 195);
lcd.setTextDatum( top_left ); lcd.drawNumber(i, 240, 195);
lcd.setTextDatum( textdatum_t::bottom_right ); lcd.drawNumber(i, 80, 45);
lcd.setTextDatum( textdatum_t::bottom_center ); lcd.drawNumber(i, 160, 45);
lcd.setTextDatum( textdatum_t::bottom_left ); lcd.drawNumber(i, 240, 45);
lcd.setTextDatum( textdatum_t::baseline_right ); lcd.drawNumber(i, 80, 95);
lcd.setTextDatum( textdatum_t::baseline_center ); lcd.drawNumber(i, 160, 95);
lcd.setTextDatum( textdatum_t::baseline_left ); lcd.drawNumber(i, 240, 95);
lcd.setTextDatum( textdatum_t::middle_right ); lcd.drawNumber(i, 80, 145);
lcd.setTextDatum( textdatum_t::middle_center ); lcd.drawNumber(i, 160, 145);
lcd.setTextDatum( textdatum_t::middle_left ); lcd.drawNumber(i, 240, 145);
lcd.setTextDatum( textdatum_t::top_right ); lcd.drawNumber(i, 80, 195);
lcd.setTextDatum( textdatum_t::top_center ); lcd.drawNumber(i, 160, 195);
lcd.setTextDatum( textdatum_t::top_left ); lcd.drawNumber(i, 240, 195);
}
}

void loop(void)
{
// ※ 名前が"Free"で始まるフォントは 9pt 12pt 18pt 24ptの４種類があります。
drawNumberTest( &Font0 );
drawNumberTest( &Font2 );
drawNumberTest( &Font4 );
drawNumberTest( &Font6 );
drawNumberTest( &Font7 );
drawNumberTest( &Font8 );
drawNumberTest( &TomThumb );
drawNumberTest( &FreeMono9pt7b );
drawNumberTest( &FreeMonoBold9pt7b );
drawNumberTest( &FreeMonoOblique9pt7b );
drawNumberTest( &FreeMonoBoldOblique9pt7b);
drawNumberTest( &FreeSans9pt7b );
drawNumberTest( &FreeSansBold9pt7b );
drawNumberTest( &FreeSansOblique9pt7b );
drawNumberTest( &FreeSansBoldOblique9pt7b);
drawNumberTest( &FreeSerif9pt7b );
drawNumberTest( &FreeSerifBold9pt7b );
drawNumberTest( &FreeSerifItalic9pt7b );
drawNumberTest( &FreeSerifBoldItalic9pt7b);
drawNumberTest( &Orbitron_Light_24 );
drawNumberTest( &Roboto_Thin_24 );
drawNumberTest( &Satisfy_24 );
drawNumberTest( &Yellowtail_32 );
drawNumberTest( &fonts::Font0 );
drawNumberTest( &fonts::Font2 );
drawNumberTest( &fonts::Font4 );
drawNumberTest( &fonts::Font6 );
drawNumberTest( &fonts::Font7 );
drawNumberTest( &fonts::Font8 );
drawNumberTest( &fonts::TomThumb );
drawNumberTest( &fonts::FreeMono9pt7b );
drawNumberTest( &fonts::FreeMonoBold9pt7b );
drawNumberTest( &fonts::FreeMonoOblique9pt7b );
drawNumberTest( &fonts::FreeMonoBoldOblique9pt7b);
drawNumberTest( &fonts::FreeSans9pt7b );
drawNumberTest( &fonts::FreeSansBold9pt7b );
drawNumberTest( &fonts::FreeSansOblique9pt7b );
drawNumberTest( &fonts::FreeSansBoldOblique9pt7b);
drawNumberTest( &fonts::FreeSerif9pt7b );
drawNumberTest( &fonts::FreeSerifBold9pt7b );
drawNumberTest( &fonts::FreeSerifItalic9pt7b );
drawNumberTest( &fonts::FreeSerifBoldItalic9pt7b);
drawNumberTest( &fonts::Orbitron_Light_24 );
drawNumberTest( &fonts::Roboto_Thin_24 );
drawNumberTest( &fonts::Satisfy_24 );
drawNumberTest( &fonts::Yellowtail_32 );
}
Loading

0 comments on commit e9333d4

Please sign in to comment.