pbio/sys/hmi_lcd: Move splash screen.

This doesn't belong in the driver. We can draw it
with shapes now. We can keep this on while the
user program runs. The user can delete it if they
want.

Author: laurensvalk

lib/pbio/drv/display/display_ev3.c

@@ -187,71 +187,6 @@ static uint8_t encode_triplet(uint8_t p0, uint8_t p1, uint8_t p2) {
     return p0 << 6 | p1 << 3 | p2;
 }
 
-/**
- * Splash boot logo for Pybricks. This is a 178x128 pixel monochrome image.
- * Starts at no color, and toggles to on at every index below.
- *
- * Revisit: Use standard format, e.g. decompress PNG files from file storage or memory card.
- */
-static const uint16_t pbdrv_display_pybricks_logo[] = {
-    3227, 3359, 3403, 3539, 3580, 3718, 3757, 3897, 3934, 4076, 4111, 4255, 4289, 4433, 4466, 4612,
-    4644, 4790, 4822, 4968, 5000, 5146, 5178, 5324, 5356, 5502, 5534, 5548, 5666, 5680, 5712, 5725,
-    5845, 5858, 5890, 5903, 6023, 6036, 6068, 6081, 6201, 6214, 6246, 6259, 6379, 6392, 6424, 6437,
-    6467, 6474, 6520, 6527, 6557, 6570, 6602, 6615, 6643, 6654, 6696, 6707, 6735, 6748, 6780, 6793,
-    6820, 6833, 6873, 6886, 6913, 6926, 6958, 6971, 6997, 7012, 7050, 7065, 7091, 7104, 7136, 7149,
-    7174, 7191, 7227, 7244, 7269, 7282, 7314, 7327, 7352, 7369, 7405, 7422, 7447, 7460, 7492, 7505,
-    7530, 7548, 7582, 7601, 7625, 7638, 7670, 7683, 7707, 7726, 7760, 7779, 7803, 7816, 7848, 7861,
-    7885, 7904, 7938, 7957, 7981, 7994, 8026, 8039, 8063, 8082, 8116, 8135, 8159, 8172, 8204, 8217,
-    8241, 8260, 8294, 8313, 8337, 8350, 8382, 8395, 8419, 8438, 8472, 8491, 8515, 8528, 8560, 8573,
-    8598, 8615, 8651, 8668, 8693, 8706, 8738, 8751, 8776, 8793, 8829, 8846, 8871, 8884, 8916, 8929,
-    8955, 8970, 9008, 9023, 9049, 9062, 9094, 9107, 9134, 9148, 9186, 9201, 9227, 9240, 9272, 9285,
-    9313, 9325, 9366, 9378, 9405, 9418, 9450, 9463, 9492, 9501, 9545, 9554, 9583, 9596, 9628, 9641,
-    9673, 9676, 9726, 9729, 9761, 9774, 9806, 9819, 9939, 9952, 9984, 9997, 10117, 10130, 10162,
-    10175, 10295, 10308, 10340, 10353, 10473, 10486, 10518, 10531, 10651, 10664, 10696, 10709,
-    10829, 10842, 10874, 10887, 11007, 11020, 11052, 11065, 11185, 11198, 11230, 11243, 11363,
-    11376, 11408, 11421, 11541, 11554, 11586, 11599, 11719, 11732, 11764, 11777, 11802, 11806,
-    11815, 11819, 11828, 11832, 11841, 11846, 11855, 11859, 11868, 11872, 11897, 11910, 11942,
-    11955, 11980, 11984, 11993, 11997, 12006, 12010, 12019, 12024, 12033, 12037, 12046, 12050,
-    12075, 12088, 12120, 12133, 12158, 12162, 12171, 12175, 12184, 12188, 12197, 12202, 12211,
-    12215, 12224, 12228, 12253, 12266, 12298, 12311, 12336, 12340, 12349, 12353, 12362, 12366,
-    12375, 12380, 12389, 12393, 12402, 12406, 12431, 12444, 12476, 12489, 12514, 12518, 12527,
-    12531, 12540, 12544, 12553, 12558, 12567, 12571, 12580, 12584, 12609, 12622, 12654, 12667,
-    12681, 12774, 12787, 12800, 12832, 12845, 12859, 12952, 12965, 12978, 13010, 13023, 13037,
-    13130, 13143, 13156, 13188, 13201, 13215, 13308, 13321, 13334, 13366, 13379, 13393, 13486,
-    13499, 13512, 13544, 13557, 13571, 13664, 13677, 13690, 13722, 13735, 13749, 13842, 13855,
-    13868, 13900, 13913, 13927, 14020, 14033, 14046, 14078, 14091, 14105, 14198, 14211, 14224,
-    14256, 14269, 14283, 14376, 14389, 14402, 14434, 14447, 14461, 14554, 14567, 14580, 14612,
-    14625, 14639, 14732, 14745, 14758, 14790, 14803, 14817, 14910, 14923, 14936, 14968, 14982,
-    14994, 15088, 15100, 15114, 15146, 15186, 15252, 15292, 15324, 15364, 15430, 15470, 15502,
-    15542, 15608, 15648, 15680, 15720, 15786, 15826, 15858, 15898, 15964, 16004, 16036, 16075,
-    16143, 16182, 16215, 16253, 16321, 16359, 16393, 16431, 16499, 16537, 16572, 16608, 16678,
-    16714, 16751, 16785, 16857, 16891, 16930, 16962, 17036, 17068, 17109, 17139, 17215, 17245,
-    17289, 17314, 17396, 17421, 22784
-};
-
-/**
- * Load an image encoded in the format above into the user frame buffer.
- *
- * @param bitmap Pointer to the bitmap data.
- */
-static void pbdrv_display_load_indexed_bitmap(const uint16_t *indexed_bitmap) {
-    bool set = 0;
-    uint32_t switch_index = 0;
-    for (size_t r = 0; r < PBDRV_CONFIG_DISPLAY_NUM_ROWS; r++) {
-        for (size_t c = 0; c < PBDRV_CONFIG_DISPLAY_NUM_COLS; c++) {
-            if ((r * PBDRV_CONFIG_DISPLAY_NUM_COLS + c) == indexed_bitmap[switch_index]) {
-                set = !set;
-                switch_index++;
-            }
-            pbdrv_display_user_frame[r][c] = set ? 3 : 0;
-        }
-        // Fill unused columns out of screen.
-        for (size_t c = PBDRV_CONFIG_DISPLAY_NUM_COLS; c < ST7586S_NUM_COL_TRIPLETS * 3; c++) {
-            pbdrv_display_user_frame[r][c] = 0;
-        }
-    }
-}
-
 /**
  * Encode the user frame buffer into the display buffer.
  */
@@ -495,14 +430,6 @@ static pbio_error_t pbdrv_display_ev3_process_thread(pbio_os_state_t *state, voi
     // Staying in data mode from here.
     pbdrv_gpio_out_high(&pin_lcd_a0);
 
-    // Briefly show initial splash screen. REVISIT: Move boot animation to sys/hmi.
-    pbdrv_display_load_indexed_bitmap(pbdrv_display_pybricks_logo);
-    pbdrv_display_st7586s_encode_user_frame();
-    pbdrv_display_st7586s_write_data_begin(st7586s_send_buf, sizeof(st7586s_send_buf));
-    PBIO_OS_AWAIT_UNTIL(state, spi_status == SPI_STATUS_COMPLETE);
-    pbdrv_gpio_out_high(&pin_lcd_cs);
-    PBIO_OS_AWAIT_MS(state, &timer, 500);
-
     // Clear display to start with.
     memset(&pbdrv_display_user_frame, 0, sizeof(pbdrv_display_user_frame));
     pbdrv_display_user_frame_update_requested = true;

lib/pbio/sys/hmi_lcd.c

@@ -35,31 +35,71 @@
 #define DEBUG_PRINT(...)
 #endif
 
+// Scaling factors and functions to simplify drawing the logo.
+static float _scale;
+static uint32_t _offset_x;
+static uint32_t _offset_y;
+
+static uint32_t sx(uint32_t x) {
+    return x * _scale + _offset_x + 0.5f;
+}
+
+static uint32_t sy(uint32_t y) {
+    return y * _scale + _offset_y + 0.5f;
+}
+
+static uint32_t sr(uint32_t r) {
+    return r * _scale + 0.5f;
+}
+
+/**
+ * Draws the Pybricks logo on the screen.
+ *
+ * @param  x     [in] Horizontal offset from the left.
+ * @param  y     [in] Vertical offset from the top.
+ * @param  scale [in] Scale (1.0 is 154 x 84).
+ */
+static void draw_pybricks_logo(uint32_t x, uint32_t y, float scale) {
+    _offset_x = x;
+    _offset_y = y;
+    _scale = scale;
+
+    pbio_image_t *display = pbdrv_display_get_image();
+    pbio_image_fill(display, 0);
+
+    uint8_t v = pbdrv_display_get_max_value();
+
+    // Rounded rectangles making up the left and right side of the head.
+    pbio_image_fill_rounded_rect(display, sx(0), sy(0), sr(42), sr(84), sr(11), v);
+    pbio_image_fill_rounded_rect(display, sx(112), sy(0), sr(42), sr(84), sr(11), v);
+
+    // Forehead, main fill, and jaw.
+    pbio_image_fill_rect(display, sx(14), sy(0), sr(126), sr(14), v);
+    pbio_image_fill_rect(display, sx(14), sy(14), sr(126), sr(56), 0);
+    pbio_image_fill_rect(display, sx(28), sy(56), sr(98), sr(14), v);
+
+    // Eyes.
+    pbio_image_fill_circle(display, sx(49), sy(29), sr(10), v);
+    pbio_image_fill_circle(display, sx(106), sy(29), sr(10), v);
+
+    // Teeth.
+    for (uint32_t i = 0; i < 6; i++) {
+        pbio_image_fill_rect(display, sx(40 + 14 * i), sy(51), sr(4), sr(5), v);
+    }
+
+    pbdrv_display_update();
+}
+
 static void hmi_lcd_grid_show_pixel(uint8_t row, uint8_t col, bool on) {
     pbio_image_t *display = pbdrv_display_get_image();
     uint8_t value = on ? pbdrv_display_get_max_value(): 0;
     const uint32_t size = PBDRV_CONFIG_DISPLAY_NUM_ROWS / PBSYS_CONFIG_HMI_NUM_SLOTS;
     const uint32_t width = size * 4 / 5;
     const uint32_t offset = (PBDRV_CONFIG_DISPLAY_NUM_COLS - (PBSYS_CONFIG_HMI_NUM_SLOTS * size)) / 2;
     pbio_image_fill_rect(display, col * size + offset, row * size, width, width, value);
-    pbdrv_display_update();
-}
-
-static void hmi_lcd_show_program_slot(void) {
-    pbio_image_t *display = pbdrv_display_get_image();
-    pbio_image_fill(display, 0);
-
-    for (uint8_t r = 0; r < PBSYS_CONFIG_HMI_NUM_SLOTS; r++) {
-        for (uint8_t c = 0; c < PBSYS_CONFIG_HMI_NUM_SLOTS; c++) {
-            bool is_on = r < 3 && c > 0 && c < 4;
-            is_on |= (r == 4 && c == pbsys_status_get_selected_slot());
-            hmi_lcd_grid_show_pixel(r, c, is_on);
-        }
-    }
 }
 
 void pbsys_hmi_init(void) {
-
 }
 
 void pbsys_hmi_deinit(void) {
@@ -72,12 +112,18 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
 
     PBIO_OS_ASYNC_BEGIN(state);
 
+    // Centered above 5 code slot indicators.
+    draw_pybricks_logo(27, 12, 0.8);
+
     for (;;) {
 
         DEBUG_PRINT("Start HMI loop\n");
 
-        // Visually indicate current state on supported hubs.
-        hmi_lcd_show_program_slot();
+        // Visually indicate current slot.
+        for (uint8_t c = 0; c < PBSYS_CONFIG_HMI_NUM_SLOTS; c++) {
+            hmi_lcd_grid_show_pixel(4, c, c == pbsys_status_get_selected_slot());
+        }
+        pbdrv_display_update();
 
         // Buttons could be pressed at the end of the user program, so wait for
         // a release and then a new press, or until we have to exit early.
@@ -152,10 +198,6 @@ static pbio_error_t run_ui(pbio_os_state_t *state, pbio_os_timer_t *timer) {
         pbdrv_button_get_pressed();
     }));
 
-    // Clear UI from display to start user program.
-    pbio_image_fill(pbdrv_display_get_image(), 0);
-    pbdrv_display_update();
-
     // Start light or display animations.
     pbio_color_light_start_breathe_animation(pbsys_status_light_main, PBSYS_CONFIG_STATUS_LIGHT_STATE_ANIMATIONS_HUE);