From e5df88dda175eaf676f11e57c94a5d477211306f Mon Sep 17 00:00:00 2001 From: Reegan McAllister Date: Fri, 1 Jul 2016 11:50:12 -0600 Subject: [PATCH 1/2] Changed valve pin --- FCC-code_V2/FCCV2/.vs/FCCV2/v14/.atsuo | Bin 180224 -> 195072 bytes FCC-code_V2/FCCV2/FCCV2/Debug/FCCV2.srec | 4109 +++++++++-------- .../FCCV2/FCCV2/src/FuelCell_DataLogging.c | 10 +- FCC-code_V2/FCCV2/FCCV2/src/digital_IO_defs.h | 2 +- FC_USART_CAN_BRIDGE/FC_USART_CAN_BRIDGE.ino | 28 +- 5 files changed, 2079 insertions(+), 2070 deletions(-) diff --git a/FCC-code_V2/FCCV2/.vs/FCCV2/v14/.atsuo b/FCC-code_V2/FCCV2/.vs/FCCV2/v14/.atsuo index 9ea3b865dfde9eaaec197881d0a43c92ddab36f4..d4c570a51417fca9ee13b51faa2a21b14251f3ba 100644 GIT binary patch delta 10472 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 DS?&@3 delta 5610 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 caIzZPibu3R^&b+gEy4%r Date: Sat, 2 Jul 2016 21:23:14 -0600 Subject: [PATCH 2/2] Fixed a comment --- FCC-code_V2/FCCV2/FCCV2/src/FC_error_codes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/FCC-code_V2/FCCV2/FCCV2/src/FC_error_codes.h b/FCC-code_V2/FCCV2/FCCV2/src/FC_error_codes.h index 4320882..c3592cf 100644 --- a/FCC-code_V2/FCCV2/FCCV2/src/FC_error_codes.h +++ b/FCC-code_V2/FCCV2/FCCV2/src/FC_error_codes.h @@ -41,7 +41,7 @@ #define HIGH_TEMP_THRES 348000 // 75C #define FC_HIGH_PRES_THRES 10000 //10 PSI #define FC_LOW_PRES_THRES 2000 //2.5 PSI -#define OVER_CUR_THRES 75000 //78A +#define OVER_CUR_THRES 75000 //75A #define UNDER_CUR_THRES 0 //only possible if sensor is disconnected if in start purge #define OVER_VOLT_THRES 50600 //50.6V #define LOW_VOLT_THRES 15000 //capacitors are drained too much 15V