Menu
▾
▴
[Emc-commit] emc2/src/hal/utils halcmd.c, 1.97, 1.98 m5i20cfg.c, 1.6, 1.7 meter.c, 1.14, 1.15 scope_disp.c, 1.36, 1.37 scope_files.c, 1.9, 1.10 scope_rt.c, 1.6, 1.7 scope_trig.c, 1.7, 1.8 scope_vert.c, 1.20, 1.21
Modified file emc2/src/hal/utils/halcmd.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/halcmd.c?rev=1.98> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/halcmd.c.diff?r1=1.97;r2=1.98> Branch: HEAD Log: revision 1.98 date: 2006/11/18 03:05:01; author: jmkasunich; state: Exp; lines: +3 -52 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- halcmd.c 2006/11/13 00:10:49 1.97 +++ halcmd.c 2006/11/18 03:05:01 1.98 @@ -1159,10 +1159,6 @@ retval = hal_signal_new(name, HAL_BIT); } else if (strcasecmp(type, "float") == 0) { retval = hal_signal_new(name, HAL_FLOAT); - } else if (strcasecmp(type, "u8") == 0) { - retval = hal_signal_new(name, HAL_U8); - } else if (strcasecmp(type, "s8") == 0) { - retval = hal_signal_new(name, HAL_S8); } else if (strcasecmp(type, "u16") == 0) { retval = hal_signal_new(name, HAL_U32); } else if (strcasecmp(type, "s32") == 0) { @@ -1209,28 +1205,6 @@ *((hal_float_t *) (d_ptr)) = fval; } break; - case HAL_S8: - lval = strtol(value, &cp, 0); - if (((*cp != '\0') && (!isspace(*cp))) || (lval > 127) || (lval < -128)) { - /* invalid chars in string, or outside limits of S8 */ - rtapi_print_msg(RTAPI_MSG_ERR, - "HAL:%d: ERROR: value '%s' invalid for S8\n", linenumber, value); - retval = HAL_INVAL; - } else { - *((hal_s8_t *) (d_ptr)) = lval; - } - break; - case HAL_U8: - ulval = strtoul(value, &cp, 0); - if (((*cp != '\0') && (!isspace(*cp))) || (ulval > 255)) { - /* invalid chars in string, or outside limits of U8 */ - rtapi_print_msg(RTAPI_MSG_ERR, - "HAL:%d: ERROR: value '%s' invalid for U8\n", linenumber, value); - retval = HAL_INVAL; - } else { - *((hal_u8_t *) (d_ptr)) = ulval; - } - break; case HAL_S32: lval = strtol(value, &cp, 0); if ((*cp != '\0') && (!isspace(*cp))) { @@ -2522,12 +2496,6 @@ case HAL_FLOAT: type_str = "float"; break; - case HAL_S8: - type_str = "s8 "; - break; - case HAL_U8: - type_str = "u8 "; - break; case HAL_S32: type_str = "s32 "; break; @@ -2644,15 +2612,6 @@ snprintf(buf, 14, "%12.5e", *((float *) valptr)); value_str = buf; break; - case HAL_S8: - snprintf(buf, 14, " %4d ", *((hal_s8_t *) valptr)); - value_str = buf; - break; - case HAL_U8: - snprintf(buf, 14, " %3u (%02X) ", - *((unsigned char *) valptr), *((hal_u8_t *) valptr)); - value_str = buf; - break; case HAL_S32: snprintf(buf, 14, " %10ld ", (long)*((hal_u32_t *) valptr)); value_str = buf; @@ -2686,14 +2645,6 @@ snprintf(buf, 14, "%e", *((float *) valptr)); value_str = buf; break; - case HAL_S8: - snprintf(buf, 14, "%d", (int)*((hal_s8_t *) valptr)); - value_str = buf; - break; - case HAL_U8: - snprintf(buf, 14, "%u", (int)*((hal_u8_t *) valptr)); - value_str = buf; - break; case HAL_S32: snprintf(buf, 14, "%ld", (long)*((hal_s32_t *) valptr)); value_str = buf; @@ -2993,8 +2944,8 @@ printf(" all - HAL completely unlocked.\n"); } else if (strcmp(command, "newsig") == 0) { printf("newsig signame type\n"); - printf(" Creates a new signal called 'signame'. Type is 'bit',\n"); - printf(" 'float', 'u8', 's8', 'u16', 's16', 'u32', or 's32'.\n"); + printf(" Creates a new signal called 'signame'. Type\n"); + printf(" is 'bit', 'float', 'u32', or 's32'.\n"); } else if (strcmp(command, "delsig") == 0) { printf("delsig signame\n"); printf(" Deletes signal 'signame'. If 'signame is 'all',\n"); Modified file emc2/src/hal/utils/m5i20cfg.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/m5i20cfg.c?rev=1.7> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/m5i20cfg.c.diff?r1=1.6;r2=1.7> Branch: HEAD Log: revision 1.7 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +3 -3 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- m5i20cfg.c 2006/10/31 03:14:32 1.6 +++ m5i20cfg.c 2006/11/18 03:05:02 1.7 @@ -3,11 +3,11 @@ * Copyright (C) 2005 Peter C. Wallace <pcw AT mesanet DOT com> * * $RCSfile: m5i20cfg.c,v $ - * $Author: jepler $ + * $Author: jmkasunich $ * $Locker: $ - * $Revision: 1.6 $ + * $Revision: 1.7 $ * $State: Exp $ - * $Date: 2006/10/31 03:14:32 $ + * $Date: 2006/11/18 03:05:02 $ * ****************************************************************************** * @@ -971,7 +971,7 @@ if(PrintConfig) { - fprintf(OutStr, "\nstatic hal_u8_t\n"); + fprintf(OutStr, "\nstatic unsigned char\n"); fprintf(OutStr, "fpgaConfig[] = {"); } else Modified file emc2/src/hal/utils/meter.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/meter.c?rev=1.15> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/meter.c.diff?r1=1.14;r2=1.15> Branch: HEAD Log: revision 1.15 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -9 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- meter.c 2006/11/13 00:10:49 1.14 +++ meter.c 2006/11/18 03:05:02 1.15 @@ -533,15 +533,6 @@ } value_str = buf; break; - case HAL_S8: - snprintf(buf, 24, "%4d", *((signed char *) valptr)); - value_str = buf; - break; - case HAL_U8: - snprintf(buf, 24, "%3u (0x%02X)", - *((unsigned char *) valptr), *((unsigned char *) valptr)); - value_str = buf; - break; case HAL_S32: snprintf(buf, 24, "%10ld", *((signed long *) valptr)); value_str = buf; Modified file emc2/src/hal/utils/scope_disp.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_disp.c?rev=1.37> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_disp.c.diff?r1=1.36;r2=1.37> Branch: HEAD Log: revision 1.37 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -12 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- scope_disp.c 2006/11/13 00:10:49 1.36 +++ scope_disp.c 2006/11/18 03:05:02 1.37 @@ -552,12 +552,6 @@ case HAL_FLOAT: fy = dptr->d_float; break; - case HAL_S8: - fy = dptr->d_s8; - break; - case HAL_U8: - fy = dptr->d_u8; - break; case HAL_S32: fy = dptr->d_s32; break; @@ -853,12 +847,6 @@ break; case HAL_FLOAT: fy = dptr->d_float; - break; - case HAL_S8: - fy = dptr->d_s8; - break; - case HAL_U8: - fy = dptr->d_u8; break; case HAL_S32: fy = dptr->d_s32; Modified file emc2/src/hal/utils/scope_files.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_files.c?rev=1.10> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_files.c.diff?r1=1.9;r2=1.10> Branch: HEAD Log: revision 1.10 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -6 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- scope_files.c 2006/11/13 00:10:49 1.9 +++ scope_files.c 2006/11/18 03:05:02 1.10 @@ -329,12 +329,6 @@ case HAL_FLOAT: data_value = dptr->d_float; break; - case HAL_S8: - data_value = dptr->d_s8; - break; - case HAL_U8: - data_value = dptr->d_u8; - break; case HAL_S32: data_value = dptr->d_s32; break; Modified file emc2/src/hal/utils/scope_rt.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.c?rev=1.7> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_rt.c.diff?r1=1.6;r2=1.7> Branch: HEAD Log: revision 1.7 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -6 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- scope_rt.c 2006/11/13 00:10:49 1.6 +++ scope_rt.c 2006/11/18 03:05:02 1.7 @@ -343,12 +343,6 @@ } } break; - case HAL_S8: - compare_result = (value->d_s8 > level->d_s8); - break; - case HAL_U8: - compare_result = (value->d_u8 > level->d_u8); - break; case HAL_S32: compare_result = (value->d_s32 > level->d_s32); break; Modified file emc2/src/hal/utils/scope_trig.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_trig.c?rev=1.8> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_trig.c.diff?r1=1.7;r2=1.8> Branch: HEAD Log: revision 1.8 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -18 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- scope_trig.c 2006/11/13 00:10:49 1.7 +++ scope_trig.c 2006/11/18 03:05:02 1.8 @@ -135,24 +135,6 @@ switch (chan->data_type) { case HAL_FLOAT: ctrl_shm->trig_level.d_float = fp_level; - case HAL_S8: - if (fp_level > 127.0) { - fp_level = 127.0; - } - if (fp_level < -128.0) { - fp_level = -128.0; - } - ctrl_shm->trig_level.d_s8 = fp_level; - break; - case HAL_U8: - if (fp_level > 255.0) { - fp_level = 255.0; - } - if (fp_level < 0.0) { - fp_level = 0.0; - } - ctrl_shm->trig_level.d_u8 = fp_level; - break; case HAL_S32: if (fp_level > 2147483647.0) { fp_level = 2147483647.0; Modified file emc2/src/hal/utils/scope_vert.c Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_vert.c?rev=1.21> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/hal/utils/scope_vert.c.diff?r1=1.20;r2=1.21> Branch: HEAD Log: revision 1.21 date: 2006/11/18 03:05:02; author: jmkasunich; state: Exp; lines: +0 -10 removed all remaining instances of hal_u8 and hal_s8 - HAL now supports 4 types: float for analog data, bit for boolean data, s32 and u32 for quantized data --- scope_vert.c 2006/11/13 00:10:49 1.20 +++ scope_vert.c 2006/11/18 03:05:02 1.21 @@ -252,16 +252,6 @@ chan->min_index = -36; chan->max_index = 36; break; - case HAL_S8: - chan->data_len = sizeof(hal_s8_t); - chan->min_index = -2; - chan->max_index = 8; - break; - case HAL_U8: - chan->data_len = sizeof(hal_u8_t); - chan->min_index = -2; - chan->max_index = 8; - break; case HAL_S32: chan->data_len = sizeof(hal_s32_t); chan->min_index = -2; |