Skip to content

Commit 6a7d102

Browse files
committed
improved PlatformIO compatibility
1 parent 07a125b commit 6a7d102

File tree

4 files changed

+13
-14
lines changed

4 files changed

+13
-14
lines changed

library.json

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
"name": "FabGL",
33
"keywords": "sprite, terminal, VT100, ANSI, keyboard, mouse, VGA, PAL, NTSC, Composite, SSD1306, ILI9341, ST7789, OLED, DS3231, I2S, I2C, game, engine, PS2, graphics, audio, sound, font, arduino, ESP32, display, vic20, emulator, 8086, z80, 6502",
44
"description": "ESP32 VGA Controller, Composite PAL/NTSC Controller, PS/2 Mouse and Keyboard Controller, Graphics Library, Sound Engine, Game Engine and ANSI/VT Terminal",
5+
"homepage": "http://www.fabglib.org"
56
"repository":
67
{
78
"type": "git",
@@ -16,8 +17,9 @@
1617
"maintainer": true
1718
}
1819
],
19-
"version": "1.0.7",
20-
"frameworks": "arduino",
20+
"version": "1.0.8",
21+
"frameworks": ["espidf", "arduino"],
2122
"platforms": "espressif32",
22-
"headers": "fabgl.h"
23+
"headers": "fabgl.h",
24+
"includeDir": "src"
2325
}

library.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name=FabGL
2-
version=1.0.7
2+
version=1.0.8
33
author=Fabrizio Di Vittorio <[email protected]>
44
maintainer=Fabrizio Di Vittorio <[email protected]>
55
sentence=ESP32 VGA, PAL/NTSC Color Composite, SSD1306 ILI9341 ST7789 Controller, PS/2 Mouse and Keyboard Controller, Graphics Library, Graphical User Interface (GUI), Sound Engine, Game Engine and ANSI/VT Terminal

src/fabutils.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1226,14 +1226,13 @@ bool FileBrowser::mountSDCard(bool formatOnFail, char const * mountPath, size_t
12261226
// @TODO: check again
12271227
host.max_freq_khz = 19000;
12281228

1229-
spi_bus_config_t bus_cfg = {
1230-
.mosi_io_num = int2gpio(MOSI),
1231-
.miso_io_num = int2gpio(MISO),
1232-
.sclk_io_num = int2gpio(CLK),
1233-
.quadwp_io_num = -1,
1234-
.quadhd_io_num = -1,
1235-
.max_transfer_sz = 4000,
1236-
};
1229+
spi_bus_config_t bus_cfg = { };
1230+
bus_cfg.mosi_io_num = int2gpio(MOSI);
1231+
bus_cfg.miso_io_num = int2gpio(MISO);
1232+
bus_cfg.sclk_io_num = int2gpio(CLK);
1233+
bus_cfg.quadwp_io_num = -1;
1234+
bus_cfg.quadhd_io_num = -1;
1235+
bus_cfg.max_transfer_sz = 4000;
12371236
auto r = spi_bus_initialize((spi_host_device_t)host.slot, &bus_cfg, 2);
12381237

12391238
if (r == ESP_OK || r == ESP_ERR_INVALID_STATE) { // ESP_ERR_INVALID_STATE, maybe spi_bus_initialize already called

src/terminal.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -541,8 +541,6 @@ bool Terminal::flowControl()
541541
// connect to UART2
542542
void Terminal::connectSerialPort(uint32_t baud, int dataLength, char parity, float stopBits, int rxPin, int txPin, FlowControl flowControl, bool inverted, int rtsPin, int ctsPin)
543543
{
544-
auto uart = (volatile uart_dev_t *) DR_REG_UART2_BASE;
545-
546544
bool initialSetup = !m_uart;
547545

548546
if (initialSetup) {

0 commit comments

Comments
 (0)