put back battery scale hack

rochuck · Sep 14, 2020 · bac2967 · bac2967
1 parent 48b5f80
commit bac2967
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/components/services/battery.c b/components/services/battery.c
@@ -73,6 +73,8 @@ static void battery_callback(TimerHandle_t xTimer) {
 void battery_svc_init(void) {
 #ifdef CONFIG_BAT_SCALE	
 	battery.scale = atof(CONFIG_BAT_SCALE);
+	/** @todo CGR fix this properly */
+     battery.scale = 21.11;
 #endif	
 
 	char *nvs_item = config_alloc_get_default(NVS_TYPE_STR, "bat_config", "n", 0);

diff --git a/components/services/monitor.h b/components/services/monitor.h
@@ -16,10 +16,6 @@ extern bool jack_inserted_svc(void);
 extern void (*spkfault_handler_svc)(bool inserted);
 extern bool spkfault_svc(void);
 
-<<<<<<< HEAD
-extern double battery_value_svc(void);
-=======
 extern float battery_value_svc(void);
->>>>>>> master-cmake
 extern uint8_t battery_level_svc(void);