kelvin
/
grblHAL-myversion
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Switched OpenPNP to submodule

This commit is contained in:
Terje Io 2021-05-09 19:09:53 +02:00
parent 6c3c5dbfd8
commit a5f0da3b9b
3 changed files with 3 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -28,3 +28,6 @@
[submodule "grblHAL_Teensy4/src/plasma"]
path = grblHAL_Teensy4/src/plasma
url = https://github.com/grblHAL/Plugin_plasma
[submodule "grblHAL_Teensy4/src/openpnp"]
path = grblHAL_Teensy4/src/openpnp
url = https://github.com/grblHAL/Plugin_OpenPNP

186
grblHAL_Teensy4/src/openpnp/openpnp.c
View File

@ -1,186 +0,0 @@
/*
openpnp.c - plugin for for OpenPNP required M-codes
Part of grblHAL
Copyright (c) 2021 Terje Io
Grbl 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 3 of the License, or
(at your option) any later version.
Grbl 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 Grbl. If not, see <http://www.gnu.org/licenses/>.
*/
#include "driver.h"
#if OPENPNP_ENABLE
#include <string.h>
#include "grbl/hal.h"
#include "grbl/protocol.h"
static user_mcode_ptrs_t user_mcode;
static on_report_options_ptr on_report_options;
static user_mcode_t userMCodeCheck (user_mcode_t mcode)
{
return (uint32_t)mcode == 42 || (uint32_t)mcode == 114 || (uint32_t)mcode == 115 || (uint32_t)mcode == 204 || mcode == (uint32_t)400
? mcode
: (user_mcode.check ? user_mcode.check(mcode) : UserMCode_Ignore);
}
static status_code_t userMCodeValidate (parser_block_t *gc_block, parameter_words_t *value_words)
{
status_code_t state = Status_GcodeValueWordMissing;
switch((uint32_t)gc_block->user_mcode) {
case 42:
if((*value_words).p && (*value_words).s) {
if((*value_words).p && isnan(gc_block->values.p))
state = Status_BadNumberFormat;
if((*value_words).s && isnan(gc_block->values.s))
state = Status_BadNumberFormat;
if(state != Status_BadNumberFormat) {
if(gc_block->values.p <= 255.0f && (uint8_t)gc_block->values.p < hal.port.num_digital_out) {
(*value_words).p = (*value_words).s = Off;
state = Status_OK;
} else
state = Status_InvalidStatement;
}
}
break;
case 114:
(*value_words).d = Off;
// check if d value is 0 or 1?
state = Status_OK;
break;
case 204:
if((*value_words).p && isnan(gc_block->values.p))
state = Status_BadNumberFormat;
if((*value_words).r && isnan(gc_block->values.r))
state = Status_BadNumberFormat;
if((*value_words).s && isnan(gc_block->values.s))
state = Status_BadNumberFormat;
if(state != Status_BadNumberFormat) {
(*value_words).p = (*value_words).r = (*value_words).s = (*value_words).t = Off;
// TODO: add validation
state = Status_OK;
}
break;
case 115:
case 400:
state = Status_OK;
break;
default:
state = Status_Unhandled;
break;
}
return state == Status_Unhandled && user_mcode.validate ? user_mcode.validate(gc_block, value_words) : state;
}
static void report_position (void)
{
uint_fast8_t idx;
int32_t current_position[N_AXIS];
float print_position[N_AXIS];
char buf[(STRLEN_COORDVALUE + 4) * N_AXIS];
memcpy(current_position, sys.position, sizeof(sys.position));
system_convert_array_steps_to_mpos(print_position, current_position);
*buf = '\0';
for (idx = 0; idx < N_AXIS; idx++) {
print_position[idx] -= gc_get_offset(idx);
strcat(buf, axis_letter[idx]);
strcat(buf, ":");
strcat(buf, ftoa(print_position[idx], N_DECIMAL_COORDVALUE_MM)); // always mm and 4 decimals?
strcat(buf, idx == N_AXIS - 1 ? ASCII_EOL : " ");
}
hal.stream.write(buf);
}
static void userMCodeExecute (uint_fast16_t state, parser_block_t *gc_block)
{
bool handled = true;
if (state != STATE_CHECK_MODE)
switch((uint32_t)gc_block->user_mcode) {
case 42:
hal.port.digital_out(gc_block->values.p, gc_block->values.s != 0.0f);
break;
case 114:
report_position();
break;
case 115:
hal.stream.write("FIRMWARE_NAME:grblHAL ");
hal.stream.write("FIRMWARE_URL:https%3A//github.com/grblHAL ");
hal.stream.write("FIRMWARE_VERSION:" GRBL_VERSION " ");
hal.stream.write("FIRMWARE_BUILD:" GRBL_VERSION_BUILD ASCII_EOL);
break;
case 204:
protocol_buffer_synchronize();
// TODO: set acceleration - needs core modification
break;
case 400:
protocol_buffer_synchronize();
break;
default:
handled = false;
break;
}
if(!handled && user_mcode.execute)
user_mcode.execute(state, gc_block);
}
static void onReportOptions (bool newopt)
{
on_report_options(newopt);
if(!newopt)
hal.stream.write("[PLUGIN:OpenPNP v0.01]" ASCII_EOL);
}
void openpnp_init (void)
{
memcpy(&user_mcode, &hal.user_mcode, sizeof(user_mcode_ptrs_t));
hal.user_mcode.check = userMCodeCheck;
hal.user_mcode.validate = userMCodeValidate;
hal.user_mcode.execute = userMCodeExecute;
on_report_options = grbl.on_report_options;
grbl.on_report_options = onReportOptions;
}
#endif

29
grblHAL_Teensy4/src/openpnp/openpnp.h
View File

@ -1,29 +0,0 @@
/*
openpnp.h - plugin for for OpenPNP required M-codes
Part of grblHAL
Copyright (c) 2021 Terje Io
Grbl 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 3 of the License, or
(at your option) any later version.
Grbl 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 Grbl. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef _OPENPNP_H_
#define _OPENPNP_H_
void openpnp_init (void);
#endif