Skip to content

Commit

Permalink
filtering to amps & try to fix sim tests with filtering
Browse files Browse the repository at this point in the history
  • Loading branch information
@tiandahuang
tiandahuang committed Jul 11, 2024
1 parent 0ca98d7 commit a11181b
Show file tree
Hide file tree
Showing 20 changed files with 115 additions and 100 deletions.
4 changes: 3 additions & 1 deletion Apps/Inc/Amps.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ bool Amps_IsCharging(void);

/** Amps_GetReading
* Measures the electrical current from the Ampere minion board
* @param raw if true, return raw value. If false, return filtered value
* use raw value for coulomb counting and filtered for any direct current comparisons
* @return milliamperes value
*/
int32_t Amps_GetReading(void);
int32_t Amps_GetReading(bool raw);

/**
* @brief calibrate the amperes module. Must be called when the contactors are open
Expand Down
32 changes: 24 additions & 8 deletions Apps/Src/Amps.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,15 @@
#include "Simulator.h"
#endif

// ema filter
#define EMA_FILTER_TYPE int32_t
#define EMA_FILTER_ALPHA_NUMERATOR 1
#define EMA_FILTER_ALPHA_DEMONINATOR 4
#define EMA_FILTER_CHANNELS 1
#define EMA_FILTER_NAME AmpsFilter
#include "EMAFilter.h"
static AmpsFilter_t AmpsFilter;

static OS_SEM AmperesIO_Sem;
static bsp_os_t spi_os;

Expand All @@ -26,7 +35,8 @@ void Amperes_Post(){
RTOS_BPS_SemPost(&AmperesIO_Sem, OS_OPT_POST_1);
}

static int32_t latestMeasureMilliAmps;
static int32_t latest_milliamps_raw;
static int32_t latest_milliamps_filtered;

/** Amps_Init
* Initializes hardware to begin current monitoring.
Expand All @@ -44,14 +54,18 @@ void Amps_Init(void) {
void Amps_UpdateMeasurements(void) {
#ifdef SIMULATION
int32_t current = Simulator_getCurrent();
latestMeasureMilliAmps = Simulator_getCurrent();
latest_milliamps_raw = Simulator_getCurrent();
char* msg;
asprintf(&msg, "Milliamp measurement is %d\n", current);
Simulator_Log(LOG_INFO, msg);
free(msg);
#else
latestMeasureMilliAmps = LTC2315_GetCurrent();
latest_milliamps_raw = LTC2315_GetCurrent();
#endif

// update filtered mA reading with EMA filter
AmpsFilter_put(&AmpsFilter, &latest_milliamps_raw);
AmpsFilter_get(&AmpsFilter, &latest_milliamps_filtered);
}

/** Amps_CheckStatus
Expand All @@ -67,7 +81,7 @@ SafetyStatus Amps_CheckStatus(int32_t minTemperature, int32_t maxTemperature) {
int32_t hi_limit = (minTemperature < COLD_DISCHARGE_TEMPERATURE) ? MAX_COLD_CURRENT_LIMIT :
MAX_CURRENT_LIMIT;

int32_t current = latestMeasureMilliAmps;
int32_t current = latest_milliamps_filtered;
return (current > lo_limit && current < hi_limit) ? SAFE : DANGER;
}

Expand All @@ -77,15 +91,17 @@ SafetyStatus Amps_CheckStatus(int32_t minTemperature, int32_t maxTemperature) {
* @return true if charge, false if discharge
*/
bool Amps_IsCharging(void) {
return latestMeasureMilliAmps + AMPS_NOISE_LIMIT < 0;
return latest_milliamps_filtered + AMPS_NOISE_LIMIT < 0;
}

/** Amps_GetReading
* Measures the electrical current from the Ampere minion board
* @param raw if true, return raw value. If false, return filtered value
* use raw value for coulomb counting and filtered for any direct current comparisons
* @return milliamperes value
*/
int32_t Amps_GetReading(void) {
return latestMeasureMilliAmps;
int32_t Amps_GetReading(bool raw) {
return raw ? latest_milliamps_raw : latest_milliamps_filtered;
}

/**
Expand All @@ -106,7 +122,7 @@ void Amps_Calibrate(void) {
RTOS_BPS_DelayTick(1); //TODO: Change this to DelayMs if resolution of ticks is <10ms
Amps_UpdateMeasurements();
#ifndef SIMULATION
while (Amps_GetReading() != 0) {
while (Amps_GetReading(true) != 0) {
LTC2315_Calibrate();
RTOS_BPS_DelayTick(1);
Amps_UpdateMeasurements();
Expand Down
2 changes: 1 addition & 1 deletion Apps/Src/FaultState.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ void EnterFaultState() {
CANbus_SendMsg_FaultState(BPS_CONTACTOR_STATE, payload);

//Send Current Readings
payload.data.w = Amps_GetReading();
payload.data.w = Amps_GetReading(false);
CANbus_SendMsg_FaultState(CURRENT_DATA, payload);

//Send Voltage Readings
Expand Down
2 changes: 1 addition & 1 deletion Apps/Src/Voltage.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ void Voltage_UpdateMeasurements(void){
#else
// package raw voltage values into single array
for(uint8_t i = 0; i < NUM_BATTERY_MODULES; i++){
volt_med_filt[i] = Simulator_getVoltage(i);
volt_med_filt_in[i] = Simulator_getVoltage(i);
}
#endif
// run median filter
Expand Down
2 changes: 1 addition & 1 deletion BSP/Simulator/Data/ManualTests/cantest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30,
Expand Down
16 changes: 8 additions & 8 deletions BSP/Simulator/Data/ManualTests/critical_overcurrent.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 75001,
"charge": 50000000
Expand All @@ -17,10 +17,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -30,10 +30,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -43,10 +43,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand Down
16 changes: 8 additions & 8 deletions BSP/Simulator/Data/ManualTests/critical_overtemp_discharging.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
46, 1 ,2, 3, 4, 5, 61000, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
46, 1 ,2, 3, 4, 5, 61000, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -17,10 +17,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -30,10 +30,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -43,10 +43,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand Down
16 changes: 8 additions & 8 deletions BSP/Simulator/Data/ManualTests/critical_overvolt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 41111, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 41111, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -17,10 +17,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -30,10 +30,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -43,10 +43,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand Down
16 changes: 8 additions & 8 deletions BSP/Simulator/Data/ManualTests/critical_undervolt.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 24999, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 24999, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -17,10 +17,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -30,10 +30,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand All @@ -43,10 +43,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000,37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000, 37000
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand Down
4 changes: 2 additions & 2 deletions BSP/Simulator/Data/ManualTests/footest.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
"adcHigh": 0,
"adcLow": 0,
"voltages": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"temperatures": [
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31
0, 1 ,2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30
],
"current": 1000,
"charge": 50000000
Expand Down
Loading

0 comments on commit a11181b

Please sign in to comment.