Merge pull request #28 from mechash/master

Oled API and Support for Pluto IDE Extension

Author: prasannashevare

Makefile

@@ -1,5 +1,5 @@
 /*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright � 2016, STMicroelectronics International N.V.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -32,9 +32,9 @@
 #include "vl53l0x_api_core.h"
 #include "vl53l0x_api_calibration.h"
 #include "vl53l0x_api_strings.h"
+#include <stdlib.h>			//DD
 /* 
 #ifndef __KERNEL__
-#include <stdlib.h>			//DD
 #endif
 #define LOG_FUNCTION_START(fmt, ...) \
 	_LOG_FUNCTION_START(TRACE_MODULE_API, fmt, ##__VA_ARGS__)

lib/main/VL53L0X_API/core/src/vl53l0x_api.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright � 2016, STMicroelectronics International N.V.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@
 #include "vl53l0x_api_core.h"
 #include "vl53l0x_api_calibration.h"
 
-/* #ifndef __KERNEL__
 #include <stdlib.h>
+/* #ifndef __KERNEL__
 #endif
 
 #define //LOG_FUNCTION_START(fmt, ...) \

lib/main/VL53L0X_API/core/src/vl53l0x_api_calibration.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright � 2016, STMicroelectronics International N.V.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -31,8 +31,8 @@
 #include "vl53l0x_api_calibration.h"
 
 
-/* #ifndef __KERNEL__
 #include <stdlib.h>
+/* #ifndef __KERNEL__
 #endif
 #define //LOG_FUNCTION_START(fmt, ...) \
 	////LOG_FUNCTION_START(TRACE_MODULE_API, fmt, ##__VA_ARGS__)

lib/main/VL53L0X_API/core/src/vl53l0x_api_core.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright � 2016, STMicroelectronics International N.V.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -29,9 +29,9 @@
 #include "vl53l0x_api.h"
 #include "vl53l0x_api_core.h"
 
+#include <stdlib.h>
 /* 
 #ifndef __KERNEL__
-#include <stdlib.h>
 #endif
 #define LOG_FUNCTION_START(fmt, ...) \
 	_LOG_FUNCTION_START(TRACE_MODULE_API, fmt, ##__VA_ARGS__)

lib/main/VL53L0X_API/core/src/vl53l0x_api_ranging.c

@@ -1,5 +1,5 @@
 /*******************************************************************************
- Copyright © 2016, STMicroelectronics International N.V.
+ Copyright � 2016, STMicroelectronics International N.V.
  All rights reserved.
 
  Redistribution and use in source and binary forms, with or without
@@ -30,8 +30,8 @@
 #include "vl53l0x_api_core.h"
 #include "vl53l0x_api_strings.h"
 
-/* #ifndef __KERNEL__
 #include <stdlib.h>
+/* #ifndef __KERNEL__
 #endif
 
 #define //LOG_FUNCTION_START(fmt, ...) \

lib/main/VL53L0X_API/core/src/vl53l0x_api_strings.c

@@ -107,6 +107,7 @@ int32_t app_GPS_coord[2];
 int32_t RC_ARRAY[4] = { 0 };
 
 bool runUserCode = false;
+bool OledEnable =false;
 bool useAutoRC = false;
 bool developerMode = false;
 bool External_RC_FLAG[4] = { true, true, true, true };

src/main/API/API-Utils.cpp

@@ -58,6 +58,7 @@ extern int32_t app_GPS_coord [ 2 ];
 extern int32_t RC_ARRAY [ 4 ];
 
 extern bool runUserCode;
+extern bool OledEnable;
 extern bool developerMode;
 extern bool useAutoRC;
 extern bool External_RC_FLAG [ 4 ];