Merge branch 'develop' of github.com-myrobotlab:MyRobotLab/myrobotlab…

… into inmoov2-heart
MyRobotLab · Mar 5, 2024 · 80f1034 · 80f1034
2 parents a36eba5 + 5a2c9e6
commit 80f1034
Show file tree

Hide file tree

Showing 8 changed files with 35 additions and 9 deletions.
diff --git a/myrobotlab.bat b/myrobotlab.bat
@@ -28,6 +28,6 @@ IF NOT "%*"=="" (
         "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --install --log-file myrobotlab-install.log
     )
 
-    "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --log-level info -s log Log webgui WebGui intro Intro python Python
+    "%JAVA%" %JAVA_OPTIONS% -cp %CLASSPATH% org.myrobotlab.service.Runtime --log-level warn -s log Log webgui WebGui intro Intro python Python
 
 )
diff --git a/myrobotlab.sh b/myrobotlab.sh
@@ -62,6 +62,6 @@ else
     "${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --install --log-file myrobotlab-install.log
 fi
 
-"${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --log-level info -s log Log webgui WebGui intro Intro python Python
+"${JAVA}" ${JAVA_OPTIONS} -cp ${CLASSPATH} org.myrobotlab.service.Runtime --log-level warn -s log Log webgui WebGui intro Intro python Python
 
 echo $# $@
diff --git a/src/main/java/org/myrobotlab/service/Runtime.java b/src/main/java/org/myrobotlab/service/Runtime.java
@@ -3193,7 +3193,7 @@ public String[] getServiceTypeNames(String filter) {
   static public Status noWorky(String userId) {
     Status status = null;
     try {
-      String retStr = HttpRequest.postFile("http://myrobotlab.org/myrobotlab_log/postLogFile.php", userId, "file", new File(LoggingFactory.getLogFileName()));
+      String retStr = HttpRequest.postFile("http://noworky.myrobotlab.org/no-worky", userId, "file", new File(LoggingFactory.getLogFileName()));
       if (retStr.contains("Upload:")) {
         log.info("noWorky successfully sent - our crack team of experts will check it out !");
         status = Status.info("no worky sent");

diff --git a/src/main/java/org/myrobotlab/service/WebGui.java b/src/main/java/org/myrobotlab/service/WebGui.java
@@ -1184,8 +1184,7 @@ public static void main(String[] args) {
 
     try {
 
-      Runtime.main(new String[] { "--log-level", "info", "-s", "log", "Log", "webgui", "WebGui", "intro", "Intro",
-          "python", "Python" });
+      Runtime.main(new String[] { "--log-level", "warn", "-s", "log", "Log", "webgui", "WebGui", "intro", "Intro", "python", "Python" });
       // Runtime.main(new String[] { "--install" });
 
       boolean done = true;

diff --git a/src/main/java/org/myrobotlab/service/config/InMoov2Config.java b/src/main/java/org/myrobotlab/service/config/InMoov2Config.java
@@ -512,7 +512,7 @@ public Plan getDefault(Plan plan, String name) {
     // allow user to override or extend with python
     listeners.add(new Listener("publishBoot", name));
     // listeners.add(new Listener("publishHeartbeat", name));
-    listeners.add(new Listener("publishConfigFinished", name));
+    // listeners.add(new Listener("publishConfigFinished", name));
 
     LogConfig log = (LogConfig) plan.get(getPeerName("log"));
     log.level = "warn";

diff --git a/src/main/java/org/myrobotlab/service/config/InMoov2HeadConfig.java b/src/main/java/org/myrobotlab/service/config/InMoov2HeadConfig.java
@@ -17,6 +17,30 @@ public Plan getDefault(Plan plan, String name) {
     addDefaultPeerConfig(plan, name, "rollNeck", "Servo");
     addDefaultPeerConfig(plan, name, "eyelidLeft", "Servo");
     addDefaultPeerConfig(plan, name, "eyelidRight", "Servo");
+
+    // v2
+    addDefaultPeerConfig(plan, name, "forheadRight", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyelidRightUpper", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyelidRightLower", "Servo", false);
+
+    addDefaultPeerConfig(plan, name, "eyeRightLR", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyeRightUD", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyeRightLR", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyeRightUD", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyebrowRight", "Servo", false);
+    addDefaultPeerConfig(plan, name, "cheekRight", "Servo", false);
+
+    addDefaultPeerConfig(plan, name, "forheadLeft", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyelidLeftUpper", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyelidLeftLower", "Servo", false);
+    addDefaultPeerConfig(plan, name, "rothead", "Servo", false);
+    addDefaultPeerConfig(plan, name, "upperLip", "Servo", false);
+
+    addDefaultPeerConfig(plan, name, "eyeLeftLR", "Servo", false);
+    addDefaultPeerConfig(plan, name, "eyeLeftUD", "Servo", false);
+
+    addDefaultPeerConfig(plan, name, "eyebrowLeft", "Servo", false);
+    addDefaultPeerConfig(plan, name, "cheekLeft", "Servo", false);
 
     ServoConfig jaw = (ServoConfig) plan.get(getPeerName("jaw"));
     jaw.autoDisable = true;

diff --git a/src/main/resources/resource/WebGui/app/service/tab-header.html b/src/main/resources/resource/WebGui/app/service/tab-header.html
@@ -10,7 +10,9 @@
         <div class="dropdown">
           <button class="btn btn-default dropdown-toggle" type="button" data-toggle="dropdown">
             <img ng-src="{{::service.simpleName}}.png" alt="" width="16" />
-            &nbsp;&nbsp {{::service.simpleName}}&nbsp;&nbsp;{{::service.name}}@{{::service.id}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{::service.serviceVersion}}
+            <<<<<<< HEAD &nbsp;&nbsp {{::service.simpleName}}&nbsp;&nbsp;{{::service.name}}@{{::service.id}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{::service.serviceVersion}} =======
+            &nbsp;&nbsp {{::service.simpleName}}&nbsp;&nbsp;{{::service.name}}&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;{{::service.serviceVersion}} >>>>>>>
+            5a2c9e63ebe81f301c16e7627b72f72c73edb1f6
             <span class="caret"></span>
           </button>
           <ul class="dropdown-menu">
@@ -63,16 +65,19 @@
       <td>
         <button class="btn btn-default" ng-click="release()" title="stops and releases a service">
           <span class="glyphicon glyphicon-remove red"></span>
+          release
         </button>
       </td>
       <td>
         <button class="btn btn-default" ng-click="save()" title="save current configuration">
           <span class="glyphicon glyphicon-save-file"></span>
+          save
         </button>
       </td>
       <td>
         <button class="btn btn-default" ng-click="apply()" title="load and apply configuration">
           <span class="glyphicon glyphicon-open-file"></span>
+          apply
         </button>
       </td>
     </tr>

diff --git a/src/main/resources/resource/WebGui/app/service/views/IntroGui.html b/src/main/resources/resource/WebGui/app/service/views/IntroGui.html
@@ -86,7 +86,6 @@
                 </tr>
                 <tr>
                     <td>
-                        <iframe width="560" height="315" src="https://www.youtube.com/embed/-EQxjpsOJDg" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
                     </td>
                 </tr>
             </table>
@@ -337,7 +336,6 @@
             </p>
             <a class="row col-md-3" target="_blank" href="http://myrobotlab.org/service/Python">MORE INFO</a>
             &nbsp;&nbsp;<a class="row col-md-3" target="_blank" href="https://raw.githubusercontent.com/MyRobotLab/InMoov2/master/resource/InMoov2/InMoov2FingerStarter.py">SEE PYTHON SCRIPT</a>
-            <iframe width="560" height="315" src="https://www.youtube.com/embed/_uQrJ0TkZlc" frameborder="0" allow="accelerometer; autoplay; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
         </td>
     </tr>    
     <tr>