Merge remote-tracking branch 'origin/master' into dev

Application/app/event_record.c

@@ -3,9 +3,8 @@
 #include "event_record.h"
 #include "libs/shark_task.h"
 
-#define MAX_EVENT_SIZE 100
+#define MAX_EVENT_SIZE 120
 static event_record_t _event[MAX_EVENT_SIZE];
-static event_record_t _max_current;
 static int event_w_idx = 0;
 static bool _event_full = false;
 
@@ -29,14 +28,6 @@ void push_event(event_id_t id, s32 data) {
 	pevent->data = data;
 }
 
-void push_max_current(s32 current) {
-	_max_current.id = Max_current_persis;
-	_max_current.timestamp = shark_get_seconds();
-	if (abs(current) > abs(_max_current.data)) {
-		_max_current.data = current;
-	}
-}
-
 static int _event_size(void) {
 	if (_event_full) {
 		return MAX_EVENT_SIZE;
@@ -46,10 +37,6 @@ static int _event_size(void) {
 
 int get_event(int num, int offset, u8 *recoder) {
 	if (offset >= _event_size()) {
-		if (offset == _event_size()) {
-			memcpy(recoder, &_max_current, sizeof(event_record_t));
-			return 1;
-		}
 		return 0;
 	}
 	num = MIN(num, _event_size()-offset);

Application/app/event_record.h

@@ -36,7 +36,6 @@ typedef struct {
 
 void push_event(event_id_t id, s32 data);
 int get_event(int num, int offset, u8 *recoder);
-void push_max_current(s32 current);
 
 #endif /* _Event_Recorde_H__ */
 

Application/app/sox/health.c

@@ -196,7 +196,6 @@ void check_current_state(void){
 				soft_current_init();
 			}		
 		}
-		push_max_current((s32)current);
 	}	
 }
 
@@ -282,6 +281,7 @@ static void push_cell_event(event_id_t id){
 		t.ds8[i] = (s8)measure_value()->pack_temp[i];
 	}
 	push_event(Pack_Temp, t.data);
+	push_event(Max_current_persis, measure_value()->load_current);
 }
 
 void check_voltage_state(void) {