/branches/extra_encoders_rework merged

This commit is contained in:
maxim.karban@gmail.com
2012-05-21 19:08:21 +00:00
parent 8a62c195d2
commit 0682da0ff1
12 changed files with 105 additions and 60 deletions
+2 -2
View File
@@ -32,7 +32,7 @@
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "SVPK123abcde"
#define TR_RETA123 "SVPK123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "SVPK123ab"
#endif //EXTRA_ROTARY_ENCODERS
@@ -186,7 +186,7 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
+2 -2
View File
@@ -32,7 +32,7 @@
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RETA123abcde"
#define TR_RETA123 "RETA123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RETA123ab"
#endif //EXTRA_ROTARY_ENCODERS
@@ -186,7 +186,7 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
+2 -2
View File
@@ -32,7 +32,7 @@
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RETA123abcde"
#define TR_RETA123 "RETA123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RETA123ab"
#endif //EXTRA_ROTARY_ENCODERS
@@ -186,7 +186,7 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
+2 -2
View File
@@ -32,7 +32,7 @@
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RETA123abcde"
#define TR_RETA123 "RETA123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RETA123ab"
#endif //EXTRA_ROTARY_ENCODERS
@@ -189,7 +189,7 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
+2 -2
View File
@@ -32,7 +32,7 @@
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RETA123abcde"
#define TR_RETA123 "RETA123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RETA123ab"
#endif //EXTRA_ROTARY_ENCODERS
@@ -186,7 +186,7 @@
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
+14 -14
View File
@@ -29,13 +29,13 @@
#define LEN_VTRIMINC "\006"
#define TR_VTRIMINC "Exp ""xFin ""Fin ""Medel.""Grov "
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RHGS123abcde"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RHGS123ab"
#endif //EXTRA_ROTARY_ENCODERS
#define LEN_RETA123 "\001"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_RETA123 "RHGS123abcd"
#else //EXTRA_ROTARY_ENCODERS
#define TR_RETA123 "RHGS123ab"
#endif //EXTRA_ROTARY_ENCODERS
#else
#define TR_RETA123 "RHGS123"
#endif
@@ -186,13 +186,13 @@
#define TR_VSWITCHES "GAS""ROD""H\205J""ID0""ID1""ID2""SKE""LAN""TRN""BR1""BR2""BR3""BR4""BR5""BR6""BR7""BR8""BR9""BRA""BRB""BRC"
#endif
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd ""REe "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
#define LEN_VSRCRAW "\004"
#if defined(PCBV4)
#if defined(EXTRA_ROTARY_ENCODERS)
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb ""REc ""REd "
#else
#define TR_ROTARY_ENCODERS_VSRCRAW "REa ""REb "
#endif
#else
#define TR_ROTARY_ENCODERS_VSRCRAW
#endif