diff --git a/myrobotlab.bat b/myrobotlab.bat index a6ce3e30ea..4fef5b632e 100644 --- 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 ) \ No newline at end of file diff --git a/myrobotlab.sh b/myrobotlab.sh index 4cc45eb085..ed4faf7497 100755 --- 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 $# $@ \ No newline at end of file diff --git a/src/main/java/org/myrobotlab/service/Runtime.java b/src/main/java/org/myrobotlab/service/Runtime.java index e5da31305f..8cec77b883 100644 --- a/src/main/java/org/myrobotlab/service/Runtime.java +++ b/src/main/java/org/myrobotlab/service/Runtime.java @@ -3143,7 +3143,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 index bcf2a80691..cb36ecb491 100644 --- a/src/main/java/org/myrobotlab/service/WebGui.java +++ b/src/main/java/org/myrobotlab/service/WebGui.java @@ -1180,7 +1180,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/InMoov2HeadConfig.java b/src/main/java/org/myrobotlab/service/config/InMoov2HeadConfig.java index 59aafc2cef..9d46a4d19b 100644 --- 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 index 4abedeb490..19434b498d 100644 --- a/src/main/resources/resource/WebGui/app/service/tab-header.html +++ b/src/main/resources/resource/WebGui/app/service/tab-header.html @@ -1,117 +1,124 @@
- +
+ + + + + + + +
+ + +
+ + +
+ 		+ + + + + +
+
+ + - - - - - - + + + + + + + + + + + + + +
- - -
- - -
- 		- - - - - - keynamestate
+ + + + + {{peer.getActualName(service, key)}} + + + {{value.key}} +
+ {{value.type}} + 		{{value.state}} + +
-
- - - - - - - - - - - - - - - - - - -
keynamestate
- - - - - - {{peer.getActualName(service, key)}} - - - {{value.key}}
{{value.type}} - 		{{value.state}} - -
-
+
diff --git a/src/main/resources/resource/WebGui/app/service/views/IntroGui.html b/src/main/resources/resource/WebGui/app/service/views/IntroGui.html index 0c9fd3d99a..b587c51e30 100644 --- 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 @@ - @@ -337,7 +336,6 @@

MORE INFO   SEE PYTHON SCRIPT -