progress update

Author: mtoldi

examples/Inkplate6/Advanced/Communications/BluetoothSerial/BluetoothSerial.ino

@@ -1,6 +1,35 @@
+/**
+ **************************************************
+ *
+ * @file        BluetoothSerial.ino
+ * @brief       Example showing how to use Bluetooth Serial on Inkplate 6
+ *              with an LVGL-based UI that safely renders incoming text.
+ *
+ * HOW TO USE
+ *  - Upload this example to Inkplate 6.
+ *  - Pair your phone with the device in Bluetooth settings (device name: "Inkplate6").
+ *  - Open a Serial Bluetooth Terminal app (or similar) and connect to "Inkplate6".
+ *  - Anything you type in the app will be shown on the Inkplate screen.
+ *  - Anything you type in the Arduino Serial Monitor will be sent to the phone.
+ *
+ * NOTES
+ *  - Runs in 1-bit mode for fast partial updates.
+ *  - A dedicated opaque "log panel" prevents ghosting/overlap with the header.
+ *  - Uses LV_FONT_DEFAULT to work out-of-the-box without extra fonts.
+ *
+ * Learn more about Inkplate: https://www.inkplate.io
+ * Support forum: https://forum.soldered.com/
+ *
+ * @authors     Soldered
+ * @date        November 2025
+ **************************************************
+ */
+
 /*
-  Inkplate6 — Bluetooth Serial (LVGL verzija) — font-safe
-  Automatski bira dostupne Montserrat fontove iz lv_conf.h
+  Inkplate6 — Bluetooth Serial (LVGL) — safe layout with default font
+  - Forces LVGL layout before measuring sizes (prevents overlap)
+  - Uses an opaque white log panel below the instructions
+  - Adds line spacing; partial updates only touch the log panel
 */
 
 #if !defined(ARDUINO_ESP32_DEV) && !defined(ARDUINO_INKPLATE6V2)
@@ -10,46 +39,16 @@
 #include <Inkplate-LVGL.h>
 #include <BluetoothSerial.h>
 
-// Promijeni po želji BT ime
 static const char *btDeviceName = "Inkplate6";
 
-// Inkplate-LVGL (1-bit, parcijalni update friendly)
 Inkplate inkplate(INKPLATE_1BIT);
 BluetoothSerial SerialBT;
 
-// ---------------- Font helperi (biraju prvi dostupni) ----------------
-static const lv_font_t* font_big() {
-  // prefer: 36, 32, 28, 26, 24
-  #if LV_FONT_MONTSERRAT_36
-    return &lv_font_montserrat_36;
-  #elif LV_FONT_MONTSERRAT_32
-    return &lv_font_montserrat_32;
-  #elif LV_FONT_MONTSERRAT_28
-    return &lv_font_montserrat_28;
-  #elif LV_FONT_MONTSERRAT_26
-    return &lv_font_montserrat_26;
-  #elif LV_FONT_MONTSERRAT_24
-    return &lv_font_montserrat_24;
-  #else
-    return LV_FONT_DEFAULT;
-  #endif
-}
-static const lv_font_t* font_small() {
-  // prefer: 20, 18, 16, 14
-  #if LV_FONT_MONTSERRAT_20
-    return &lv_font_montserrat_20;
-  #elif LV_FONT_MONTSERRAT_18
-    return &lv_font_montserrat_18;
-  #elif LV_FONT_MONTSERRAT_16
-    return &lv_font_montserrat_16;
-  #elif LV_FONT_MONTSERRAT_14
-    return &lv_font_montserrat_14;
-  #else
-    return LV_FONT_DEFAULT;
-  #endif
-}
+// ---------- Font helpers (use LV_FONT_DEFAULT only) ----------
+static const lv_font_t* font_big()   { return LV_FONT_DEFAULT; }
+static const lv_font_t* font_small() { return LV_FONT_DEFAULT; }
 
-// ---- LVGL pomoćne stvari ----
+// ---------- LVGL helpers ----------
 static inline int dispW() {
   lv_display_t *d = lv_display_get_default();
   return lv_display_get_horizontal_resolution(d);
@@ -59,62 +58,102 @@ static inline int dispH() {
   return lv_display_get_vertical_resolution(d);
 }
 
-// UI elementi
-static lv_obj_t *label_title = nullptr;
-static lv_obj_t *label_info  = nullptr;
-static lv_obj_t *label_log   = nullptr;
-
-// Log state
-static String logText;
-static int    maxLines   = 0;
-static int    usedLines  = 0;
-static int    topMargin  = 8;
-static int    leftMargin = 8;
-static int    logY       = 0;
-
 static int lineHeight(const lv_font_t *f) {
   #if LVGL_VERSION_MAJOR >= 9
     return lv_font_get_line_height(f);
   #else
-    return 20; // približno za manje fontove
+    // Approximate default font line height for LVGL v8 if API is unavailable
+    return 18;
   #endif
 }
 
+static void make_opaque(lv_obj_t *obj) {
+  lv_obj_set_style_bg_color(obj, lv_color_hex(0xFFFFFF), 0);
+  lv_obj_set_style_bg_opa(obj, LV_OPA_COVER, 0);
+  lv_obj_set_style_border_width(obj, 0, 0);
+}
+
+// ---------- UI elements ----------
+static lv_obj_t *label_title = nullptr;
+static lv_obj_t *label_info  = nullptr;
+static lv_obj_t *panel_log   = nullptr;
+static lv_obj_t *label_log   = nullptr;
+
+// Spacing
+static const int INFO_LINE_SPACE = 4;
+static const int LOG_LINE_SPACE  = 6;
+static const int topMargin  = 8;
+static const int leftMargin = 8;
+static const int rightMargin = 8;
+
+// Log state
+static String logText;
+static int maxLines  = 0;
+static int usedLines = 0;
+
 static void ui_create() {
+  // Screen background
   lv_obj_set_style_bg_color(lv_screen_active(), lv_color_hex(0xFFFFFF), LV_PART_MAIN);
 
+  // Title
   label_title = lv_label_create(lv_screen_active());
   lv_obj_set_style_text_color(label_title, lv_color_hex(0x000000), 0);
   lv_obj_set_style_text_font(label_title, font_big(), 0);
   lv_label_set_text(label_title, "Bluetooth Serial Example");
   lv_obj_set_pos(label_title, leftMargin, topMargin);
+  make_opaque(label_title);
 
+  // Instructions
   label_info = lv_label_create(lv_screen_active());
   lv_obj_set_style_text_color(label_info, lv_color_hex(0x000000), 0);
   lv_obj_set_style_text_font(label_info, font_small(), 0);
   lv_label_set_long_mode(label_info, LV_LABEL_LONG_WRAP);
-  int infoY = topMargin + lineHeight(font_big()) + 6;
+  lv_obj_set_style_text_line_space(label_info, INFO_LINE_SPACE, 0);
+  int infoY = topMargin + lineHeight(font_big()) + 8;
   lv_obj_set_pos(label_info, leftMargin, infoY);
-  lv_obj_set_width(label_info, dispW() - 2*leftMargin);
+  lv_obj_set_width(label_info, dispW() - leftMargin - rightMargin);
   lv_label_set_text(label_info,
-    "Pair your phone and open a serial BT terminal.\n"
-    "Messages from phone appear here.\n"
+    "Pair your phone and open a Serial Bluetooth Terminal.\n"
+    "Messages from phone appear below.\n"
     "USB Serial -> phone is also forwarded.\n");
+  make_opaque(label_info);
 
-  label_log = lv_label_create(lv_screen_active());
+  // Ensure layout is computed before measuring info height
+  lv_timer_handler();
+  #if LVGL_VERSION_MAJOR >= 9
+    lv_obj_update_layout(label_info);
+  #endif
+  int infoBottom = lv_obj_get_y(label_info) + lv_obj_get_height(label_info);
+
+  // Opaque log panel below the instructions
+  panel_log = lv_obj_create(lv_screen_active());
+  make_opaque(panel_log);
+  lv_obj_set_style_pad_all(panel_log, 0, 0);
+  lv_obj_set_style_border_width(panel_log, 0, 0);
+  int panelX = leftMargin;
+  int panelY = infoBottom + 10;
+  int panelW = dispW() - leftMargin - rightMargin;
+  int panelH = dispH() - panelY - topMargin;
+  lv_obj_set_pos(panel_log, panelX, panelY);
+  lv_obj_set_size(panel_log, panelW, panelH);
+
+  // Log label inside the panel
+  label_log = lv_label_create(panel_log);
   lv_obj_set_style_text_color(label_log, lv_color_hex(0x000000), 0);
   lv_obj_set_style_text_font(label_log, font_small(), 0);
   lv_label_set_long_mode(label_log, LV_LABEL_LONG_WRAP);
-  logY = infoY + lv_obj_get_height(label_info) + 8;
-  lv_obj_set_pos(label_log, leftMargin, logY);
-  lv_obj_set_width(label_log, dispW() - 2*leftMargin);
-
-  int availH = dispH() - logY - topMargin;
-  maxLines   = availH / lineHeight(font_small());
-  if (maxLines < 3) maxLines = 3;
+  lv_obj_set_style_text_line_space(label_log, LOG_LINE_SPACE, 0);
+  lv_obj_set_pos(label_log, 0, 0);
+  lv_obj_set_width(label_log, panelW);
+
+  // Compute how many lines fit into the panel
+  int effLineH = lineHeight(font_small()) + LOG_LINE_SPACE;
+  maxLines = (effLineH > 0) ? (panelH / effLineH) : 0;
+  if (maxLines < 3) maxLines = 3; // safety minimum
 }
 
 static void ui_reset_log_full_refresh() {
+  // Rebuild the entire UI and perform a full refresh (avoids ghosting)
   lv_obj_clean(lv_screen_active());
   logText  = "";
   usedLines = 0;
@@ -127,12 +166,22 @@ static void ui_reset_log_full_refresh() {
 
 static void log_append_char(char c) {
   if (c == '\r') return;
-  if (c == '\n') { logText += '\n'; usedLines++; }
-  else           { logText += c; }
 
-  if (usedLines >= maxLines) { ui_reset_log_full_refresh(); return; }
+  if (c == '\n') {
+    logText += '\n';
+    usedLines++;
+  } else {
+    logText += c;
+  }
+
+  if (usedLines >= maxLines) {
+    ui_reset_log_full_refresh();
+    return;
+  }
 
   lv_label_set_text(label_log, logText.c_str());
+
+  // Partial refresh for faster updates; opaque panel removes old pixels
   lv_tick_inc(5);
   lv_timer_handler();
   inkplate.partialUpdate();
@@ -143,11 +192,13 @@ void setup() {
   inkplate.begin(LV_DISP_RENDER_MODE_PARTIAL);
 
   ui_create();
+
+  // Initial full refresh to clear any boot artifacts
   lv_tick_inc(20);
   lv_timer_handler();
-  inkplate.display(); // prvi FULL
+  inkplate.display();
 
-  // Bluetooth
+  // Start Bluetooth
   if (!SerialBT.begin(btDeviceName)) {
     const char *err = "Bluetooth init ERROR";
     for (const char *p = err; *p; ++p) log_append_char(*p);
@@ -156,15 +207,18 @@ void setup() {
     const char *ok1 = "BT ready. Pair and connect.";
     for (const char *p = ok1; *p; ++p) log_append_char(*p);
     log_append_char('\n');
+    log_append_char('\n'); // extra spacing before user messages
   }
 }
 
 void loop() {
+  // USB Serial -> Bluetooth
   while (Serial.available()) {
     char c = (char)Serial.read();
     SerialBT.write((uint8_t)c);
   }
 
+  // Bluetooth -> screen + echo to USB Serial
   while (SerialBT.available()) {
     char c = (char)SerialBT.read();
     Serial.write((uint8_t)c);

examples/Inkplate6/Basic/BlackAndWhite/BlackAndWhite.ino

@@ -1,10 +1,22 @@
-// Inkplate 6 + LVGL — Black & White demo
-// Jednostavna podjela ekrana na crni i bijeli blok (1-bit mod)
+/**
+ **************************************************
+ *
+ * @file        BlackWhite.ino
+ * @brief       Example showing a simple black & white screen split using LVGL on Inkplate 6
+ *
+ * For info on how to quickly get started with Inkplate 6 visit https://soldered.com/documentation/inkplate/6/overview/
+ *
+ * @authors     Soldered
+ * @date        November 2025
+ **************************************************
+ */
 
 #include <Inkplate-LVGL.h>
 
+// Create Inkplate instance in 1-bit (black & white) mode
 Inkplate inkplate(INKPLATE_1BIT);
 
+// Helper functions to get current display width and height from LVGL
 static inline int dispW() {
   lv_display_t *d = lv_display_get_default();
   return lv_display_get_horizontal_resolution(d);
@@ -14,18 +26,21 @@ static inline int dispH() {
   return lv_display_get_vertical_resolution(d);
 }
 
+// Draws the screen divided into black and white halves
 void drawBlackWhite() {
   int w = dispW();
   int h = dispH();
   int half = w / 2;
 
+  // Left half — black rectangle
   lv_obj_t *left = lv_obj_create(lv_screen_active());
   lv_obj_remove_flag(left, LV_OBJ_FLAG_SCROLLABLE);
   lv_obj_set_size(left, half, h);
   lv_obj_set_pos(left, 0, 0);
   lv_obj_set_style_border_width(left, 0, LV_PART_MAIN);
   lv_obj_set_style_bg_color(left, lv_color_hex(0x000000), LV_PART_MAIN);
 
+  // Right half — white rectangle
   lv_obj_t *right = lv_obj_create(lv_screen_active());
   lv_obj_remove_flag(right, LV_OBJ_FLAG_SCROLLABLE);
   lv_obj_set_size(right, w - half, h);
@@ -35,15 +50,20 @@ void drawBlackWhite() {
 }
 
 void setup() {
+  // Initialize Inkplate and LVGL in FULL render mode
   inkplate.begin(LV_DISP_RENDER_MODE_FULL);
   inkplate.selectDisplayMode(INKPLATE_1BIT);
 
+  // Set white background and draw both halves
   lv_obj_set_style_bg_color(lv_screen_active(), lv_color_hex(0xFFFFFF), LV_PART_MAIN);
   drawBlackWhite();
 
+  // Update LVGL and display the rendered frame
   lv_tick_inc(50);
   lv_timer_handler();
   inkplate.display();
 }
 
-void loop() {}
+void loop() {
+  // Nothing to do here; image is static
+}