Browse Source
			
			
			Merge pull request #147 from stefan123t/main
			
				0.5.9 fix PowerPFDev.Desc=0x0001 for PowerLimit
			
			
				pull/149/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
						
					
				
			
		
		
		
	
		
			
				 4 changed files with 
6 additions and 
3 deletions
			 
			
		 
		
			
				- 
					
					
					 
					tools/esp8266/README.md
				
- 
					
					
					 
					tools/esp8266/app.cpp
				
- 
					
					
					 
					tools/esp8266/defines.h
				
- 
					
					
					 
					tools/esp8266/hmInverter.h
				
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -73,6 +73,9 @@ For now the following inverters should work out of the box: | 
			
		
	
		
			
				
					|  |  |  | ## Changelog | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | (*) EEPROM changes require settings to be changed, your settings will be overwritten and need to be set again! | 
			
		
	
		
			
				
					|  |  |  | - v0.5.9 *fix PowerLimit PowerPFDev.Desc=0x0001 for permanent | 
			
		
	
		
			
				
					|  |  |  | - v0.5.8 *fix #146 device name in setup | 
			
		
	
		
			
				
					|  |  |  | - v0.5.7 *add collapsible setup | 
			
		
	
		
			
				
					|  |  |  | - v0.5.6 *fix only MQTT sub after the first loop in a conenction | 
			
		
	
		
			
				
					|  |  |  | - v0.5.5 *fixed MQTT sub only after connection is established (HorstG-57) | 
			
		
	
		
			
				
					|  |  |  |          + added in app.cpp some compiler if statements | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -86,7 +86,7 @@ void app::setup(uint32_t timeout) { | 
			
		
	
		
			
				
					|  |  |  |                 if(NULL != iv) { | 
			
		
	
		
			
				
					|  |  |  |                     mEep->read(ADDR_INV_PWR_LIM + (i * 2),(uint16_t *)&(iv->powerLimit[0])); | 
			
		
	
		
			
				
					|  |  |  |                     if (iv->powerLimit[0] != 0xffff) { // only set it, if it is changed by user. Default value in the html setup page is -1 = 0xffff
 | 
			
		
	
		
			
				
					|  |  |  |                         iv->powerLimit[1] = 0x0100; // set the limit as persistent
 | 
			
		
	
		
			
				
					|  |  |  |                         iv->powerLimit[1] = 0x0001; // set the limit as persistent
 | 
			
		
	
		
			
				
					|  |  |  |                         iv->devControlCmd = ActivePowerContr; // set active power limit
 | 
			
		
	
		
			
				
					|  |  |  |                         iv->devControlRequest = true; // set to true to update the active power limit from setup html page 
 | 
			
		
	
		
			
				
					|  |  |  |                         DPRINTLN(DBG_INFO, F("add inverter: ") + String(name) + ", SN: " + String(invSerial, HEX) + ", Power Limit: " + String(iv->powerLimit[0])); | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -21,7 +21,7 @@ | 
			
		
	
		
			
				
					|  |  |  | //-------------------------------------
 | 
			
		
	
		
			
				
					|  |  |  | #define VERSION_MAJOR       0 | 
			
		
	
		
			
				
					|  |  |  | #define VERSION_MINOR       5 | 
			
		
	
		
			
				
					|  |  |  | #define VERSION_PATCH       8 | 
			
		
	
		
			
				
					|  |  |  | #define VERSION_PATCH       9 | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | 
 | 
			
		
	
		
			
				
					|  |  |  | //-------------------------------------
 | 
			
		
	
	
		
			
				
					|  |  | 
 | 
			
		
	
								
							
						
					 
					
				 
			 
		
			
			
			
			
			
			
				
				
					
						
							
								
									
	
		
			
				
					|  |  | @ -84,7 +84,7 @@ class Inverter { | 
			
		
	
		
			
				
					|  |  |  |         Inverter() { | 
			
		
	
		
			
				
					|  |  |  |             ts = 0; | 
			
		
	
		
			
				
					|  |  |  |             powerLimit[0] = -1; // 65535 W Limit -> unlimited
 | 
			
		
	
		
			
				
					|  |  |  |             powerLimit[1] = 0x0100; // 0x0000 --> set temporary , 0x0100 --> set persistent
 | 
			
		
	
		
			
				
					|  |  |  |             powerLimit[1] = 0x0001; // 0x0000 --> set temporary , 0x0001 --> set persistent
 | 
			
		
	
		
			
				
					|  |  |  |             devControlRequest = false; | 
			
		
	
		
			
				
					|  |  |  |             devControlCmd = 0xff; | 
			
		
	
		
			
				
					|  |  |  |         } | 
			
		
	
	
		
			
				
					|  |  | 
 |