Diff: ntc.h

Revision:

6:8e6bd0f9877b

Parent:

5:9655397ba539

Child:

7:1de44d8867a3

--- a/ntc.h	Tue Apr 11 20:30:30 2017 +0000
+++ b/ntc.h	Wed Apr 12 16:56:27 2017 +0000
@@ -117,8 +117,8 @@
      *  main() {
      *      printf("\r\n\r\n-------------------------------------------\r\n");
      *      printf("NTC Res: %5d   B0/50: %4d   B25/50: %4d   B25/80: %4d   B25/85: %4d   B25/100: %4d   B_OTHER: %4d   SeriesR: %d\r\n", 
-     *                  ntc.get_ntc_res(), ntc.get_ntc_beta_0050(), ntc.get_ntc_beta_2550(), ntc.get_ntc_beta_2580(), ntc.get_ntc_beta_2585(), 
-     *                  ntc.get_ntc_beta_25100(), ntc.get_ntc_beta_other(),  ntc.get_series_res());
+     *                  ntc.get_ntc_res(), ntc.get_ntc_beta(NTC::B0_50), ntc.get_ntc_beta(NTC::B25_50), ntc.get_ntc_beta(NTC::B25_80), ntc.get_ntc_beta(NTC::B25_85), 
+     *                  ntc.get_ntc_beta(NTC::B25_100), ntc.get_ntc_beta(NTC::B_OTHER),  ntc.get_series_res());
      *      uint16_t ad = ntc.read_ad_reg();
      *      printf("NTC A:D Val: %5d   Volt A:D: %.6f   NTC-R_now: %7.1f    Temp: %+.2f\r\n", ad, 
      *              NTC_VREF / NTC_AD_RESOL * (float)ad, ntc.get_ntc_res_viaAD(ad), ntc.get_ntc_temp(NTC::B25_85, ad));
@@ -172,42 +172,13 @@
       */
     int get_ntc_res();
     
-    /** Get the NTC beta value B25/50
-      * @param none
-      * @return beta
-      */
-    int get_ntc_beta_0050();
-
-    /** Get the NTC beta value B0/50
-      * @param none
-      * @return beta
-      */
-    int get_ntc_beta_2550();
-            
-    /** Get the NTC beta value B25/80
-      * @param none
-      * @return beta
+    /** Get the NTC beta value
+      * @param ntcBetaCurve selection
+      * @param B25_85 default value
+      * @return beta curve value
       */
-    int get_ntc_beta_2580();
-        
-    /** Get the NTC beta value B25/85
-      * @param none
-      * @return beta
-      */
-    int get_ntc_beta_2585();
-              
-    /** Get the NTC beta value B25/100
-      * @param none
-      * @return beta
-      */
-    int get_ntc_beta_25100();
-    
-    /** Get other NTC beta value
-      * @param none
-      * @return beta
-      */
-    int get_ntc_beta_other();
-        
+    int get_ntc_beta(int beta = B25_85);
+       
     /** Get the resistance value for the series resistor
       * @param none
       * @return resistance of series resistor