summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuillaume Knispel <gknispel@avencall.com>2012-07-04 16:06:53 +0200
committerGuillaume Knispel <gknispel@avencall.com>2012-07-04 16:06:53 +0200
commitddc29bf2c45405aa6bfdf4353fea3d9f39a846d2 (patch)
tree4e3dd36259957b08f6bf7a838a40f0cef85fe21a
parentfce3d70c8d7ae28b8b6e4c54479d191bad9e03ae (diff)
bugfix: add volatile qualifiers
-rw-r--r--PwrSeq.ewp22
-rwxr-xr-x[-rw-r--r--]main.c16
2 files changed, 19 insertions, 19 deletions
diff --git a/PwrSeq.ewp b/PwrSeq.ewp
index 877db5d..db430ee 100644
--- a/PwrSeq.ewp
+++ b/PwrSeq.ewp
@@ -54,11 +54,11 @@
</option>
<option>
<name>RTConfigPath</name>
- <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xsfn.h</state>
+ <state>$TOOLKIT_DIR$\LIB\DLIB\dl430fn.h</state>
</option>
<option>
<name>RTLibraryPath</name>
- <state>$TOOLKIT_DIR$\LIB\DLIB\dl430xsfn.r43</state>
+ <state>$TOOLKIT_DIR$\LIB\DLIB\dl430fn.r43</state>
</option>
<option>
<name>Input variant</name>
@@ -229,7 +229,7 @@
<option>
<name>CCAllowList</name>
<version>1</version>
- <state>00000</state>
+ <state>11111</state>
</option>
<option>
<name>CCObjUseModuleName</name>
@@ -345,7 +345,7 @@
</option>
<option>
<name>CCOptLevel</name>
- <state>1</state>
+ <state>3</state>
</option>
<option>
<name>CCOptStrategy</name>
@@ -354,7 +354,7 @@
</option>
<option>
<name>CCOptLevelSlave</name>
- <state>1</state>
+ <state>3</state>
</option>
<option>
<name>CInput</name>
@@ -582,7 +582,7 @@
</option>
<option>
<name>OutputFile</name>
- <state></state>
+ <state>$FILE_BNAME$.r43</state>
</option>
<option>
<name>AMultibyteSupport</name>
@@ -662,7 +662,7 @@
</option>
<option>
<name>SecondaryOutputFile</name>
- <state></state>
+ <state>(None for the selected format)</state>
</option>
<option>
<name>XDefines</name>
@@ -702,7 +702,7 @@
</option>
<option>
<name>XIncludes</name>
- <state>###Uninitialized###</state>
+ <state>$TOOLKIT_DIR$\LIB\</state>
</option>
<option>
<name>ModuleStatus</name>
@@ -714,7 +714,7 @@
</option>
<option>
<name>XclFile</name>
- <state>lnk0t.xcl</state>
+ <state>$TOOLKIT_DIR$\CONFIG\lnk430F2274.xcl</state>
</option>
<option>
<name>XclFileSlave</name>
@@ -802,7 +802,7 @@
</option>
<option>
<name>xcProgramEntryLabel</name>
- <state></state>
+ <state>__program_start</state>
</option>
<option>
<name>DebugInformation</name>
@@ -842,7 +842,7 @@
</option>
<option>
<name>ExtraOutputFile</name>
- <state></state>
+ <state>PwrSeq.a43</state>
</option>
<option>
<name>ExtraOutputFormat</name>
diff --git a/main.c b/main.c
index c12677c..bf9b01c 100644..100755
--- a/main.c
+++ b/main.c
@@ -20,18 +20,18 @@
*/
#include "main.h"
-U16 Timer1, TAVector;
-U16 state;
-U16 SW1State, SW2State;
+volatile U16 Timer1, TAVector;
+volatile U16 state;
+volatile U16 SW1State, SW2State;
#ifdef CAN_WAIT_TENSION
//has to be coded on real board
-U8 bV1P0 = true;
-U8 bV1P2 = true;
-U8 bV1P8_DDR = true;
-U8 bV2P5 = true;
-U8 bVCC3 = true;
+volatile U8 bV1P0 = true;
+volatile U8 bV1P2 = true;
+volatile U8 bV1P8_DDR = true;
+volatile U8 bV2P5 = true;
+volatile U8 bVCC3 = true;
#define TENSION_EXPIRED (SW1State || Timer1 == 0)
#define TENSION_WAIT(t) (t)