term: change font size to 10

vroland · Jun 2, 2020 · b21d6e2 · b21d6e2
1 parent aa83df4
commit b21d6e2
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/examples/terminal/main/config.h b/examples/terminal/main/config.h
@@ -1,4 +1,6 @@
 /* See LICENSE file for copyright and license details. */
+#pragma once
+
 #include "firacode.h"
 #include "firacode_bold.h"
 
@@ -377,8 +379,8 @@ static unsigned int cursorshape = 2;
  * Default columns and rows numbers
  */
 
-static unsigned int cols = 80;
-static unsigned int rows = 24;
+unsigned int cols = 100;
+unsigned int rows = 30;
 
 /*
  * Default colour and shape of the mouse cursor

diff --git a/examples/terminal/main/firacode.h b/examples/terminal/main/firacode.h
@@ -1,3 +1,4 @@
+#pragma once
 #include "epd_driver.h"
 const uint8_t FiraCodeBitmaps[87542] = {
     0x78, 0x9C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x78, 0x9C, 0xFB, 0x1F, 0xC9, 0xB0, 0xEC, 0x7F,

diff --git a/examples/terminal/main/firacode_bold.h b/examples/terminal/main/firacode_bold.h
@@ -1,3 +1,4 @@
+#pragma once
 #include "epd_driver.h"
 const uint8_t FiraCode_BoldBitmaps[90052] = {
     0x78, 0x9C, 0x03, 0x00, 0x00, 0x00, 0x00, 0x01, 0x78, 0x9C, 0x5B, 0xC0, 0xC0, 0xC0, 0x70, 0x71,
@@ -5631,7 +5632,7 @@ const uint8_t FiraCode_BoldBitmaps[90052] = {
     0xE6, 0xA6, 0x27, 0x76,
 };
 const GFXglyph FiraCode_BoldGlyphs[] = {
-    { 0, 0, 13, 0, 0, 8, 0 }, //  
+    { 0, 0, 13, 0, 0, 8, 0 }, //
     { 5, 15, 13, 4, 15, 73, 8 }, // !
     { 9, 6, 13, 2, 16, 65, 81 }, // "
     { 13, 15, 13, 0, 15, 140, 146 }, // #

diff --git a/examples/terminal/main/main.c b/examples/terminal/main/main.c
@@ -31,8 +31,6 @@
 #define BUF_SIZE (1024)
 #define ESC_BUF_SIZE (128 * 4)
 #define ESC_ARG_SIZE  16
-#define COLUMNS 70
-#define ROWS 20
 
 void csihandle(void);
 void tclearregion(int x1, int y1, int x2, int y2);
@@ -119,7 +117,7 @@ void epd_task() {
 
     uart_write_bytes(UART_NUM_1, "listening\n", 11);
 
-    tnew(COLUMNS, ROWS);
+    tnew(cols, rows);
     selinit();
 
     while (true) {

diff --git a/examples/terminal/main/st.c b/examples/terminal/main/st.c
@@ -20,9 +20,9 @@
 #include "driver/uart.h"
 #include "epd_driver.h"
 #include "esp_log.h"
+#include "st.h"
 #include "config.h"
 
-#include "st.h"
 //#include "win.h"
 
 #if   defined(__linux)

diff --git a/examples/terminal/main/st.h b/examples/terminal/main/st.h
@@ -122,3 +122,5 @@ extern char *termname;
 extern unsigned int tabspaces;
 extern unsigned int defaultfg;
 extern unsigned int defaultbg;
+extern unsigned int cols;
+extern unsigned int rows;