Diff: main.cpp

Revision:

52:adfcbf71be5b

Parent:

51:7d165baaa646

Child:

53:42b3280e4510

diff -r 7d165baaa646 -r adfcbf71be5b main.cpp
--- a/main.cpp	Wed Apr 20 08:35:02 2022 +0200
+++ b/main.cpp	Wed Apr 20 08:35:47 2022 +0200
@@ -2,7 +2,7 @@
 #include "PM2_Libary.h"
 #include <cmath>
 #include <cstdint>
-//#include "mapping.cpp"
+#include "mapping.cpp"
 #include <cstdio>
 #include "math.h"
 //*******************************************************************************************************************************************************************
@@ -77,8 +77,8 @@
 float   current_deg_arm = start_deg_arm; // saves the current degree the arm has.
 
 // import functions from file mapping
-//extern double powerx(double base, double pow2);
-//extern double mapping (float adc_value_mV);
+extern double powerx(double base, double pow2);
+extern double mapping (float adc_value_mV);
 
 // calculates the deg which the arm has to take to reach a certain height (the input height has to be the height of OK Gripper area)
 double calc_arm_deg_for_height(int height_mm)