aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-03-14 00:43:59 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-03-14 00:43:59 +0000
commit8dc38b0158d188849a417d9dc573c66bc9eed1f9 (patch)
tree4c0dd708edd2069325a49db061e4743262ea180d
parente798ee1ac24fd5f2f272360be28faef4cf39f079 (diff)
downloadverteco-1.4.tar.gz
modbuslog: Fix bitshiftingv1.4
Was not working correctly with Digirail 4C
-rw-r--r--src/modbuslog.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/src/modbuslog.c b/src/modbuslog.c
index 9ef6f49..b310cc7 100644
--- a/src/modbuslog.c
+++ b/src/modbuslog.c
@@ -311,10 +311,7 @@ int main(int argc, char *argv[]) {
}
// bitshifting magic
- switch (numregisters) {
- case 1:
- registervalue = byte[0];
- break;
+ switch (numregisters*2) {
case 2:
registervalue = ((byte[0]) << 8) + byte[1];
break;
@@ -323,7 +320,7 @@ int main(int argc, char *argv[]) {
+ ((byte[2]) << 8) + byte[3];
break;
default:
- registervalue = byte[0];
+ registervalue = ((byte[0]) << 8) + byte[1];
break;
}
ve clock skew (and some typos)mzuther4-10/+10 2011-01-23timer.c: fixed clock skew detectionmzuther1-26/+46 2011-01-23timer.c: skip intermediate timer intervalsmzuther2-16/+46 2011-01-05fix for a bug introduced in the DE-LD021 drivermichael1-3/+3 2011-01-04indentationmichael2-3/+3 2011-01-04support for Sure Electronics DE-LD021 by Natanael Olaizmichael1-10/+8 2011-01-02driver for EFN LED modules by Tilman Glötznermichael9-21/+469 2010-11-28commented, corrected and beautified both timer and timer group codemzuther11-197/+511 2010-11-27finished commenting the timer codemzuther2-46/+138 2010-11-20started commenting the timer codemzuther5-52/+170 2010-11-19Added brightness support for GLCD2USBharbaum5-28/+8014