-/*
+/*
This file is part of Smoothie (http://smoothieware.org/). The motion control part is heavily based on Grbl (https://github.com/simen/grbl).
Smoothie 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.
Smoothie 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 Smoothie. If not, see <http://www.gnu.org/licenses/>.
+ You should have received a copy of the GNU General Public License along with Smoothie. If not, see <http://www.gnu.org/licenses/>.
*/
#include "libs/Kernel.h"
#include "ConfigValue.h"
#include "FileConfigSource.h"
#include "ConfigCache.h"
+#include "utils.h"
#include <malloc.h>
using namespace std;
#include <string>
+#include <stdio.h>
FileConfigSource::FileConfigSource(string config_file, uint16_t name_checksum){
this->name_checksum = name_checksum;
// Transfer all values found in the file to the passed cache
void FileConfigSource::transfer_values_to_cache( ConfigCache* cache ){
-
- printf("Before file reading\n");
- malloc_stats();
-
-
-
- // Default empty value
- ConfigValue* result = new ConfigValue;
-
if( this->has_config_file() == false ){return;}
- // Open the config file ( find it if we haven't already found it )
+ // Open the config file ( find it if we haven't already found it )
FILE *lp = fopen(this->get_config_file().c_str(), "r");
- string buffer;
- int c;
-
- int debug_total = 0;
-
- // For each line
+ int c;
+ // For each line
do {
- c = fgetc (lp);
- if (c == '\n' || c == EOF){
-
- printf("key:<%s> \r\n", buffer.c_str());
-
- // We have a new line
- if( buffer[0] == '#' ){ buffer.clear(); continue; } // Ignore comments
- if( buffer.length() < 3 ){ buffer.clear(); continue; } //Ignore empty lines
- size_t begin_key = buffer.find_first_not_of(" ");
- size_t begin_value = buffer.find_first_not_of(" ", buffer.find_first_of(" ", begin_key));
-
- vector<uint16_t> check_sums = get_checksums(buffer.substr(begin_key, buffer.find_first_of(" ", begin_key) - begin_key).append(" "));
-
- printf("before trouble\r\n");
- printf("sizeof(ConfigValue): %u\r\n", sizeof(ConfigValue));
- malloc_stats();
-
- printf("trouble \r\n");
- result = new ConfigValue;
-
- malloc_stats();
- printf("after trouble\r\n");
-
-
- result->found = true;
- result->check_sums = check_sums;
-
- result->value = buffer.substr(begin_value, buffer.find_first_of("\r\n# ", begin_value+1)-begin_value);
-
- debug_total += result->value.size();
-
- printf("value:<%s> %d \r\n", result->value.c_str(), debug_total);
-
- // Append the newly found value to the cache we were passed
- cache->replace_or_push_back(result);
-
- buffer.clear();
-
- }else{
- buffer += c;
- }
- } while (c != EOF);
+ process_char_from_ascii_config(c = fgetc(lp), cache);
+ } while (c != EOF);
fclose(lp);
-
-
-
- printf("After file reading config\n");
- malloc_stats();
-
-
-
}
// Return true if the check_sums match
// We have a new line
if( buffer[0] == '#' ){ buffer.clear(); continue; } // Ignore comments
if( buffer.length() < 3 ){ buffer.clear(); continue; } //Ignore empty lines
- size_t begin_key = buffer.find_first_not_of(" ");
- size_t begin_value = buffer.find_first_not_of(" ", buffer.find_first_of(" ", begin_key));
+ size_t begin_key = buffer.find_first_not_of(" \t");
+ size_t begin_value = buffer.find_first_not_of(" \t", buffer.find_first_of(" \t", begin_key));
// If this line matches the checksum
- string candidate = buffer.substr(begin_key, buffer.find_first_of(" ", begin_key) - begin_key);
+ string candidate = buffer.substr(begin_key, buffer.find_first_of(" \t", begin_key) - begin_key);
if( candidate.compare(setting) != 0 ){ buffer.clear(); continue; }
int free_space = int(int(buffer.find_first_of("\r\n#", begin_value+1))-begin_value);
if( int(value.length()) >= free_space ){
- //this->kernel->streams->printf("ERROR: Not enough room for value\r\n");
+ //THEKERNEL->streams->printf("ERROR: Not enough room for value\r\n");
fclose(lp);
return;
}
}
} while (c != EOF);
fclose(lp);
- //this->kernel->streams->printf("ERROR: configuration key not found\r\n");
+ //THEKERNEL->streams->printf("ERROR: configuration key not found\r\n");
}
// Return the value for a specific checksum
-string FileConfigSource::read( vector<uint16_t> check_sums ){
+string FileConfigSource::read( uint16_t check_sums[3] ){
string value = "";
if( this->has_config_file() == false ){return value;}
- // Open the config file ( find it if we haven't already found it )
+ // Open the config file ( find it if we haven't already found it )
FILE *lp = fopen(this->get_config_file().c_str(), "r");
- string buffer;
- int c;
- // For each line
+ int c;
+ // For each line
do {
c = fgetc (lp);
- if (c == '\n' || c == EOF){
- // We have a new line
- if( buffer[0] == '#' ){ buffer.clear(); continue; } // Ignore comments
- if( buffer.length() < 3 ){ buffer.clear(); continue; } //Ignore empty lines
- size_t begin_key = buffer.find_first_not_of(" ");
- size_t begin_value = buffer.find_first_not_of(" ", buffer.find_first_of(" ", begin_key));
- string key = buffer.substr(begin_key, buffer.find_first_of(" ", begin_key) - begin_key).append(" ");
- vector<uint16_t> line_checksums = get_checksums(key);
-
- if(check_sums == line_checksums){
- value = buffer.substr(begin_value, buffer.find_first_of("\r\n# ", begin_value+1)-begin_value);
- break;
- }
-
- buffer.clear();
- }else{
- buffer += c;
- }
- } while (c != EOF);
+ process_char_from_ascii_config(c, check_sums);
+ } while (c != EOF);
fclose(lp);
return value;
return this->config_file;
}else{
printf("ERROR: no config file found\r\n");
+ return "";
}
}
HCoop / clinton / Smoothieware.git / blobdiff