| 
						
						
							
								
							
						
						
					 | 
					 | 
					@ -17,8 +17,13 @@ class NeopixelDriverNode:
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        self.serial = Serial(self.port, 115200, timeout=1)
 | 
					 | 
					 | 
					 | 
					        self.serial = Serial(self.port, 115200, timeout=1)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    def listen(self):
 | 
					 | 
					 | 
					 | 
					    def listen(self):
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					<<<<<<< HEAD
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        rospy.init_node("light_ctrl", anonymous=True)
 | 
					 | 
					 | 
					 | 
					        rospy.init_node("light_ctrl", anonymous=True)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        rospy.Subscriber("/neopixel", self._msg, self.neopixel_ctrl_callback)
 | 
					 | 
					 | 
					 | 
					        rospy.Subscriber("/neopixel", self._msg, self.neopixel_ctrl_callback)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					=======
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        rospy.init_node("light_ctrl", anonymous=True, log_level=rospy.INFO)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					        rospy.Subscriber("/neopixel", Neopixels, self.neopixel_ctrl_callback)
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					 | 
					>>>>>>> 37b2adbedcf87e091d5ebd6efde78e86c64171d8
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					        rate = rospy.spin()
 | 
					 | 
					 | 
					 | 
					        rate = rospy.spin()
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					
 | 
					 | 
					 | 
					 | 
					
 | 
				
			
			
		
	
		
		
			
				
					
					 | 
					 | 
					 | 
					    def neopixel_ctrl_callback(self, data):
 | 
					 | 
					 | 
					 | 
					    def neopixel_ctrl_callback(self, data):
 | 
				
			
			
		
	
	
		
		
			
				
					| 
						
							
								
							
						
						
						
					 | 
					 | 
					
 
 |