Merge branch 'master' into pr1040

jsk-ros-pkg · Sep 9, 2022 · 62ebee6 · 62ebee6
2 parents 4e4773d + af0233c
commit 62ebee6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/dialogflow_task_executive/CMakeLists.txt b/dialogflow_task_executive/CMakeLists.txt
@@ -3,7 +3,7 @@ project(dialogflow_task_executive)
 
 execute_process(COMMAND bash -c "gcc -dumpmachine" OUTPUT_VARIABLE gcc_dump_machine OUTPUT_STRIP_TRAILING_WHITESPACE)
 message("-- gcc dumpmachine returns ${gcc_dump_machine}")
-if(NOT gcc_dump_machine MATCHES "x86_64-.*")
+if(NOT (gcc_dump_machine MATCHES "x86_64-.*" OR gcc_dump_machine MATCHES "aarch64-.*"))
   message(WARNING "pip -i requirements.txt work only with i686 ???")
   message(WARNING "`pip install grpcio` fails with
   third_party/boringssl-with-bazel/src/crypto/hrss/asm/poly_rq_mul.S: Assembler messages:

diff --git a/rostwitter/scripts/tweet.py b/rostwitter/scripts/tweet.py
@@ -28,7 +28,9 @@ def __init__(self):
 
     def tweet_cb(self, msg):
         message = msg.data
-        rospy.loginfo(rospy.get_name() + " sending %s", message)
+        # base64 messages are noisy, so tweet log is suppressed
+        rospy.loginfo(rospy.get_name() + " sending %s",
+                      ''.join([message] if len(message) < 128 else message[0:128]+'......'))
 
         # search word start from / and end with {.jpeg,.jpg,.png,.gif}
         m = re.search('/\S+\.(jpeg|jpg|png|gif)', message)