Browse Source
			
			
			Merge pull request #108 from fila612/main
			
				HASS - MQTT Retained Messages
			
			
				pull/109/head
			
			
		 
		
			
				
					
						 lumapu
					
					3 years ago
						lumapu
					
					3 years ago
					
						
							committed by
							
								 GitHub
								GitHub
							
						 
					
				 
				
			 
		 
		
			
				
					
					No known key found for this signature in database
					
						
							GPG Key ID: 4AEE18F83AFDEB23
						
					
				
			
		
		
		
	
		
			
				 2 changed files with 
4 additions and 
4 deletions
			 
			
		 
		
			
				- 
					
					
					 
					tools/esp8266/app.cpp
				
- 
					
					
					 
					tools/esp8266/mqtt.h
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -930,7 +930,7 @@ void app::sendMqttDiscoveryConfig(void) { | 
			
		
	
		
			
				
					|  |  |  |                     } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |                     serializeJson(doc, buffer); | 
			
		
	
		
			
				
					|  |  |  |                     mMqtt.sendMsg2(discoveryTopic, buffer); | 
			
		
	
		
			
				
					|  |  |  |                     mMqtt.sendMsg2(discoveryTopic, buffer, true); | 
			
		
	
		
			
				
					|  |  |  |                     doc.clear(); | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |                     yield(); | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -39,15 +39,15 @@ class mqtt { | 
			
		
	
		
			
				
					|  |  |  |             //DPRINTLN(DBG_VERBOSE, F("mqtt.h:sendMsg"));
 | 
			
		
	
		
			
				
					|  |  |  |             char top[64]; | 
			
		
	
		
			
				
					|  |  |  |             snprintf(top, 64, "%s/%s", mTopic, topic); | 
			
		
	
		
			
				
					|  |  |  |             sendMsg2(top, msg); | 
			
		
	
		
			
				
					|  |  |  |             sendMsg2(top, msg, false); | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  |         void sendMsg2(const char *topic, const char *msg) { | 
			
		
	
		
			
				
					|  |  |  |         void sendMsg2(const char *topic, const char *msg, boolean retained) { | 
			
		
	
		
			
				
					|  |  |  |             if(mAddressSet) { | 
			
		
	
		
			
				
					|  |  |  |                 if(!mClient->connected()) | 
			
		
	
		
			
				
					|  |  |  |                     reconnect(); | 
			
		
	
		
			
				
					|  |  |  |                 if(mClient->connected()) | 
			
		
	
		
			
				
					|  |  |  |                     mClient->publish(topic, msg); | 
			
		
	
		
			
				
					|  |  |  |                     mClient->publish(topic, msg, retained); | 
			
		
	
		
			
				
					|  |  |  |             } | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
	
		
			
				
					|  |  | 
 |