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

Add support for xio_flash_files and added xio_send_file() to send them.

Browse Source 
This is to run small chunks of gcode from flash.
This commit is contained in:
Rob Giseburt
2017-01-10 16:50:12 -06:00
parent bbc4c74ce0
commit 00db53f4c1
4 changed files with 261 additions and 108 deletions
Download Patch File Download Diff File Expand all files Collapse all files
g2core/board/printrboardg2/board_xio.cpp
+5 -1
View File
@@ -75,7 +75,9 @@ void board_hardware_init(void) // called 1st
}
void board_xio_init(void) // called later than board_hardware_init (there are thing in between)
auto startup_file = make_xio_flash_file("");
void board_xio_init(void) // called later than board_hardware_init (there are things in between)
{
// Init SPI
#if XIO_HAS_SPI
@@ -86,4 +88,6 @@ void board_xio_init(void) // called later than board_hardware_init (there are th
#if XIO_HAS_UART
Serial.init();
#endif
xio_send_file(startup_file);
}
g2core/board/printrboardg2/board_xio.h
+1
View File
@@ -30,6 +30,7 @@
#define board_xio_h
#include "settings.h"
#include "xio.h"
//******** USB ********
#if XIO_HAS_USB
g2core/xio.cpp
+186 -106
View File
@@ -33,7 +33,6 @@
#include "g2core.h"
#include "config.h"
#include "hardware.h"
#include "canonical_machine.h" // needs cm_has_hold()
#include "xio.h"
#include "report.h"
#include "controller.h"
@@ -851,6 +850,20 @@ struct LineRXBuffer : RXBuffer<_size, owner_type, char> {
}; // LineRXBuffer
/* xioDeviceWrapper<typename Device>
* Implements a xioDeviceWrapperBase around a Device. The Device must implement:
* For RXBuffer:
* const base_type* getRXTransferPosition()
* void setRXTransferDoneCallback(std::function<void()> &&callback)
* bool startRXTransfer(char *&buffer, uint16_t length)
* For TXBuffer:
* const base_type* getTXTransferPosition()
* void setTXTransferDoneCallback(std::function<void()> &&callback)
* bool startTXTransfer(char *&buffer, uint16_t length)
* For xioDeviceWrapper:
* void setConnectionCallback(std::function<void(bool)> &&callback)
*/
template<typename Device>
struct xioDeviceWrapper : xioDeviceWrapperBase { // describes a device for reading and writing
Device _dev;
@@ -875,14 +888,6 @@ struct xioDeviceWrapper : xioDeviceWrapperBase { // describes a device for re
_tx_buffer.init();
};
virtual int16_t readchar() final {
if (!isConnected()) {
return -1;
}
return _rx_buffer.read();
// return _dev->readByte(); // readByte calls the USB endpoint's read function
};
void flush() final {
_tx_buffer.flush();
return _dev->flush();
@@ -916,113 +921,183 @@ struct xioDeviceWrapper : xioDeviceWrapperBase { // describes a device for re
};
void connectedStateChanged(bool connected) {
if (connected) {
if (isNotConnected()) {
// USB0 or UART has just connected
// If one of the devices isAlwaysDataAndCtrl():
// We treat *it* as if it's the only device connected.
// We treat *the other devices* as if it's NOT connected.
// Case 1: This is the first channel to connect -
// set it as CTRL+DATA+PRIMARY channel
// mark all isMutedAsSecondary() as MUTED, and call controller_set_muted(true) if needed
// Case 2: This is the second (or later) channel to connect -
// Case 2a: This device is !isMuteAsSecondary()
// set it as DATA channel, remove DATA flag from PRIMARY channel
// mark all isMutedAsSecondary() as MUTED, and call controller_set_muted(true) if needed
// ... inactive channels are counted as closed
// Case 2b: This devices isMuteAsSecondary(), and needs to be "muted."
// set it as a MUTED channel, call controller_set_connected(true)
// then controller_set_muted(true)
if (connected) {
if (isNotConnected()) {
// USB0 or UART has just connected
// If one of the devices isAlwaysDataAndCtrl():
// We treat *it* as if it's the only device connected.
// We treat *the other devices* as if it's NOT connected.
// Case 1: This is the first channel to connect -
// set it as CTRL+DATA+PRIMARY channel
// mark all isMutedAsSecondary() as MUTED, and call controller_set_muted(true) if needed
// Case 2: This is the second (or later) channel to connect -
// Case 2a: This device is !isMuteAsSecondary()
// set it as DATA channel, remove DATA flag from PRIMARY channel
// mark all isMutedAsSecondary() as MUTED, and call controller_set_muted(true) if needed
// ... inactive channels are counted as closed
// Case 2b: This devices isMuteAsSecondary(), and needs to be "muted."
// set it as a MUTED channel, call controller_set_connected(true)
// then controller_set_muted(true)
setAsConnectedAndReady();
setAsConnectedAndReady();
if (isAlwaysDataAndCtrl()) {
// Case 1 (ignoring others)
setActive();
controller_set_connected(true);
if (isAlwaysDataAndCtrl()) {
// Case 1 (ignoring others)
setActive();
controller_set_connected(true);
// Case 2b (not ignoring others)
if (isMuteAsSecondary() && xio.others_connected(this)) {
controller_set_muted(true); // something was muted
}
return;
// Case 2b (not ignoring others)
if (isMuteAsSecondary() && xio.others_connected(this)) {
controller_set_muted(true); // something was muted
}
if(!xio.others_connected(this)) {
// Case 1
setAsPrimaryActiveDualRole();
// report that there is now have a connection (only for the first one)
controller_set_connected(true);
// make sure secondary channels (that don't show up in isConnected) are muted
if (xio.check_muted_secondary_channels()) {
controller_set_muted(true); // something was muted
}
}
else if (isMuteAsSecondary()) {
// Case 2b
setAsMuted();
controller_set_connected(true); // it DID just just get connected
controller_set_muted(true); // but it muted it too
}
else {
// Case 2a
xio.remove_data_from_primary();
if (xio.check_muted_secondary_channels()) {
controller_set_muted(true); // something was muted
}
setAsActiveData();
}
} // flags & DEV_IS_DISCONNECTED
return;
}
} else { // disconnected
if (isConnected()) {
//USB0 has just disconnected
//Case 1: This channel disconnected while it was a ctrl+data channel (and no other channels are open) -
// finalize this channel, unmute muted channels
//Case 2: This channel disconnected while it was a primary ctrl channel (and other channels are open) -
// finalize this channel, unmute muted channels, deactivate other channels
//Case 3: This channel disconnected while it was a non-primary ctrl channel (and other channels are open) -
// finalize this channel, leave other channels alone
//Case 4: This channel disconnected while it was a data channel (and other channels are open, including a primary)
// finalize this channel, set primary channel as a CTRL+DATA channel if this was the last data channel
//Case 5a: This channel disconnected while it was inactive
//Case 5b: This channel disconnected when it's always present
// don't need to do anything!
//... inactive channels are counted as closed
devflags_t oldflags = flags;
clearFlags();
flush();
flushRead();
if (checkForNotActive(oldflags) || isAlwaysDataAndCtrl()) {
// Case 5a, 5b
} else if (checkForCtrlAndData(oldflags) || !xio.others_connected(this)) {
// Case 1
if (xio.deactivate_and_unmute_channels()) {
controller_set_muted(false); // something was unmuted
} else {
controller_set_connected(false);
}
} else if (checkForCtrlAndPrimary(oldflags)) {
// Case 2
if (xio.deactivate_and_unmute_channels()) {
controller_set_muted(false); // something was unmuted
}
} else if (checkForCtrl(oldflags)) {
// Case 3
} else if (checkForData(oldflags)) {
// Case 4
xio.remove_data_from_primary();
if(!xio.others_connected(this)) {
// Case 1
setAsPrimaryActiveDualRole();
// report that there is now have a connection (only for the first one)
controller_set_connected(true);
// make sure secondary channels (that don't show up in isConnected) are muted
if (xio.check_muted_secondary_channels()) {
controller_set_muted(true); // something was muted
}
} // flags & DEV_IS_CONNECTED
}
}
else if (isMuteAsSecondary()) {
// Case 2b
setAsMuted();
controller_set_connected(true); // it DID just just get connected
controller_set_muted(true); // but it muted it too
}
else {
// Case 2a
xio.remove_data_from_primary();
if (xio.check_muted_secondary_channels()) {
controller_set_muted(true); // something was muted
}
setAsActiveData();
}
} // flags & DEV_IS_DISCONNECTED
} else { // disconnected
if (isConnected()) {
//USB0 has just disconnected
//Case 1: This channel disconnected while it was a ctrl+data channel (and no other channels are open) -
// finalize this channel, unmute muted channels
//Case 2: This channel disconnected while it was a primary ctrl channel (and other channels are open) -
// finalize this channel, unmute muted channels, deactivate other channels
//Case 3: This channel disconnected while it was a non-primary ctrl channel (and other channels are open) -
// finalize this channel, leave other channels alone
//Case 4: This channel disconnected while it was a data channel (and other channels are open, including a primary)
// finalize this channel, set primary channel as a CTRL+DATA channel if this was the last data channel
//Case 5a: This channel disconnected while it was inactive
//Case 5b: This channel disconnected when it's always present
// don't need to do anything!
//... inactive channels are counted as closed
devflags_t oldflags = flags;
clearFlags();
flush();
flushRead();
if (checkForNotActive(oldflags) || isAlwaysDataAndCtrl()) {
// Case 5a, 5b
} else if (checkForCtrlAndData(oldflags) || !xio.others_connected(this)) {
// Case 1
if (xio.deactivate_and_unmute_channels()) {
controller_set_muted(false); // something was unmuted
} else {
controller_set_connected(false);
}
} else if (checkForCtrlAndPrimary(oldflags)) {
// Case 2
if (xio.deactivate_and_unmute_channels()) {
controller_set_muted(false); // something was unmuted
}
} else if (checkForCtrl(oldflags)) {
// Case 3
} else if (checkForData(oldflags)) {
// Case 4
xio.remove_data_from_primary();
}
} // flags & DEV_IS_CONNECTED
}
};
};
// Specialization for xio_flash_file -- we don't need most of the structure around a Device for xio_flash_file
template<uint16_t _line_buffer_size = 255>
struct xioFlashFileDeviceWrapper : xioDeviceWrapperBase { // describes a device for reading and writing
xio_flash_file *_current_file = nullptr;
char _line_buffer[_line_buffer_size]; // hold exactly one line to return -- flash files are read-only, so we copy it
xioFlashFileDeviceWrapper() : xioDeviceWrapperBase(DEV_CAN_READ | DEV_IS_ALWAYS_BOTH)
{
};
bool sendFile(xio_flash_file &new_file) {
if (nullptr != _current_file) {
return false; // we're still sending a file
}
_current_file = &new_file;
_current_file->reset();
setActive();
return true;
}
void init() {
};
void flush() final {
// nothing to do
}
void flushRead() final {
// to flush the file, just forget about it
// next time it's used it'll get reset
_current_file = nullptr;
}
int16_t write(const char *buffer, int16_t len) final {
return -1;
}
char *readline(devflags_t limit_flags, uint16_t &line_size) final {
if (nullptr == _current_file) {
line_size = 0;
return nullptr;
}
const char *from = _current_file->readline(!(limit_flags & DEV_IS_DATA), line_size);
if ((nullptr == from) && (_current_file->isDone())) {
// all done sending this file, "close" it
_current_file = nullptr;
clearActive();
return nullptr;
}
char *dst_ptr = _line_buffer;
uint16_t count = std::min(line_size, uint16_t(_line_buffer_size - 2));
while (count--) {
*dst_ptr++ = *from++;
}
// null-terminate the string
*dst_ptr = 0;
return _line_buffer;
};
};
xioFlashFileDeviceWrapper<> flashFileWrapper {};
// ALLOCATIONS
// Declare a device wrapper class for SerialUSB and SerialUSB1
#if XIO_HAS_USB == 1
@@ -1052,6 +1127,7 @@ xioDeviceWrapper<decltype(&Serial)> serial0Wrapper {
// Define the xio singleton (and initialize it to hold our two deviceWrappers)
//xio_t xio = { &serialUSB0Wrapper, &serialUSB1Wrapper };
xio_t xio = {
&flashFileWrapper,
#if XIO_HAS_USB == 1
&serialUSB0Wrapper,
#if USB_SERIAL_PORTS_EXPOSED == 2
@@ -1071,7 +1147,7 @@ xio_t xio = {
* A lambda function closure is provided for trapping connection state changes from USB devices.
* The function is installed as a callback from the lower USB layers. It is called only on edges
* (connect/disconnect transitions). 'Connected' is true if the USB channel has just connected,
* false if it has just disconnected. It is only called on an edge � when it changes - so you
* false if it has just disconnected. It is only called on an edge when it changes - so you
* shouldn't see two back-to-back connected=true calls with the same callback.
*
* See here for some good info on lambda functions in C++
@@ -1132,6 +1208,10 @@ bool xio_connected()
return xio.connected();
}
bool xio_send_file(xio_flash_file &file) {
return flashFileWrapper.sendFile(file);
}
/***********************************************************************************
* newlib-nano support functions
g2core/xio.h
+69 -1
View File
@@ -50,6 +50,7 @@
//#include "g2core.h" // not required if used in g2core project
#include "config.h" // required for nvObj typedef
#include "canonical_machine.h" // needed for cm_has_hold()
/**** Defines, Macros, and Assorted Parameters ****/
@@ -97,6 +98,7 @@ enum xioDeviceEnum { // reconfigure this enum as you add
DEV_USB1, // must be 1
DEV_UART1, // must be 2
// DEV_SPI0, // We can't have it here until we actually define it
DEV_FLASH_FILE, // must be 0
DEV_MAX
};
@@ -106,7 +108,7 @@ enum xioSPIMode {
};
/**** readline stuff -- TODO *****/
/**** readline stuff *****/
#define RX_BUFFER_MIN_SIZE 256 // minimum requested buffer size (they are usually larger)
@@ -127,6 +129,7 @@ extern "C" {
int _write( int file, char *ptr, int len );
}
/* Some useful ASCII definitions */
#define NUL (char)0x00 // ASCII NUL char (0) (not "NULL" which is a pointer)
@@ -160,6 +163,71 @@ extern "C" {
#define CHAR_QUEUE_FLUSH (char)'%'
//#define CHAR_BOOTLOADER ESC
/**** xio_flash_file - object to hold in-flash (compiled-in) "files" to run ****/
struct xio_flash_file {
const char * const _data;
const int32_t _length;
int32_t _read_offset = 0;
xio_flash_file(const char * const data, int32_t length) : _data{data}, _length{length} {};
void reset() {
_read_offset = 0;
};
const char *readline(bool control_only, uint16_t &line_size) {
line_size = 0;
if (_read_offset == _length) { return nullptr; }
if (control_only) {
char c = _data[_read_offset];
if (!
((c == '!') ||
(c == '~') ||
(c == ENQ) || // request ENQ/ack
(c == CHAR_RESET) || // ^X - reset (aka cancel, terminate)
(c == CHAR_ALARM) || // ^D - request job kill (end of transmission)
(c == '%' && cm_has_hold()) // flush (only in feedhold or part of control header)
))
{
return nullptr;
}
}
const char *line_start = _data + _read_offset;
while (_read_offset < _length) {
char c = _data[_read_offset++];
if (c == '\n') {
break;
}
line_size++;
}
return line_start;
};
bool isDone() {
return _read_offset == _length;
}
};
/**** convenience function to construct a xio_flash_file ****/
template <int32_t length>
constexpr xio_flash_file make_xio_flash_file(const char (&data)[length]) {
return {data, length};
}
/**** function prototype for file-sending ****/
bool xio_send_file(xio_flash_file &file);
#ifdef __TEXT_MODE
void xio_print_spi(nvObj_t *nv);