-
-
Notifications
You must be signed in to change notification settings - Fork 13
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #84 from tobozo/1.5.2
1.5.2
- Loading branch information
Showing
19 changed files
with
1,097 additions
and
1,336 deletions.
There are no files selected for viewing
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,8 +1,8 @@ | ||
| name=ESP32-Chimera-Core | ||
| version=1.5.1 | ||
| version=1.5.2 | ||
| author=tobozo,Lovyan03 | ||
| maintainer[email protected] | ||
| sentence=Alternate library M5Stack/M5Core2/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles | ||
| sentence=Alternate library for M5Stack/M5Core2/Odroid-Go/D-Duino and possiblly other ESP32/TFT/SD bundles | ||
| paragraph=See more on https://github.com/tobozo/ESP32-Chimera-Core | ||
| category=Device Control | ||
| url=https://github.com/tobozo/ESP32-Chimera-Core | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,122 @@ | ||
| #pragma once | ||
|
|
||
| #include <LovyanGFX.hpp> | ||
| #include <lgfx/v1/platforms/esp32s3/Panel_RGB.hpp> | ||
| #include <lgfx/v1/platforms/esp32s3/Bus_RGB.hpp> | ||
| #include <driver/i2c.h> | ||
|
|
||
|
|
||
|
|
||
| class LGFX_Makerfabs : public lgfx::LGFX_Device | ||
| { | ||
| public: | ||
|
|
||
| lgfx::Bus_RGB _bus_instance; | ||
| lgfx::Panel_RGB _panel_instance; | ||
| lgfx::Light_PWM _light_instance; | ||
| lgfx::Touch_GT911 _touch_instance; | ||
|
|
||
| LGFX_Makerfabs(void) | ||
| { | ||
| { | ||
| auto cfg = _panel_instance.config(); | ||
|
|
||
| cfg.memory_width = 480; | ||
| cfg.panel_width = 480; | ||
| cfg.memory_height = 272; | ||
| cfg.panel_height = 272; | ||
|
|
||
| cfg.offset_x = 0; | ||
| cfg.offset_y = 0; | ||
|
|
||
| _panel_instance.config(cfg); | ||
| } | ||
|
|
||
| { | ||
| auto cfg = _panel_instance.config_detail(); | ||
|
|
||
| cfg.use_psram = 1; | ||
|
|
||
| _panel_instance.config_detail(cfg); | ||
| } | ||
|
|
||
| { | ||
| auto cfg = _bus_instance.config(); | ||
| cfg.panel = &_panel_instance; | ||
|
|
||
| cfg.pin_d0 = GPIO_NUM_8; // B0 | ||
| cfg.pin_d1 = GPIO_NUM_3; // B1 | ||
| cfg.pin_d2 = GPIO_NUM_46; // B2 | ||
| cfg.pin_d3 = GPIO_NUM_9; // B3 | ||
| cfg.pin_d4 = GPIO_NUM_1; // B4 | ||
| cfg.pin_d5 = GPIO_NUM_5; // G0 | ||
| cfg.pin_d6 = GPIO_NUM_6; // G1 | ||
| cfg.pin_d7 = GPIO_NUM_7; // G2 | ||
| cfg.pin_d8 = GPIO_NUM_15; // G3 | ||
| cfg.pin_d9 = GPIO_NUM_16; // G4 | ||
| cfg.pin_d10 = GPIO_NUM_4; // G5 | ||
| cfg.pin_d11 = GPIO_NUM_45; // R0 | ||
| cfg.pin_d12 = GPIO_NUM_48; // R1 | ||
| cfg.pin_d13 = GPIO_NUM_47; // R2 | ||
| cfg.pin_d14 = GPIO_NUM_21; // R3 | ||
| cfg.pin_d15 = GPIO_NUM_14; // R4 | ||
|
|
||
| cfg.pin_henable = GPIO_NUM_40; | ||
| cfg.pin_vsync = GPIO_NUM_41; | ||
| cfg.pin_hsync = GPIO_NUM_39; | ||
| cfg.pin_pclk = GPIO_NUM_42; | ||
| cfg.freq_write = 9000000; | ||
|
|
||
| cfg.hsync_polarity = 0; | ||
| cfg.hsync_front_porch = 8; | ||
| cfg.hsync_pulse_width = 4; | ||
| cfg.hsync_back_porch = 43; | ||
| cfg.vsync_polarity = 0; | ||
| cfg.vsync_front_porch = 8; | ||
| cfg.vsync_pulse_width = 4; | ||
| cfg.vsync_back_porch = 12; | ||
| cfg.pclk_idle_high = 1; | ||
| cfg.pclk_active_neg = 1; | ||
| _bus_instance.config(cfg); | ||
| } | ||
| _panel_instance.setBus(&_bus_instance); | ||
|
|
||
| { | ||
| auto cfg = _light_instance.config(); | ||
| cfg.pin_bl = GPIO_NUM_2; | ||
| cfg.invert = true; | ||
| _light_instance.config(cfg); | ||
| } | ||
| _panel_instance.light(&_light_instance); | ||
|
|
||
| { | ||
| auto cfg = _touch_instance.config(); | ||
| cfg.x_min = 0; | ||
| cfg.y_min = 0; | ||
| cfg.bus_shared = false; | ||
| cfg.offset_rotation = 0; | ||
| // I2C接続 | ||
| cfg.i2c_port = I2C_NUM_1; | ||
| cfg.pin_sda = GPIO_NUM_19; | ||
| cfg.pin_scl = GPIO_NUM_20; | ||
| cfg.pin_int = GPIO_NUM_NC; | ||
| cfg.pin_rst = GPIO_NUM_38; | ||
| // #if defined ( LGFX_MAKERFABS_MATOUCH_1024X768 ) | ||
| // cfg.x_max = 1024; | ||
| // cfg.y_max = 768; | ||
| // #else | ||
| cfg.x_max = 480; | ||
| cfg.y_max = 272; | ||
| // #endif | ||
| cfg.freq = 400000; | ||
| _touch_instance.config(cfg); | ||
| _panel_instance.setTouch(&_touch_instance); | ||
| } | ||
|
|
||
| setPanel(&_panel_instance); | ||
| } | ||
| }; | ||
|
|
||
|
|
||
| #define LGFX LGFX_Makerfabs | ||
| using M5Display = LGFX_Makerfabs; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.