Reorder switch modes as they are in a more consistent order.

breaker27 · Aug 9, 2019 · 45c6070 · 45c6070
1 parent 46cf07e
commit 45c6070
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/firmware/src_common/e2p_powerswitch.h b/firmware/src_common/e2p_powerswitch.h
@@ -117,7 +117,7 @@ static inline uint8_t e2p_powerswitch_get_transceiverwatchdogtimeout(void)
 }
 
 // SwitchMode (EnumValue[8])
-// Description: The mode decides how the optional manual switches are used in combination to the digital pin/port commands to set the relais status. In general, the status according digital pin/port command (CMD) and the switch (SW) can be combined by 'and', 'or' or 'xor'. Additionally the switch can be active open or active close and therefore can be inversed ('not'). 'CMD' and '(not) SW' mean that only the command or switch are considered. The default value is to ignore the optional manual switch.
+// Description: The mode decides how the optional manual switches are used in combination to the digital pin/port commands to set the relais status. In general, the status according digital pin/port command (CMD) and the switch (SW) can be combined by 'and', 'or' or 'xor'. Additionally the switch can be active open or active close and therefore can be inverted ('not'). 'CMD' and '(not) SW' mean that only the command or switch are considered. The default value is to ignore the optional manual switch.
 
 #ifndef _ENUM_SwitchMode
 #define _ENUM_SwitchMode
@@ -126,10 +126,10 @@ typedef enum {
   SWITCHMODE_SW = 1,
   SWITCHMODE_NOT_SW = 2,
   SWITCHMODE_CMD_AND_SW = 3,
-  SWITCHMODE_CMD_OR_SW = 4,
-  SWITCHMODE_CMD_XOR_SW = 5,
-  SWITCHMODE_CMD_AND_NOT_SW = 6,
-  SWITCHMODE_CMD_OR_NOT_SW = 7,
+  SWITCHMODE_CMD_AND_NOT_SW = 4,
+  SWITCHMODE_CMD_OR_SW = 5,
+  SWITCHMODE_CMD_OR_NOT_SW = 6,
+  SWITCHMODE_CMD_XOR_SW = 7,
   SWITCHMODE_CMD_XOR_NOT_SW = 8
 } SwitchModeEnum;
 #endif /* _ENUM_SwitchMode */

diff --git a/tools/shc_e2p_editor/e2p_layout.xml b/tools/shc_e2p_editor/e2p_layout.xml
@@ -661,7 +661,7 @@
 			<Length>8</Length>
 			<EnumValue>
 				<ID>SwitchMode</ID>
-				<Description>The mode decides how the optional manual switches are used in combination to the digital pin/port commands to set the relais status. In general, the status according digital pin/port command (CMD) and the switch (SW) can be combined by 'and', 'or' or 'xor'. Additionally the switch can be active open or active close and therefore can be inversed ('not'). 'CMD' and '(not) SW' mean that only the command or switch are considered. The default value is to ignore the optional manual switch.</Description>
+				<Description>The mode decides how the optional manual switches are used in combination to the digital pin/port commands to set the relais status. In general, the status according digital pin/port command (CMD) and the switch (SW) can be combined by 'and', 'or' or 'xor'. Additionally the switch can be active open or active close and therefore can be inverted ('not'). 'CMD' and '(not) SW' mean that only the command or switch are considered. The default value is to ignore the optional manual switch.</Description>
 				<Bits>8</Bits>
 				<Element>
 					<Value>0</Value>
@@ -681,19 +681,19 @@
 				</Element>
 				<Element>
 					<Value>4</Value>
-					<Name>CMD or SW</Name>
+					<Name>CMD and not SW</Name>
 				</Element>
 				<Element>
 					<Value>5</Value>
-					<Name>CMD xor SW</Name>
+					<Name>CMD or SW</Name>
 				</Element>
 				<Element>
 					<Value>6</Value>
-					<Name>CMD and not SW</Name>
+					<Name>CMD or not SW</Name>
 				</Element>
 				<Element>
 					<Value>7</Value>
-					<Name>CMD or not SW</Name>
+					<Name>CMD xor SW</Name>
 				</Element>
 				<Element>
 					<Value>8</Value>