private/hsb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Started working on next milestone

Browse Source 
- Removed the 6V5 power enable 
- Tweaked the cursor position for preset configuration
- Updated the MenuText header file for translation at Photonis

git-svn-id: https://svn.vbchaos.nl/svn/hsb/trunk@320 05563f52-14a8-4384-a975-3d1654cca0fa
This commit is contained in:
mmi
2017-11-30 13:35:51 +00:00
parent afe3113a97
commit 1415b5c6f2
15 changed files with 177 additions and 498 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
S - Software/0 - HSB MRTS Kathode-MCP/3 - Implementation/0 - Code/hsb-mrts/src/hsb-mrts.c
View File

@@ -43,7 +43,6 @@
#include "Interlock.h"
#include "Logger.h"
#include "PCBA.h"
#include "Power6V5Supply.h"
#include "TeslaGunSafety.h"
#include "Version.h"
@@ -140,13 +139,6 @@ ErrorStatus hsb_enableSafetyWithError(void)
}
}
// if Interlock(s) closed, continue procedure
if (returnValue == SUCCESS)
{
// Power the circuit
returnValue = Power6V5Supply_on();
}
if (returnValue == SUCCESS)
{
_hsb_safetyIsEnabled = true;
@@ -193,13 +185,6 @@ ErrorStatus hsb_enableSafetyWithWarning(void)
}
}
// if Interlock(s) closed, continue procedure
if (returnValue == SUCCESS)
{
// Power the circuit
returnValue = Power6V5Supply_on();
}
if (returnValue == SUCCESS)
{
_hsb_safetyIsEnabled = true;
@@ -239,8 +224,6 @@ ErrorStatus hsb_disableSafety(void)
DAConverter_setOutputVoltage(dacRow2, 0);
DAConverter_setOutputVoltage(dacRow3, 0);
// Un-Power the circuit
Power6V5Supply_off();
if (PCBA_getInstance()->pcba != PCBA_Tesla)
{