pwr: prevent writing to nvs at startup

redchenjs · redchenjs · commit 104a81c2e3e6 · 2020-08-01T01:54:27.000+08:00
diff --git a/main/src/user/pwr.c b/main/src/user/pwr.c
@@ -32,6 +32,8 @@ static char pwr_mode_str[][8] = {
 
 void pwr_set_mode(pwr_idx_t idx)
 {
+    pwr_idx_t pre_mode = pwr_mode;
+
     if (!qc_mode) {
         return;
     }
@@ -64,7 +66,7 @@ void pwr_set_mode(pwr_idx_t idx)
             break;
     }
 
-    if (pwr_mode >= PWR_IDX_QC_5V) {
+    if (pre_mode != pwr_mode) {
         app_setenv("PWR_INIT_CFG", &pwr_mode, sizeof(pwr_mode));
 
         ESP_LOGI(TAG, "%s", pwr_get_mode_str());
@@ -121,8 +123,9 @@ void pwr_init(void)
 
     qc_mode = true;
 
-    size_t length = sizeof(pwr_mode);
-    app_getenv("PWR_INIT_CFG", &pwr_mode, &length);
+    pwr_idx_t pwr_init_cfg = PWR_IDX_DC;
+    size_t length = sizeof(pwr_init_cfg);
+    app_getenv("PWR_INIT_CFG", &pwr_init_cfg, &length);
 
-    pwr_set_mode(pwr_mode);
+    pwr_set_mode(pwr_init_cfg);
 }

Original file line number	Diff line number	Diff line change
`@@ -32,6 +32,8 @@ static char pwr_mode_str[][8] = {`
`32`	`32`
`33`	`33`	`void pwr_set_mode(pwr_idx_t idx)`
`34`	`34`	`{`
	`35`	`+ pwr_idx_t pre_mode = pwr_mode;`
	`36`	`+`
`35`	`37`	`if (!qc_mode) {`
`36`	`38`	`return;`
`37`	`39`	`}`
`@@ -64,7 +66,7 @@ void pwr_set_mode(pwr_idx_t idx)`
`64`	`66`	`break;`
`65`	`67`	`}`
`66`	`68`
`67`		`- if (pwr_mode >= PWR_IDX_QC_5V) {`
	`69`	`+ if (pre_mode != pwr_mode) {`
`68`	`70`	`app_setenv("PWR_INIT_CFG", &pwr_mode, sizeof(pwr_mode));`
`69`	`71`
`70`	`72`	`ESP_LOGI(TAG, "%s", pwr_get_mode_str());`
`@@ -121,8 +123,9 @@ void pwr_init(void)`
`121`	`123`
`122`	`124`	`qc_mode = true;`
`123`	`125`
`124`		`- size_t length = sizeof(pwr_mode);`
`125`		`- app_getenv("PWR_INIT_CFG", &pwr_mode, &length);`
	`126`	`+ pwr_idx_t pwr_init_cfg = PWR_IDX_DC;`
	`127`	`+ size_t length = sizeof(pwr_init_cfg);`
	`128`	`+ app_getenv("PWR_INIT_CFG", &pwr_init_cfg, &length);`
`126`	`129`
`127`		`- pwr_set_mode(pwr_mode);`
	`130`	`+ pwr_set_mode(pwr_init_cfg);`
`128`	`131`	`}`