Rename variable '__this' to 'pThis'

Author: ABOSTM

cores/arduino/HardwareTimer.cpp

@@ -65,7 +65,7 @@ HardwareTimer::HardwareTimer(TIM_TypeDef *instance)
   _HardwareTimerObj.handle.State = HAL_TIM_STATE_RESET;
 
   _HardwareTimerObj.handle.Instance = instance;
-  _HardwareTimerObj.__this = (void *)this;
+  _HardwareTimerObj.pThis = (void *)this;
 
   // Enable Timer clock
   enableTimerClock(&(_HardwareTimerObj.handle));
@@ -707,7 +707,7 @@ void HardwareTimer::updateCallback(TIM_HandleTypeDef *htim)
   }
 
   HardwareTimerObj_t *obj = get_timer_obj(htim);
-  HardwareTimer *HT = (HardwareTimer *)(obj->__this);
+  HardwareTimer *HT = (HardwareTimer *)(obj->pThis);
 
   if (HT->callbacks[0] != NULL) {
     HT->callbacks[0](HT);
@@ -749,7 +749,7 @@ void HardwareTimer::captureCompareCallback(TIM_HandleTypeDef *htim)
   }
 
   HardwareTimerObj_t *obj = get_timer_obj(htim);
-  HardwareTimer *HT = (HardwareTimer *)(obj->__this);
+  HardwareTimer *HT = (HardwareTimer *)(obj->pThis);
 
   if (HT->callbacks[channel] != NULL) {
     HT->callbacks[channel](HT);
@@ -764,7 +764,7 @@ HardwareTimer::~HardwareTimer()
 {
   uint32_t index = get_timer_index(_HardwareTimerObj.handle.Instance);
   HardwareTimer_Handle[index] = NULL;
-  _HardwareTimerObj.__this = NULL;
+  _HardwareTimerObj.pThis = NULL;
   enableTimerClock(&(_HardwareTimerObj.handle));
 }
 

cores/arduino/HardwareTimer.h

@@ -77,9 +77,9 @@ typedef enum {
 // This structure is used to be able to get HardwareTimer instance (C++ class)
 // from handler (C structure) specially for interrupt management
 typedef struct  {
-  void    *__this;  // Those 2 first field must remain in this order at the beginning of the structure
-  TIM_HandleTypeDef handle; // Those 2 first field must remain in this order at the beginning of the structure
-  // void (*callbacks[1 + TIMER_CHANNELS])(HardwareTimer*); //Callbacks: 0 for update, 1-4 for channels. (channel5/channel6, if any, doesn't have interrupt)
+  // Those 2 first fields must remain in this order at the beginning of the structure
+  void    *pThis;
+  TIM_HandleTypeDef handle;
 } HardwareTimerObj_t;
 
 #ifdef __cplusplus