From e8a27bb203fe2aff70390a5eca002d7438da9b0f Mon Sep 17 00:00:00 2001
From: mrDarker <mr.darker@163.com>
Date: 星期三, 22 十月 2025 14:24:34 +0800
Subject: [PATCH] Merge branch 'clh' into liuyang
---
SourceCode/Bond/Servo/RecipeManager.cpp | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/SourceCode/Bond/Servo/RecipeManager.cpp b/SourceCode/Bond/Servo/RecipeManager.cpp
index bc44b96..4a979d7 100644
--- a/SourceCode/Bond/Servo/RecipeManager.cpp
+++ b/SourceCode/Bond/Servo/RecipeManager.cpp
@@ -491,7 +491,10 @@
<< "recipe_name TEXT NOT NULL,"
<< "recipe_para TEXT NOT NULL"
<< ");";
- m_pDB->executeQuery(sql.str());
+ bool bRet = m_pDB->executeQuery(sql.str());
+ if (!bRet) {
+ return false;
+ }
std::ostringstream ins;
ins << "INSERT OR REPLACE INTO " << strDeviceName
@@ -610,13 +613,13 @@
addRecipe(recipe);
- addDeviceRecipe("Bonder1", 101, "鏍囧噯宸ヨ壓", "");
- addDeviceRecipe("Bonder1", 102, "鏀硅壇宸ヨ壓", "");
- addDeviceRecipe("Bonder1", 103, "楂橀�熸ā寮�", "");
+ addDeviceRecipe("Bonder1", 101, "鏍囧噯宸ヨ壓", "00");
+ addDeviceRecipe("Bonder1", 102, "鏀硅壇宸ヨ壓", "00");
+ addDeviceRecipe("Bonder1", 103, "楂橀�熸ā寮�", "00");
- addDeviceRecipe("Bonder2", 101, "鏍囧噯宸ヨ壓", "");
- addDeviceRecipe("Bonder2", 102, "鏀硅壇宸ヨ壓", "");
- addDeviceRecipe("Bonder2", 103, "楂橀�熸ā寮�", "");
+ addDeviceRecipe("Bonder2", 101, "鏍囧噯宸ヨ壓", "00");
+ addDeviceRecipe("Bonder2", 102, "鏀硅壇宸ヨ壓", "00");
+ addDeviceRecipe("Bonder2", 103, "楂橀�熸ā寮�", "00");
}
bool RecipeManager::readRecipeFile(const std::string& filename) {
--
Gitblit v1.9.3