From 36b37176d6d1cec9a52f8fc08dd1ebfebd0d7a9e Mon Sep 17 00:00:00 2001
From: suchmememanyskill <38142618+suchmememanyskill@users.noreply.github.com>
Date: Wed, 13 Mar 2024 18:46:13 +0100
Subject: [PATCH] Fix macros tab controlling other printers

---
 CYD-Klipper/src/ui/macros.cpp              | 7 ++++++-
 CYD-Klipper/src/ui/macros.h                | 1 +
 CYD-Klipper/src/ui/panels/macros_panel.cpp | 2 ++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/CYD-Klipper/src/ui/macros.cpp b/CYD-Klipper/src/ui/macros.cpp
index b5e9987..9e3ea34 100644
--- a/CYD-Klipper/src/ui/macros.cpp
+++ b/CYD-Klipper/src/ui/macros.cpp
@@ -40,9 +40,14 @@ void macros_add_power_devices_to_panel(lv_obj_t * root_panel, POWERQUERY query)
     }
 }
 
-void macros_draw_power_fullscreen(PRINTER_CONFIG * config)
+void macros_set_current_config(PRINTER_CONFIG * config)
 {
     curernt_config = config;
+}
+
+void macros_draw_power_fullscreen(PRINTER_CONFIG * config)
+{
+    macros_set_current_config(config);
 
     lv_obj_t * parent = lv_create_empty_panel(lv_scr_act());
     lv_obj_set_style_bg_opa(parent, LV_OPA_100, 0); 
diff --git a/CYD-Klipper/src/ui/macros.h b/CYD-Klipper/src/ui/macros.h
index c5040be..0e6b690 100644
--- a/CYD-Klipper/src/ui/macros.h
+++ b/CYD-Klipper/src/ui/macros.h
@@ -5,5 +5,6 @@
 
 void macros_add_macros_to_panel(lv_obj_t * root_panel, MACROSQUERY query);
 void macros_add_power_devices_to_panel(lv_obj_t * root_panel, POWERQUERY query);
+void macros_set_current_config(PRINTER_CONFIG * config);
 void macros_draw_power_fullscreen(PRINTER_CONFIG * config);
 void macros_draw_power_fullscreen();
\ No newline at end of file
diff --git a/CYD-Klipper/src/ui/panels/macros_panel.cpp b/CYD-Klipper/src/ui/panels/macros_panel.cpp
index ec4784c..6245f97 100644
--- a/CYD-Klipper/src/ui/panels/macros_panel.cpp
+++ b/CYD-Klipper/src/ui/panels/macros_panel.cpp
@@ -11,6 +11,8 @@ static void btn_goto_settings(lv_event_t * e){
 }
 
 void macros_panel_init(lv_obj_t* panel) {
+    macros_set_current_config(get_current_printer_config());
+
     lv_obj_t * btn = lv_btn_create(panel);
     lv_obj_add_event_cb(btn, btn_goto_settings, LV_EVENT_CLICKED, NULL);
     lv_obj_set_size(btn, CYD_SCREEN_PANEL_WIDTH_PX - CYD_SCREEN_GAP_PX * 2, CYD_SCREEN_MIN_BUTTON_HEIGHT_PX);