feature update version info

This commit is contained in:
alves
2026-03-11 10:32:57 +08:00
parent 0874b313ec
commit 72eb6882fa
4 changed files with 7 additions and 5 deletions

View File

@@ -38,9 +38,9 @@
<color type="primary" scheme_preference="light">#009688</color> <color type="primary" scheme_preference="light">#009688</color>
</branding> </branding>
<releases> <releases>
<release version="2.2.4" date="2026-3-4"> <release version="2.3.0" date="2026-3-4">
<description> <description>
<p>Version 2.2.4 release with improvements and bug fixes.</p> <p>Version 2.3.0 release with improvements and bug fixes.</p>
</description> </description>
</release> </release>
</releases> </releases>

View File

@@ -6,12 +6,12 @@
#define SLIC3R_APP_NAME "Snapmaker Orca" #define SLIC3R_APP_NAME "Snapmaker Orca"
#define SLIC3R_APP_KEY "Snapmaker_Orca" #define SLIC3R_APP_KEY "Snapmaker_Orca"
#define SLIC3R_VERSION "01.10.01.50" #define SLIC3R_VERSION "01.10.01.50"
#define Snapmaker_VERSION "2.2.4" #define Snapmaker_VERSION "2.3.0"
#define MIN_FIRM_VER "1.0.0" #define MIN_FIRM_VER "1.0.0"
#ifndef GIT_COMMIT_HASH #ifndef GIT_COMMIT_HASH
#define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized #define GIT_COMMIT_HASH "0000000" // 0000000 means uninitialized
#endif #endif
#define SLIC3R_BUILD_ID "2.2.4" #define SLIC3R_BUILD_ID "2.3.0"
// #define SLIC3R_RC_VERSION "01.10.01.50" // #define SLIC3R_RC_VERSION "01.10.01.50"
#define BBL_RELEASE_TO_PUBLIC 1 #define BBL_RELEASE_TO_PUBLIC 1
#define BBL_INTERNAL_TESTING 0 #define BBL_INTERNAL_TESTING 0

View File

@@ -1156,6 +1156,7 @@ void MainFrame::init_tabpanel() {
wxString url = evt.GetString(); wxString url = evt.GetString();
wxString key = evt.GetAPIkey(); wxString key = evt.GetAPIkey();
//select_tab(MainFrame::tpMonitor); //select_tab(MainFrame::tpMonitor);
m_printer_view->Show();
m_printer_view->load_url(url, key); m_printer_view->load_url(url, key);
}); });
m_printer_view->Hide(); m_printer_view->Hide();
@@ -1255,6 +1256,7 @@ void MainFrame::show_device(bool bBBLPrinter) {
wxString url = evt.GetString(); wxString url = evt.GetString();
wxString key = evt.GetAPIkey(); wxString key = evt.GetAPIkey();
// select_tab(MainFrame::tpMonitor); // select_tab(MainFrame::tpMonitor);
m_printer_view->Show();
m_printer_view->load_url(url, key); m_printer_view->load_url(url, key);
}); });
} }

View File

@@ -10,7 +10,7 @@ endif()
if(NOT DEFINED BBL_INTERNAL_TESTING) if(NOT DEFINED BBL_INTERNAL_TESTING)
set(BBL_INTERNAL_TESTING "0") set(BBL_INTERNAL_TESTING "0")
endif() endif()
set(Snapmaker_VERSION "2.2.4") set(Snapmaker_VERSION "2.3.0")
set(MIN_FIRM_VER "1.0.0") set(MIN_FIRM_VER "1.0.0")
string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)" string(REGEX MATCH "^([0-9]+)\\.([0-9]+)\\.([0-9]+)"
Snapmaker_VERSION_MATCH ${Snapmaker_VERSION}) Snapmaker_VERSION_MATCH ${Snapmaker_VERSION})