fix bugs version 1.1

nguyenpham · Oct 17, 2021 · bbc0692 · bbc0692
1 parent 5f30612
commit bbc0692
Show file tree

Hide file tree

Showing 70 changed files with 694 additions and 527 deletions.
diff --git a/BanksiaIOS.xcodeproj/project.pbxproj b/BanksiaIOS.xcodeproj/project.pbxproj
diff --git a/BanksiaIOS.xcworkspace/xcuserdata/nguyenpham.xcuserdatad/UserInterfaceState.xcuserstate b/BanksiaIOS.xcworkspace/xcuserdata/nguyenpham.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/...siaIOS.xcworkspace/xcuserdata/nguyenpham.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist b/...siaIOS.xcworkspace/xcuserdata/nguyenpham.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist
@@ -686,8 +686,8 @@
             filePath = "BanksiaIOS/model/EngineData.swift"
             startingColumnNumber = "9223372036854775807"
             endingColumnNumber = "9223372036854775807"
-            startingLineNumber = "44"
-            endingLineNumber = "44"
+            startingLineNumber = "52"
+            endingLineNumber = "52"
             landmarkName = "unknown"
             landmarkType = "0">
          </BreakpointContent>

diff --git a/BanksiaIOS/BsInfo.plist b/BanksiaIOS/BsInfo.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>GADApplicationIdentifier</key>

diff --git a/BanksiaIOS/model/EngineData.swift b/BanksiaIOS/model/EngineData.swift
@@ -18,10 +18,18 @@
 
 import SwiftUI
 
-let version_stockfish = "14 dev"
 let version_lc0 = "0.26.3"
 
+// Warning: watchOS limit the app size only 75MB, the new net makes the app over that limit (108MB)
+// we must use the older net to reduce the size
+#if os(watchOS)
+let version_stockfish = "13 dev"
+let network_nnue = "nn-03744f8d56d8.nnue"
+#else
+let version_stockfish = "14 dev"
 let network_nnue = "nn-9e3c6298299a.nnue"
+#endif
+
 let network_lc0 = "703810.pb.gz"
 
 struct EngineInfo : Hashable {
@@ -47,6 +55,8 @@ let xiphosEngineInfo = EngineInfo(name: "Xiphos", shortName: "Xp", version: "0.5
                                   frc: true, idNumb: xiphos, elo: 3339, nnue: false, bench: false)
 let defenchessEngineInfo = EngineInfo(name: "Defenchess", shortName: "Dc", version: "2.2", author: "Can Cetin, Dogac Eldenk",
                                       frc: true, idNumb: defenchess, elo: 3280, nnue: false, bench: false)
+
+
 let rubichessEngineInfo = EngineInfo(name: "RubiChess", shortName: "Rb", version: "1.8", author: "Andreas Matthies",
                                      frc: true, idNumb: rubichess, elo: 3296, nnue: false, bench: false)
 let laserEngineInfo = EngineInfo(name: "Laser", shortName: "Ls", version: "1.6", author: "Jeffrey An, Michael An",
@@ -86,6 +96,7 @@ final class EngineData: ObservableObject {
     etherealEngineInfo,
     xiphosEngineInfo,
     rubichessEngineInfo,
+
     laserEngineInfo,
     defenchessEngineInfo,
 //    igelEngineInfo,

diff --git a/BanksiaWatch Extension/Info.plist b/BanksiaWatch Extension/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>CLKComplicationPrincipalClass</key>

diff --git a/BanksiaWatch/BsWatchAssets.xcassets/AppIcon.appiconset/Contents.json b/BanksiaWatch/BsWatchAssets.xcassets/AppIcon.appiconset/Contents.json
@@ -1,92 +1,120 @@
 {
   "images" : [
     {
-      "size" : "24x24",
-      "idiom" : "watch",
       "filename" : "bs-24@2x.png",
-      "scale" : "2x",
+      "idiom" : "watch",
       "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "24x24",
       "subtype" : "38mm"
     },
     {
-      "size" : "27.5x27.5",
-      "idiom" : "watch",
       "filename" : "bs-27-5@2x.png",
-      "scale" : "2x",
+      "idiom" : "watch",
       "role" : "notificationCenter",
+      "scale" : "2x",
+      "size" : "27.5x27.5",
       "subtype" : "42mm"
     },
     {
-      "size" : "29x29",
-      "idiom" : "watch",
       "filename" : "bs-29@2x.png",
+      "idiom" : "watch",
       "role" : "companionSettings",
-      "scale" : "2x"
+      "scale" : "2x",
+      "size" : "29x29"
     },
     {
-      "size" : "29x29",
-      "idiom" : "watch",
       "filename" : "bs-24@3x.png",
+      "idiom" : "watch",
       "role" : "companionSettings",
-      "scale" : "3x"
+      "scale" : "3x",
+      "size" : "29x29"
     },
     {
-      "size" : "40x40",
       "idiom" : "watch",
-      "filename" : "bs-40@2x.png",
+      "role" : "notificationCenter",
       "scale" : "2x",
+      "size" : "33x33",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "bs-40@2x.png",
+      "idiom" : "watch",
       "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "40x40",
       "subtype" : "38mm"
     },
     {
-      "size" : "44x44",
-      "idiom" : "watch",
       "filename" : "bs-44@2x.png",
-      "scale" : "2x",
+      "idiom" : "watch",
       "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "44x44",
       "subtype" : "40mm"
     },
     {
-      "size" : "50x50",
       "idiom" : "watch",
-      "filename" : "bs-50@2x.png",
+      "role" : "appLauncher",
       "scale" : "2x",
+      "size" : "46x46",
+      "subtype" : "41mm"
+    },
+    {
+      "filename" : "bs-50@2x.png",
+      "idiom" : "watch",
       "role" : "appLauncher",
+      "scale" : "2x",
+      "size" : "50x50",
       "subtype" : "44mm"
     },
     {
-      "size" : "86x86",
       "idiom" : "watch",
-      "filename" : "bs-86@2x.png",
+      "role" : "appLauncher",
       "scale" : "2x",
+      "size" : "51x51",
+      "subtype" : "45mm"
+    },
+    {
+      "filename" : "bs-86@2x.png",
+      "idiom" : "watch",
       "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "86x86",
       "subtype" : "38mm"
     },
     {
-      "size" : "98x98",
-      "idiom" : "watch",
       "filename" : "bs-98@2x.png",
-      "scale" : "2x",
+      "idiom" : "watch",
       "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "98x98",
       "subtype" : "42mm"
     },
     {
-      "size" : "108x108",
-      "idiom" : "watch",
       "filename" : "bs-108@2x.png",
-      "scale" : "2x",
+      "idiom" : "watch",
       "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "108x108",
       "subtype" : "44mm"
     },
     {
-      "idiom" : "watch-marketing",
+      "idiom" : "watch",
+      "role" : "quickLook",
+      "scale" : "2x",
+      "size" : "117x117",
+      "subtype" : "45mm"
+    },
+    {
       "filename" : "bs-1024@1x.png",
-      "size" : "1024x1024",
-      "scale" : "1x"
+      "idiom" : "watch-marketing",
+      "scale" : "1x",
+      "size" : "1024x1024"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
   }
 }
diff --git a/BanksiaWatch/Info.plist b/BanksiaWatch/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
 	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>UISupportedInterfaceOrientations</key>

diff --git a/README.md b/README.md
@@ -67,7 +67,7 @@ If you download and use BanksiaGUI app on AppStore you already help me. You may
 Banksia GUI for iOS was written by Nguyen Pham (axchess at yahoo dot com). Banksia GUI for iOS is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation, either version 3 of the License, or (at your option) any later version.
 
 All integrated chess engines are open-source with GNU license or similar:
-- Stockfish, version: 13dev, authosr: Stockfish team, link: https://github.com/official-stockfish/Stockfish
+- Stockfish, version: 14dev, authosr: Stockfish team, link: https://github.com/official-stockfish/Stockfish
 - LeelaChess Zero (Lc0), version: 0.26.3, authors: LeelaChessZero team, link: https://github.com/LeelaChessZero/lc0
 - Ethereal, version: 12.50, authors: Andrew Grant, link: https://github.com/AndyGrant/Ethereal
 - Xiphos, version: 0.5, authors: Milos Tatarevic, link: https://github.com/milostatarevic/xiphos
@@ -78,4 +78,5 @@ All integrated chess engines are open-source with GNU license or similar:
 
 
 ## History
+- 2021 Oct 17: version 1.1 Fixed bugs, upgrade Stockfish to 14dev
 - 2020 Nov 20: version 1.0 offical first release
diff --git a/engines/engines.cpp b/engines/engines.cpp
@@ -104,12 +104,12 @@ extern "C" void ethereal_uci_cmd(const char* str);
 extern "C" void xiphos_initialize();
 extern "C" void xiphos_uci_cmd(const char* str);
 
-void depenchess_initialize();
-void depenchess_uci_cmd(const char* str);
-
 void rubichess_initialize();
 void rubichess_uci_cmd(const char* str);
 
+void depenchess_initialize();
+void depenchess_uci_cmd(const char* str);
+
 void laser_initialize();
 void laser_uci_cmd(const char* str);
 
@@ -207,7 +207,7 @@ void engine_initialize(int eid, int coreNumber, int skillLevel, int nnueMode)
       case defenchess:
         depenchess_initialize();  /// Threads, Hash, Ponder
         break;
-                
+
 //      case fruit:
 //        fruit_initialize();  /// Hash Ponder, no threads
 //        break;
@@ -284,7 +284,7 @@ void engine_cmd(int eid, const char *cmd)
     case defenchess:
       depenchess_uci_cmd(cmd);
       break;
-
+          
 #endif /// #ifndef NNONLY
 
 //    case igel:

diff --git a/engines/stockfishlib.cpp b/engines/stockfishlib.cpp
@@ -54,17 +54,6 @@ void stockfish_initialize() {
   _stockfish_initialize();
 }
 
-//static std::vector<std::string> splitString(const std::string &s, char delim)
-//{
-//    std::vector<std::string> vec;
-//    std::stringstream ss;
-//    ss.str(s);
-//    std::string item;
-//    while (std::getline(ss, item, delim)) {
-//        if (!item.empty()) vec.push_back(item);
-//    }
-//    return vec;
-//}
 
 int UCI::cmd(const std::string& cmd) {
   static Position pos;