MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename as M100

Browse Source
This commit is contained in:
Richard Wackerbarth 2015-07-18 18:59:12 -05:00
parent a401d738df
commit ae00fad75b
3 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Configuration.h
View File

@ -613,9 +613,9 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
#endif #endif
// //
// M99 Free Memory Watcher // M100 Free Memory Watcher
// //
#define M99_FREE_MEMORY_WATCHER // uncomment to add the M99 Free Memory Watcher for debug purpose //#define M100_FREE_MEMORY_WATCHER // uncomment to add the M100 Free Memory Watcher for debug purpose
// @section temperature // @section temperature

48
Marlin/M99_Free_Mem_Chk.cpp → Marlin/M100_Free_Mem_Chk.cpp
View File

@ -1,20 +1,20 @@
#define M99_FREE_MEMORY_DUMPER // Comment out to remove Dump sub-command #define M100_FREE_MEMORY_DUMPER // Comment out to remove Dump sub-command
#define M99_FREE_MEMORY_CORRUPTOR // Comment out to remove Corrupt sub-command #define M100_FREE_MEMORY_CORRUPTOR // Comment out to remove Corrupt sub-command
// M99 Free Memory Watcher // M100 Free Memory Watcher
// //
// This code watches the free memory block between the bottom of the heap and the top of the stack. // This code watches the free memory block between the bottom of the heap and the top of the stack.
// This memory block is initialized and watched via the M99 command. // This memory block is initialized and watched via the M100 command.
// //
// M99 I Initializes the free memory block and prints vitals statistics about the area // M100 I Initializes the free memory block and prints vitals statistics about the area
// M99 F Identifies how much of the free memory block remains free and unused. It also // M100 F Identifies how much of the free memory block remains free and unused. It also
// detects and reports any corruption within the free memory block that may have // detects and reports any corruption within the free memory block that may have
// happened due to errant firmware. // happened due to errant firmware.
// M99 D Does a hex display of the free memory block along with a flag for any errant // M100 D Does a hex display of the free memory block along with a flag for any errant
// data that does not match the expected value. // data that does not match the expected value.
// M99 C x Corrupts x locations within the free memory block. This is useful to check the // M100 C x Corrupts x locations within the free memory block. This is useful to check the
// correctness of the M99 F and M99 D commands. // correctness of the M100 F and M100 D commands.
// //
// Initial version by Roxy-3DPrintBoard // Initial version by Roxy-3DPrintBoard
// //
@ -23,7 +23,7 @@
#include "Marlin.h" #include "Marlin.h"
#ifdef M99_FREE_MEMORY_WATCHER #ifdef M100_FREE_MEMORY_WATCHER
extern void *__brkval; extern void *__brkval;
extern size_t __heap_start, __heap_end, __flp; extern size_t __heap_start, __heap_end, __flp;
@ -45,7 +45,7 @@ void serial_echopair_P(const char *, long );
// //
// Utility functions used by M99 to get its work done. // Utility functions used by M100 to get its work done.
// //
unsigned char *top_of_stack(); unsigned char *top_of_stack();
@ -57,14 +57,14 @@ int how_many_E5s_are_here( unsigned char *);
void m99_code() void gcode_M100()
{ {
static int m99_not_initialized=1; static int m100_not_initialized=1;
unsigned char *sp, *ptr; unsigned char *sp, *ptr;
int i, j, n; int i, j, n;
// //
// M99 D dumps the free memory block from __brkval to the stack pointer. // M100 D dumps the free memory block from __brkval to the stack pointer.
// malloc() eats memory from the start of the block and the stack grows // malloc() eats memory from the start of the block and the stack grows
// up from the bottom of the block. Solid 0xE5's indicate nothing has // up from the bottom of the block. Solid 0xE5's indicate nothing has
// used that memory yet. There should not be anything but 0xE5's within // used that memory yet. There should not be anything but 0xE5's within
@ -73,7 +73,7 @@ int i, j, n;
// the right hand column to help spotting them. // the right hand column to help spotting them.
// //
#ifdef M99_FREE_MEMORY_DUMPER // Comment out to remove Dump sub-command #ifdef M100_FREE_MEMORY_DUMPER // Comment out to remove Dump sub-command
if ( code_seen('D') ) { if ( code_seen('D') ) {
ptr = (unsigned char *) __brkval; ptr = (unsigned char *) __brkval;
@ -123,7 +123,7 @@ int i, j, n;
#endif #endif
// //
// M99 F requests the code to return the number of free bytes in the memory pool along with // M100 F requests the code to return the number of free bytes in the memory pool along with
// other vital statistics that define the memory pool. // other vital statistics that define the memory pool.
// //
if ( code_seen('F') ) { if ( code_seen('F') ) {
@ -160,10 +160,10 @@ int i, j, n;
return; return;
} }
// //
// M99 C x Corrupts x locations in the free memory pool and reports the locations of the corruption. // M100 C x Corrupts x locations in the free memory pool and reports the locations of the corruption.
// This is useful to check the correctness of the M99 D and the M99 F commands. // This is useful to check the correctness of the M100 D and the M100 F commands.
// //
#ifdef M99_FREE_MEMORY_CORRUPTOR #ifdef M100_FREE_MEMORY_CORRUPTOR
if ( code_seen('C') ) { if ( code_seen('C') ) {
int x; // x gets the # of locations to corrupt within the memory pool int x; // x gets the # of locations to corrupt within the memory pool
x = code_value(); x = code_value();
@ -190,12 +190,12 @@ int i, j, n;
#endif #endif
// //
// M99 I Initializes the free memory pool so it can be watched and prints vital // M100 I Initializes the free memory pool so it can be watched and prints vital
// statistics that define the free memory pool. // statistics that define the free memory pool.
// //
if (m99_not_initialized || code_seen('I') ) { // If no sub-command is specified, the first time if (m100_not_initialized || code_seen('I') ) { // If no sub-command is specified, the first time
SERIAL_ECHOLNPGM("Initializing free memory block.\n"); // this happens, it will Initialize. SERIAL_ECHOLNPGM("Initializing free memory block.\n"); // this happens, it will Initialize.
ptr = (unsigned char *) __brkval; // Repeated M99 with no sub-command will not destroy the ptr = (unsigned char *) __brkval; // Repeated M100 with no sub-command will not destroy the
SERIAL_ECHOPAIR("\n__brkval : ",(long) ptr ); // state of the initialized free memory pool. SERIAL_ECHOPAIR("\n__brkval : ",(long) ptr ); // state of the initialized free memory pool.
ptr += 8; ptr += 8;
@ -219,7 +219,7 @@ int i, j, n;
SERIAL_ECHOLNPGM("\n"); SERIAL_ECHOLNPGM("\n");
} }
} }
m99_not_initialized = 0; m100_not_initialized = 0;
SERIAL_ECHOLNPGM("Done.\n"); SERIAL_ECHOLNPGM("Done.\n");
return; return;
} }
@ -231,7 +231,7 @@ int i, j, n;
unsigned char *top_of_stack() { unsigned char *top_of_stack() {
unsigned char x; unsigned char x;
return &x; return &x + 1; // x is pulled on return;
} }
// //

11
Marlin/Marlin_main.cpp
View File

@ -213,6 +213,7 @@
* ************* SCARA End *************** * ************* SCARA End ***************
* *
* ************ Custom codes - This can change to suit future G-code regulations * ************ Custom codes - This can change to suit future G-code regulations
* M100 - Watch Free Memory (For Debugging Only)
* M851 - Set probe's Z offset (mm above extruder -- The value will always be negative) * M851 - Set probe's Z offset (mm above extruder -- The value will always be negative)
@ -225,8 +226,8 @@
* *
*/ */
#ifdef M99_FREE_MEMORY_WATCHER #ifdef M100_FREE_MEMORY_WATCHER
void m99_code(); void gcode_M100();
#endif #endif
#ifdef SDSUPPORT #ifdef SDSUPPORT
@ -5378,9 +5379,9 @@ void process_next_command() {
break; break;
#endif // ENABLE_AUTO_BED_LEVELING && Z_PROBE_REPEATABILITY_TEST #endif // ENABLE_AUTO_BED_LEVELING && Z_PROBE_REPEATABILITY_TEST
#ifdef M99_FREE_MEMORY_WATCHER #ifdef M100_FREE_MEMORY_WATCHER
case 99: case 100:
m99_code(); gcode_M100();
break; break;
#endif #endif