Diff: HardwareAccess/Scale.h

Revision:

2:ef3093a7a43e

Parent:

0:8acbce46eede

diff -r 4a5e329e617b -r ef3093a7a43e HardwareAccess/Scale.h
--- a/HardwareAccess/Scale.h	Thu Nov 10 15:38:50 2016 +0000
+++ b/HardwareAccess/Scale.h	Fri Nov 11 15:30:07 2016 +0000
@@ -17,6 +17,12 @@
 
 #pragma once
 
+typedef enum EScaleType {
+    ScaleFixed = 0,
+    ScaleSham = 1,
+    ScaleReal = 2
+} ScaleType;
+
 /**
   * @brief  Calculate model scale.
   */
@@ -25,21 +31,25 @@
 public :
 
     Scale();
-
-    Scale(float min, float max);
+   
+    void SetScale(ScaleType type, float initialValue, float minValue, float maxValue, float delta);
 
     float GetScale();
 
+protected:
+
     /// Read model scale from a potentiometer attached to pin A1
     float ReadScale();
 
-protected:
-    float scale;
-
 private:
-    void Setup(float scale, float delts, float min, float max);
-
-    float delta;
-    float maxScale;
-    float minScale;
+      
+    ScaleType _type;
+    
+    float _scale;
+   
+    float _maxScale;
+    
+    float _minScale;
+      
+    float _delta;  
 };
\ No newline at end of file