Skip to content

Commit 804c601

Browse files
committed
Revert "fw/services/common/battery/nrf_fuel_gauge: persist nRF fuel gauge state to flash"
This reverts commit 9666dba. Signed-off-by: Gerard Marull-Paretas <gerard@teslabs.com>
1 parent 443add5 commit 804c601

1 file changed

Lines changed: 0 additions & 90 deletions

File tree

src/fw/services/common/battery/nrf_fuel_gauge/battery_state.c

Lines changed: 0 additions & 90 deletions
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,6 @@
1717
#include "util/math.h"
1818
#include "util/ratio.h"
1919

20-
#ifndef RECOVERY_FW
21-
#include "services/normal/settings/settings_file.h"
22-
#endif
23-
2420
#include "nrf_fuel_gauge.h"
2521

2622
#define ALWAYS_UPDATE_PCT 10.0f
@@ -60,65 +56,6 @@ static uint32_t s_last_tte;
6056
static uint32_t s_last_ttf;
6157
static RtcTicks s_last_log;
6258

63-
#ifndef RECOVERY_FW
64-
#define FUEL_GAUGE_SETTINGS_FILE_NAME "fgs"
65-
#define FUEL_GAUGE_SAVE_INTERVAL_S 300
66-
#define FUEL_GAUGE_SETTINGS_MAX_SIZE 512
67-
68-
static const uint32_t FUEL_GAUGE_STATE_KEY = 1;
69-
static uint32_t s_save_counter;
70-
71-
static bool prv_load_state(void *state, size_t size) {
72-
SettingsFile file;
73-
status_t ret;
74-
75-
ret = settings_file_open(&file, FUEL_GAUGE_SETTINGS_FILE_NAME,
76-
FUEL_GAUGE_SETTINGS_MAX_SIZE);
77-
if (ret != S_SUCCESS) {
78-
return false;
79-
}
80-
81-
int len = settings_file_get_len(&file, &FUEL_GAUGE_STATE_KEY,
82-
sizeof(FUEL_GAUGE_STATE_KEY));
83-
if (len != (int)size) {
84-
settings_file_close(&file);
85-
return false;
86-
}
87-
88-
ret = settings_file_get(&file, &FUEL_GAUGE_STATE_KEY,
89-
sizeof(FUEL_GAUGE_STATE_KEY), state, size);
90-
settings_file_close(&file);
91-
92-
return (ret == S_SUCCESS);
93-
}
94-
95-
static void prv_save_state(void) {
96-
uint8_t buf[nrf_fuel_gauge_state_size];
97-
SettingsFile file;
98-
status_t ret;
99-
100-
if (nrf_fuel_gauge_state_get(buf, sizeof(buf)) != 0) {
101-
PBL_LOG_ERR("Failed to get fuel gauge state");
102-
return;
103-
}
104-
105-
ret = settings_file_open(&file, FUEL_GAUGE_SETTINGS_FILE_NAME,
106-
FUEL_GAUGE_SETTINGS_MAX_SIZE);
107-
if (ret != S_SUCCESS) {
108-
PBL_LOG_ERR("Failed to open fuel gauge settings file");
109-
return;
110-
}
111-
112-
ret = settings_file_set(&file, &FUEL_GAUGE_STATE_KEY,
113-
sizeof(FUEL_GAUGE_STATE_KEY), buf, sizeof(buf));
114-
settings_file_close(&file);
115-
116-
if (ret != S_SUCCESS) {
117-
PBL_LOG_ERR("Failed to save fuel gauge state");
118-
}
119-
}
120-
#endif
121-
12259
static void prv_schedule_update(uint32_t delay, bool force_update);
12360

12461
static void prv_charge_status_inform(BatteryChargeStatus chg_status) {
@@ -251,13 +188,6 @@ static void prv_update_state(void *force_update) {
251188
s_last_ttf = 0U;
252189
}
253190

254-
#ifndef RECOVERY_FW
255-
if (++s_save_counter >= FUEL_GAUGE_SAVE_INTERVAL_S) {
256-
s_save_counter = 0;
257-
prv_save_state();
258-
}
259-
#endif
260-
261191
PBL_LOG_VERBOSE("Battery state: v_mv: %ld, i_ua: %ld, t_mc: %ld, td: %lu, soc: %u, tte: %lu, ttf: %lu",
262192
constants.v_mv, constants.i_ua, constants.t_mc, (uint32_t)delta,
263193
s_last_battery_charge_state.pct, s_last_tte, s_last_ttf);
@@ -311,29 +241,9 @@ void battery_state_init(void) {
311241

312242
prv_ref_time = rtc_get_ticks();
313243

314-
#ifndef RECOVERY_FW
315-
{
316-
uint8_t saved_state[nrf_fuel_gauge_state_size];
317-
if (prv_load_state(saved_state, sizeof(saved_state))) {
318-
parameters.state = saved_state;
319-
ret = nrf_fuel_gauge_init(&parameters, NULL);
320-
if (ret == 0) {
321-
PBL_LOG_INFO("Fuel gauge state restored from flash");
322-
goto init_done;
323-
}
324-
PBL_LOG_WRN("Fuel gauge init with saved state failed (%d), reinitializing", ret);
325-
parameters.state = NULL;
326-
}
327-
}
328-
#endif
329-
330244
ret = nrf_fuel_gauge_init(&parameters, NULL);
331245
PBL_ASSERTN(ret == 0);
332246

333-
#ifndef RECOVERY_FW
334-
init_done:
335-
#endif
336-
337247
ret = nrf_fuel_gauge_ext_state_update(
338248
NRF_FUEL_GAUGE_EXT_STATE_INFO_CHARGE_CURRENT_LIMIT,
339249
&(union nrf_fuel_gauge_ext_state_info_data){

0 commit comments

Comments
 (0)