add bongo

SofusA · Oct 4, 2024 · 8bff877 · 8bff877
1 parent 463ba9c
commit 8bff877
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 10 deletions.
diff --git a/config/boards/shields/dongle_display/Kconfig.defconfig b/config/boards/shields/dongle_display/Kconfig.defconfig
@@ -45,4 +45,4 @@ choice LV_COLOR_DEPTH
     default LV_COLOR_DEPTH_1
 endchoice
 
-endif
+endif
diff --git a/config/boards/shields/dongle_display/Kconfig.shield b/config/boards/shields/dongle_display/Kconfig.shield
@@ -2,4 +2,4 @@
 # SPDX-License-Identifier: MIT
 
 config SHIELD_DONGLE_DISPLAY
-	def_bool $(shields_list_contains,dongle_display)
+	def_bool $(shields_list_contains,dongle_display)
diff --git a/config/boards/shields/dongle_display/custom_status_screen.c b/config/boards/shields/dongle_display/custom_status_screen.c
@@ -5,7 +5,7 @@
  */
 
 #include "custom_status_screen.h"
-#include "widgets/battery_status.h"
+// #include "widgets/battery_status.h"
 // #include "widgets/modifiers.h"
 // #include "widgets/bongo_cat.h"
 // #include "widgets/layer_status.h"
@@ -17,7 +17,7 @@ LOG_MODULE_DECLARE(zmk, CONFIG_ZMK_LOG_LEVEL);
 
 // static struct zmk_widget_output_status output_status_widget;
 // static struct zmk_widget_layer_status layer_status_widget;
-static struct zmk_widget_dongle_battery_status dongle_battery_status_widget;
+// static struct zmk_widget_dongle_battery_status dongle_battery_status_widget;
 // static struct zmk_widget_modifiers modifiers_widget;
 // static struct zmk_widget_bongo_cat bongo_cat_widget;
 
@@ -38,8 +38,8 @@ lv_obj_t *zmk_display_status_screen() {
     lv_style_set_text_line_space(&global_style, 1);
     lv_obj_add_style(screen, &global_style, LV_PART_MAIN);
 
-    // zmk_widget_output_status_init(&output_status_widget, screen);
-    // lv_obj_align(zmk_widget_output_status_obj(&output_status_widget), LV_ALIGN_TOP_LEFT, 0, 0);
+    zmk_widget_output_status_init(&output_status_widget, screen);
+    lv_obj_align(zmk_widget_output_status_obj(&output_status_widget), LV_ALIGN_TOP_LEFT, 0, 0);
 
 //     zmk_widget_bongo_cat_init(&bongo_cat_widget, screen);
 //     lv_obj_align(zmk_widget_bongo_cat_obj(&bongo_cat_widget), LV_ALIGN_BOTTOM_RIGHT, 0, -7);

diff --git a/config/boards/shields/dongle_display/widgets/bongo_cat.c b/config/boards/shields/dongle_display/widgets/bongo_cat.c
@@ -145,4 +145,4 @@ int zmk_widget_bongo_cat_init(struct zmk_widget_bongo_cat *widget, lv_obj_t *par
 
 lv_obj_t *zmk_widget_bongo_cat_obj(struct zmk_widget_bongo_cat *widget) {
     return widget->obj;
-}
+}
diff --git a/config/boards/shields/sweeple/sweeple_dongle.overlay b/config/boards/shields/sweeple/sweeple_dongle.overlay
@@ -1,11 +1,22 @@
 #include "sweeple.dtsi"
 
 / {
-	chosen {
-		zephyr,display = &oled;
-	};
+    chosen {
+        zmk,kscan = &mock_kscan;
+        zephyr,display = &oled;
+    };
+
+    mock_kscan: kscan_1 {
+        compatible = "zmk,kscan-mock";
+        columns = <0>;
+        rows = <0>;
+        events = <0>;
+    };
 };
 
+/delete-node/ &default_kscan;   // only required if the dongle uses a 
+                                // different board than the peripherals
+
 &pro_micro_i2c {
     status = "okay";
     oled: ssd1306@3c {
-Original file line number
+Diff line change
@@ Expand Up / @@ -45,4 +45,4 @@ choice LV_COLOR_DEPTH @@
         default LV_COLOR_DEPTH_1
     endchoice
-    endif
+    endif