Merge branch 'master' into testing

KipK · web-flow · commit 4e5070e6bd8c · 2022-11-22T23:02:06.000+01:00
diff --git a/docs/wired-ethernet.md b/docs/wired-ethernet.md
@@ -52,7 +52,7 @@ esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -
 Subsequent upgrades:
 
 ```bash
-esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 0x10000  openevse_esp32-gateway-e.bin
+esptool.py --baud 921600 --before default_reset --after hard_reset write_flash -z --flash_mode dio --flash_freq 40m --flash_size detect 0x1000 openevse_esp32-gateway-e.bin
 ```
 
 ### For rev F/G
diff --git a/src/mqtt.cpp b/src/mqtt.cpp
@@ -72,7 +72,7 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {
   else if (topic_string == mqtt_live_pwr)
   {
       shaper.setLivePwr(payload_str.toInt());
-      DBUGF("shaper: available amps:%dW", shaper.getChgCur());
+      DBUGF("shaper: available amps:%dA", shaper.getChgCur());
   }
   else if (topic_string == mqtt_vrms)
   {

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ void mqttmsg_callback(MongooseString topic, MongooseString payload) {`
`72`	`72`	`else if (topic_string == mqtt_live_pwr)`
`73`	`73`	`{`
`74`	`74`	`shaper.setLivePwr(payload_str.toInt());`
`75`		`- DBUGF("shaper: available amps:%dW", shaper.getChgCur());`
	`75`	`+ DBUGF("shaper: available amps:%dA", shaper.getChgCur());`
`76`	`76`	`}`
`77`	`77`	`else if (topic_string == mqtt_vrms)`
`78`	`78`	`{`