Skip to content

Commit 85e0be3

Browse files
committed
rewrite socials.py
1 parent 9bed70e commit 85e0be3

File tree

2 files changed

+11
-9
lines changed

2 files changed

+11
-9
lines changed

socials.py

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ def __init__(self):
1010
self.twitter_hashtag = str()
1111
self.print_tags()
1212

13-
sub_vk = rospy.Subscriber('/social/vk/newsfeed_scanner/hashtag', String, self.callback_vk_hashtag)
14-
twitter_vk = rospy.Subscriber('/social/twitter/code_scanner/code', String, self.callback_twitter_hashtag)
13+
#sub_vk = rospy.Subscriber('/social/vk/newsfeed_scanner/hashtag', String, self.callback_vk_hashtag)
14+
#twitter_vk = rospy.Subscriber('/social/twitter/code_scanner/code', String, self.callback_twitter_hashtag)
1515

1616
def callback_vk_hashtag(self, data: String):
1717
self.vk_hashtag = data.data
@@ -22,10 +22,11 @@ def callback_twitter_hashtag(self, data: String):
2222
self.print_tags()
2323

2424
def print_tags(self):
25-
clear = os.system('clear')
26-
print('-----------hashtags-----------')
27-
print('vk: ', self.vk_hashtag)
28-
print('twitter: ', self.twitter_hashtag)
25+
#print('vk: ', self.vk_hashtag)
26+
if rospy.has_param('twitter_hashtag'):
27+
clear = os.system('clear')
28+
print('-----------hashtags-----------')
29+
print('twitter: ', rospy.get_param('twitter_hashtag')
2930

3031

3132

@@ -38,5 +39,5 @@ def print_tags(self):
3839
rospy.get_master().getPid()
3940
except:
4041
break
41-
42-
time.time(0.1)
42+
social.print_tags()
43+
time.sleep(1)

test_servos2.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
from motion.candy_dispenser.candy_dispenser_controller import Dispenser
2626

2727
import serial
28-
TIMEOUT = 10
28+
TIMEOUT = 5
2929
import time
3030

3131
import ros_numpy
@@ -170,6 +170,7 @@ def menu():
170170

171171

172172
if __name__ == '__main__':
173+
global TIMEOUT
173174
rospy.init_node('test_head')
174175

175176

0 commit comments

Comments
 (0)