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

typedef struct mpBuffer {} mpBuf_t -> struct mpBuf_t

Browse Source 
`mpBuf_t` is used more often, so to create the smallest diff that was chosen.
This commit is contained in:
Rob Giseburt
2019-11-26 17:12:11 -06:00
parent 84d8fbfeaa
commit 36466c39f4
3 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Resources/debug/mb_analyze_tab.py
View File

@@ -26,7 +26,7 @@ def load_pool(filename):
pool[TUMBLER[tumbler_pos]] = current_buffer
tumbler_pos += 1
buf = re.search('\(mpBuffer\s\*\)\s(0x[0-9a-fA-F]+)', line)
buf = re.search('\(mpBuf_t\s\*\)\s(0x[0-9a-fA-F]+)', line)
if buf:
current_buffer = int(buf.groups()[0], 16)
pool[current_buffer] = {}

10
g2core/planner.h
View File

@@ -318,14 +318,14 @@ typedef enum { // code blocks for planning and trapezoid ge
//**** Planner Queue Structures ****
typedef struct mpBuffer {
struct mpBuf_t { // mpBuf_t
// *** CAUTION *** These two pointers are not reset by _clear_buffer()
struct mpBuffer *pv; // static pointer to previous buffer
struct mpBuffer *nx; // static pointer to next buffer
struct mpBuf_t *pv; // static pointer to previous buffer
struct mpBuf_t *nx; // static pointer to next buffer
uint8_t buffer_number; // DIAGNOSTIC for easier debugging
stat_t (*bf_func)(struct mpBuffer *bf); // callback to buffer exec function
stat_t (*bf_func)(struct mpBuf_t *bf); // callback to buffer exec function
cm_exec_t cm_func; // callback to canonical machine execution function
#ifdef __PLANNER_DIAGNOSTICS
@@ -421,7 +421,7 @@ typedef struct mpBuffer {
q_recip_2_sqrt_j = 0.0;
gm.reset();
}
} mpBuf_t;
};
typedef struct mpPlannerQueue { // control structure for queue
magic_t magic_start; // magic number to test memory integrity

4
g2core/stepper.h
View File

@@ -328,7 +328,7 @@ enum stPowerMode {
* There are 5 main structures involved in stepper operations;
*
* data structure: found in: runs primarily at:
* mpBuffer planning buffers (bf) planner.c main loop
* mpBuf_t planning buffers (bf) planner.c main loop
* mrRuntimeSingleton (mr) planner.c MED ISR
* stConfig (st_cfg) stepper.c write=bkgd, read=ISRs
* stPrepSingleton (st_pre) stepper.c MED ISR
@@ -404,7 +404,7 @@ typedef struct stPrepMotor {
typedef struct stPrepSingleton {
magic_t magic_start; // magic number to test memory integrity
volatile prepBufferState buffer_state; // prep buffer state - owned by exec or loader
struct mpBuffer *bf; // static pointer to relevant buffer
struct mpBuf_t *bf; // static pointer to relevant buffer
blockType block_type; // move type (requires planner.h)
uint32_t dda_ticks; // DDA ticks for the move