HCoop
/
clinton
/
Smoothieware.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
refactors
[clinton/Smoothieware.git]
/
src
/
libs
/
utils.h
diff --git
a/src/libs/utils.h
b/src/libs/utils.h
index
71c10b3
..
b8b2a69
100644
(file)
--- a/
src/libs/utils.h
+++ b/
src/libs/utils.h
@@
-4,7
+4,7
@@
#include <stdint.h>
#include <string>
#include <vector>
#include <stdint.h>
#include <string>
#include <vector>
-#include <map>
+
using std::string;
using std::vector;
using std::string;
using std::vector;
@@
-18,6
+18,7
@@
bool is_whitespace( int );
vector<string> split(const char *str, char c = ',');
vector<float> parse_number_list(const char *str);
vector<string> split(const char *str, char c = ',');
vector<float> parse_number_list(const char *str);
+vector<uint32_t> parse_number_list(const char *str, uint8_t radix);
string remove_non_number( string str );
string remove_non_number( string str );
@@
-28,7
+29,7
@@
void get_checksums(uint16_t check_sums[], const string& key);
string shift_parameter( string ¶meters );
string shift_parameter( string ¶meters );
-string get_arguments(
string
possible_command );
+string get_arguments(
const string&
possible_command );
bool file_exists( const string file_name );
bool file_exists( const string file_name );
@@
-36,6
+37,8
@@
void system_reset( bool dfu= false );
string absolute_from_relative( string path );
string absolute_from_relative( string path );
-std::string append_parameters(std::map<char,float> params);
+int append_parameters(char *buf, std::vector<std::pair<char,float>> params, size_t bufsize);
+string wcs2gcode(int wcs);
+void safe_delay(uint32_t delay);
#endif
#endif