Mirrors_Framework/g2
1
0
Fork 0
mirror of https://github.com/synthetos/g2.git synced 2026-02-06 02:51:54 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added digital inputs and outputs to $$ display

Browse Source
This commit is contained in:
Alden Hart
2016-09-04 14:09:50 -04:00
parent 58498776b1
commit c5b413b981
3 changed files with 25 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
g2core/config_app.cpp
View File

@@ -1094,7 +1094,7 @@ static stat_t _do_inputs(nvObj_t *nv) // print parameters for all input groups
return (STAT_COMPLETE);
}
static stat_t _do_outputs(nvObj_t *nv) // print parameters for all input groups
static stat_t _do_outputs(nvObj_t *nv) // print parameters for all output groups
{
char group[GROUP_LEN];
for (uint8_t i=1; i < D_OUT_CHANNELS+1; i++) {
@@ -1103,21 +1103,28 @@ static stat_t _do_outputs(nvObj_t *nv) // print parameters for all input groups
}
return (STAT_COMPLETE);
}
/*
static stat_t _do_heaters(nvObj_t *nv) // print parameters for all heater groups
{
char group[GROUP_LEN];
for (uint8_t i=1; i < 4; i++) {
sprintf(group, "he%d", i);
_do_group(nv, group);
}
return (STAT_COMPLETE);
}
*/
static stat_t _do_all(nvObj_t *nv) // print all parameters
{
strcpy(nv->token,"sys"); // print system group
get_grp(nv);
nv_print_list(STAT_OK, TEXT_MULTILINE_FORMATTED, JSON_RESPONSE_FORMAT);
_do_motors(nv); // print all motor groups
_do_axes(nv); // print all axis groups
strcpy(nv->token,"p1"); // print PWM group
get_grp(nv);
nv_print_list(STAT_OK, TEXT_MULTILINE_FORMATTED, JSON_RESPONSE_FORMAT);
return (_do_offsets(nv)); // print all offsets
_do_group(nv, (char *)"sys"); // System group
_do_motors(nv);
_do_axes(nv);
_do_inputs(nv);
_do_outputs(nv);
// _do_heaters(nv); // there are no text mode prints for heaters
_do_group(nv, (char *)"p1"); // PWM group
_do_offsets(nv); // coordinate system offsets
return (STAT_OK);
}
/***********************************************************************************

8
g2core/gpio.cpp
View File

@@ -667,12 +667,12 @@ stat_t io_set_output(nvObj_t *nv)
#ifdef __TEXT_MODE
static const char fmt_gpio_mo[] = "[%smo] input mode%15d [0=NO,1=NC,2=disabled]\n";
static const char fmt_gpio_ac[] = "[%sac] input action%13d [0=none,1=stop,2=fast_stop,3=halt,4=alarm,5=shutdown,6=panic,7=reset]\n";
static const char fmt_gpio_fn[] = "[%sfn] input function%11d [0=none,1=limit,2=interlock,3=shutdown]\n";
static const char fmt_gpio_mo[] = "[%smo] input mode%17d [0=NO,1=NC,2=disabled]\n";
static const char fmt_gpio_ac[] = "[%sac] input action%15d [0=none,1=stop,2=fast_stop,3=halt,4=alarm,5=shutdown,6=panic,7=reset]\n";
static const char fmt_gpio_fn[] = "[%sfn] input function%13d [0=none,1=limit,2=interlock,3=shutdown]\n";
static const char fmt_gpio_in[] = "Input %s state: %5d\n";
static const char fmt_gpio_domode[] = "[%smo] output mode%15d [0=active low,1=active high,2=disabled]\n";
static const char fmt_gpio_domode[] = "[%smo] output mode%16d [0=active low,1=active high,2=disabled]\n";
static const char fmt_gpio_out[] = "Output %s state: %5d\n";
static void _print_di(nvObj_t *nv, const char *format)

6
g2core/temperature.h
View File

@@ -29,12 +29,6 @@
#ifndef TEMPERATURE_H_ONCE
#define TEMPERATURE_H_ONCE
/*
* Spindle control structure
*/
/*
* Global Scope Functions
*/