From 882643c1377fb19a3f77dcb6ab250bc3a27dbb08 Mon Sep 17 00:00:00 2001 From: Jonathan McCrohan Date: Mon, 14 Nov 2011 01:09:14 +0000 Subject: Corrected byte readings. --- modbuslog.c | 41 +++++++++++++++++++++++++++++++---------- modbuslog.cfg | 46 +++++++++++++++++++++++++++++++++++++++------- 2 files changed, 70 insertions(+), 17 deletions(-) diff --git a/modbuslog.c b/modbuslog.c index f9c85e4..c2b34b7 100644 --- a/modbuslog.c +++ b/modbuslog.c @@ -18,7 +18,6 @@ */ // gcc modbuslog.c -o modbuslog `pkg-config --libs --cflags libmodbus libconfig` - #include #include #include @@ -116,7 +115,8 @@ int main(int argc, char *argv[]) { } modbus_t *ctx; - uint16_t tab_reg[64]; + uint16_t tab_reg[4]; + uint8_t byte[8]; int rc; int i; @@ -131,16 +131,16 @@ int main(int argc, char *argv[]) { //int unixtime = (int) t; //printf("%d\n", unixtime); - config_setting_t *registers; + config_setting_t *readings; - registers = config_lookup(&cfg, "register"); + readings = config_lookup(&cfg, "reading"); - unsigned int num_registers = config_setting_length(registers); + unsigned int num_readings = config_setting_length(readings); int i; - for (i = 0; i < num_registers; ++i) { + for (i = 0; i < num_readings; ++i) { config_setting_t *register_element = config_setting_get_elem( - registers, i); + readings, i); int slaveid; config_setting_lookup_int(register_element, "slaveid", &slaveid); int intervalvalue; @@ -201,6 +201,10 @@ int main(int argc, char *argv[]) { numregisters, tab_reg); } + //MODBUS_GET_HIGH_BYTE(data); + //MODBUS_GET_LOW_BYTE(data); + //MODBUS_SET_INT16_TO_INT8(tab_int8, index, value); + //_YYYY_MM_DD_HH_MM_SS.log time_t unixtime_day = ((((int) t) / 86400 * 86400) + 86400); @@ -229,11 +233,28 @@ int main(int argc, char *argv[]) { FILE *filehandle = fopen(filename, "a+"); - uint16_t registervalue = 0; + int registervalue = 0; int p; - for (p = 0; p < numregisters; p = p + 2) { - registervalue += tab_reg[i] + tab_reg[i + 1]; + for (p = 0; p < numregisters; p++) { + MODBUS_SET_INT16_TO_INT8(byte, p * 2, tab_reg[p]); + //registervalue += tab_reg[i] + tab_reg[i + 1]; + } + + switch (numregisters) { + case 1: + registervalue = byte[0]; + break; + case 2: + registervalue = ((byte[0]) << 8) + byte[1]; + break; + case 4: + registervalue = ((byte[0]) << 24) + ((byte[1]) << 16) + + ((byte[2]) << 8) + byte[3]; + break; + default: + registervalue = byte[0]; + break; } struct tm utc = *gmtime(&unixtime_min); diff --git a/modbuslog.cfg b/modbuslog.cfg index 778b6f4..2451b3f 100644 --- a/modbuslog.cfg +++ b/modbuslog.cfg @@ -3,14 +3,14 @@ cfg_version = 0.99; modbus = { - device = "/dev/ttyUSB1"; + device = "/dev/ttyUSB2"; baud = 19200; data_bits = 8; parity = "E" stop_bits = 1; }; -register = ( +reading= ( { slaveid = 1; registertype = 4; @@ -22,17 +22,49 @@ register = ( { slaveid = 1; registertype = 4; - startaddress = 8; - numregisters = 4; + startaddress = 2; + numregisters = 2; intervalvalue = 1; intervalunit = "m"; }, { slaveid = 1; registertype = 4; - startaddress = 13; - numregisters = 1; - intervalvalue = 2; + startaddress = 4; + numregisters = 2; + intervalvalue = 1; + intervalunit = "m"; + }, + { + slaveid = 1; + registertype = 4; + startaddress = 6; + numregisters = 2; + intervalvalue = 1; + intervalunit = "m"; + }, + { + slaveid = 1; + registertype = 4; + startaddress = 8; + numregisters = 2; + intervalvalue = 1; + intervalunit = "m"; + }, + { + slaveid = 1; + registertype = 4; + startaddress = 10; + numregisters = 2; + intervalvalue = 1; + intervalunit = "m"; + }, + { + slaveid = 1; + registertype = 4; + startaddress = 14; + numregisters = 2; + intervalvalue = 1; intervalunit = "m"; } ); -- cgit v1.2.3 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 
/* $Id: drv_FW8888.c 1153 2011-07-27 05:12:30Z michael $
 * $URL: https://ssl.bulix.org/svn/lcd4linux/trunk/drv_FW8888.c $
 *
 * driver for Allnet FW8888 display
 *
 * Copyright (C) 2005 Michael Reinelt <michael@reinelt.co.at>
 * Copyright (C) 2005, 2006, 2007 The LCD4Linux Team <lcd4linux-devel@users.sourceforge.net>
 * Copyright (C) 2010 Linum Software GmbH <support@linum.com>
 *
 * This file is part of LCD4Linux.
 *
 * LCD4Linux is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License as published by
 * the Free Software Foundation; either version 2, or (at your option)
 * any later version.
 *
 * LCD4Linux is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 *
 */

/* 
 *
 * exported fuctions:
 *
 * struct DRIVER drv_FW8888
 *
 */

#include "config.h"

#include <stdlib.h>
#include <stdio.h>
#include <unistd.h>
#include <string.h>
#include <errno.h>

#include "debug.h"
#include "cfg.h"
#include "qprintf.h"
#include "udelay.h"
#include "plugin.h"
#include "widget.h"
#include "widget_text.h"
#include "widget_icon.h"
#include "widget_bar.h"
#include "drv.h"

/* text mode display? */
#include "drv_generic_text.h"

/* serial port? */
#include "drv_generic_serial.h"

static char Name[] = "FW8888";


/****************************************/
/***  hardware dependant functions    ***/
/****************************************/

static int drv_FW8888_open(const char *section)
{
    /* open serial port */
    /* don't mind about device, speed and stuff, this function will take care of */

    if (drv_generic_serial_open(section, Name, 0) < 0)
	return -1;

    return 0;
}


static int drv_FW8888_close(void)
{
    /* close whatever port you've opened */
    drv_generic_serial_close();

    return 0;
}


static void drv_FW8888_send_cmd(const unsigned int cmd)
{
    char cmd_str[2];

    cmd_str[0] = 0x10;
    cmd_str[1] = cmd;
    drv_generic_serial_write(cmd_str, 2);
}


static void drv_FW8888_send_text(const char *text, const unsigned int len)
{
    unsigned int i;
    char cmd_str[2];

    cmd_str[0] = 0x12;

    for (i = 0; i < len; i++) {
	cmd_str[1] = text[i];
	drv_generic_serial_write(cmd_str, 2);
    }
}

/* text mode displays only */
static void drv_FW8888_clear(void)
{
    drv_FW8888_send_cmd(0x01);
}

static void __attribute__ ((unused)) drv_FW8888_home(void)
{
    drv_FW8888_send_cmd(0x02);
}

static void __attribute__ ((unused)) drv_FW8888_display_off(void)
{
    drv_FW8888_send_cmd(0x08);
}

static void __attribute__ ((unused)) drv_FW8888_display_on_cursor_off(void)
{
    drv_FW8888_send_cmd(0x0C);
}

static void __attribute__ ((unused)) drv_FW8888_display_on_cursor_on(void)
{
    drv_FW8888_send_cmd(0x0E);
}

static void __attribute__ ((unused)) drv_FW8888_backlight_off(void)
{
    drv_FW8888_send_cmd(0x38);
}

static void __attribute__ ((unused)) drv_FW8888_backlight_on(void)
{
    drv_FW8888_send_cmd(0x39);
}

static void drv_FW8888_set_cursor(int row, int col)
{
    int pos;
    switch (row) {
    case 0:
	pos = 0x80 + col;
	break;
    case 1:
	pos = 0xC0 + col;
	break;
    default:
	error("%s: invalid row(%d) or col(%d)", Name, row, col);
	return;
    }
    drv_FW8888_send_cmd(pos);
}


/* text mode displays only */
static void drv_FW8888_write(const int row, const int col, const char *data, int len)
{
    /* do the cursor positioning here */
    drv_FW8888_set_cursor(row, col);

    /* send string to the display */
    drv_FW8888_send_text(data, len);
}


/* start text mode display */
static int drv_FW8888_start(const char *section)
{
    /* display preferences */
    XRES = 5;			/* pixel width of one char  */
    YRES = 8;			/* pixel height of one char  */
    CHARS = 0;			/* number of user-defineable characters */
    CHAR0 = 0;			/* ASCII of first user-defineable char */
    DROWS = 2;
    DCOLS = 16;

    GOTO_COST = -1;		/* number of bytes a goto command requires */

    /* open communication with the display */
    if (drv_FW8888_open(section) < 0) {
	return -1;
    }

    drv_FW8888_clear();		/* clear display */

    return 0;
}



/****************************************/
/***            plugins               ***/
/****************************************/

/* none */

/****************************************/
/***        widget callbacks          ***/
/****************************************/


/* using drv_generic_text_draw(W) */
/* using drv_generic_text_icon_draw(W) */
/* using drv_generic_text_bar_draw(W) */
/* using drv_generic_gpio_draw(W) */


/****************************************/
/***        exported functions        ***/
/****************************************/


/* list models */
int drv_FW8888_list(void)
{
    printf("Allnet-FW8888");
    return 0;
}


/* initialize driver & display */
/* use this function for a text display */
int drv_FW8888_init(const char *section, const int quiet)
{
    WIDGET_CLASS wc;
    int ret;

    info("%s: %s", Name, "$Rev: 1153 $");

    /* display preferences */
    XRES = 5;			/* pixel width of one char  */
    YRES = 7;			/* pixel height of one char  */
    CHARS = 0;			/* number of user-defineable characters */
    CHAR0 = 0;			/* ASCII of first user-defineable char */

    /* real worker functions */
    drv_generic_text_real_write = drv_FW8888_write;

    /* start display */
    if ((ret = drv_FW8888_start(section)) != 0)
	return ret;

    if (!quiet) {
	char buffer[40];
	qprintf(buffer, sizeof(buffer), "%s %dx%d", Name, DCOLS, DROWS);
	if (drv_generic_text_greet(buffer, "www.linum.com")) {
	    sleep(3);
	    drv_FW8888_clear();
	}
    }

    /* initialize generic text driver */
    if ((ret = drv_generic_text_init(section, Name)) != 0)
	return ret;

    /* register text widget */
    wc = Widget_Text;
    wc.draw = drv_generic_text_draw;
    widget_register(&wc);

    /* register plugins */
    //    AddFunction("LCD::contrast", 1, plugin_contrast);

    return 0;
}


/* close driver & display */
/* use this function for a text display */
int drv_FW8888_quit(const int quiet)
{

    info("%s: shutting down.", Name);

    drv_generic_text_quit();

    /* clear display */
    drv_FW8888_clear();

    /* say goodbye... */
    if (!quiet) {
	drv_generic_text_greet("goodbye!", NULL);
    }

    debug("closing connection");
    drv_FW8888_close();

    return (0);
}


/* use this one for a text display */
DRIVER drv_FW8888 = {
    .name = Name,
    .list = drv_FW8888_list,
    .init = drv_FW8888_init,
    .quit = drv_FW8888_quit,
};