remove unused variable in Kernel

[clinton/Smoothieware.git] / src / libs / ConfigValue.h

diff --git a/src/libs/ConfigValue.h b/src/libs/ConfigValue.h
dissimilarity index 73%
index 687c7bf..f3d9c90 100644 (file)
--- a/src/libs/ConfigValue.h
+++ b/src/libs/ConfigValue.h
@@ -1,114 +1,56 @@
-/*  
-      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/>. 
-*/
-
-#ifndef CONFIGVALUE_H
-#define CONFIGVALUE_H
-
-#include "libs/Kernel.h"
-#include "libs/utils.h"
-#include "libs/Pin.h"
-
-
-#define error(...) (fprintf(stderr, __VA_ARGS__), exit(1))
-
-using namespace std;
-#include <vector>
-#include <string>
-#include <stdio.h>
-
-
-class ConfigValue{
-    public:
-        ConfigValue(){
-            this->found = false;
-            this->default_set = false; 
-        };
-
-        ConfigValue* required(){
-            if( this->found == true ){
-                return this;
-            }else{
-                error("could not find config setting with checksum %u, please see http://smoothieware.org/configuring-smoothie\r\n", this->check_sum );
-            }
-        }
-
-        double as_number(){
-            if( this->found == false && this->default_set == true ){
-                return this->default_double;
-            }else{
-                double result = atof(remove_non_number(this->value).c_str());
-                if( result == 0.0 && this->value.find_first_not_of("0.") != string::npos ){
-                    error("config setting with value '%s' is not a valid number, please see http://smoothieware.org/configuring-smoothie\r\n", this->value.c_str() );
-                }
-                return result; 
-            }
-           
-        }
-
-        std::string as_string(){
-            if( this->found == false && this->default_set == true ){
-                return this->default_string;
-            }else{
-                return this->value; 
-            }
-        }
-
-        bool as_bool(){
-            if( this->found == false && this->default_set == true ){
-                return this->default_double;
-            }else{
-                if( this->value.find_first_of("t1") != string::npos ){
-                    return true;
-                }else{
-                    return false;
-                } 
-            }
-        }
-
-        Pin* as_pin(){
-            Pin* pin = new Pin();
-            pin->from_string(this->as_string());
-            return pin;
-        }
-
-        ConfigValue* by_default(double val){
-            this->default_set = true;
-            this->default_double = val;
-            return this; 
-        }
-
-        ConfigValue* by_default(std::string val){
-            this->default_set = true;
-            this->default_string = val;
-            return this;
-        }
-
-        bool has_characters( string mask ){
-            if( this->value.find_first_of(mask) != string::npos ){ return true; }else{ return false; } 
-        }
-
-        bool is_inverted(){
-            return this->has_characters(string("!"));
-        }
-
-        string value;
-        vector<uint16_t> check_sums;
-        uint16_t check_sum; 
-        bool found;
-        bool default_set;
-        double default_double; 
-        string default_string;
-};
-
-
-
-
-
-
-
-
-#endif
+/*
+      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/>.
+*/
+
+#ifndef CONFIGVALUE_H
+#define CONFIGVALUE_H
+
+#include <string>
+using std::string;
+
+class ConfigValue{
+    public:
+        ConfigValue();
+        ConfigValue(uint16_t *check_sums);
+        ConfigValue(const ConfigValue& to_copy);
+        ConfigValue& operator= (const ConfigValue& to_copy);
+        void clear();
+        ConfigValue* required();
+        float as_number();
+        int as_int();
+        bool as_bool();
+        string as_string();
+
+        ConfigValue* by_default(float val);
+        ConfigValue* by_default(string val);
+        ConfigValue* by_default(int val);
+        bool is_inverted();
+
+
+        friend class ConfigCache;
+        friend class Config;
+        friend class ConfigSource;
+        friend class Configurator;
+        friend class FileConfigSource;
+
+    private:
+        bool has_characters( const char* mask );
+        string value;
+        int default_int;
+        float default_double;
+        uint16_t check_sums[3];
+        bool found;
+        bool default_set;
+};
+
+
+
+
+
+
+
+
+#endif