Minor fixes

Author: DabOG

boards.txt

@@ -342,8 +342,7 @@ Generic_nRF52840.build.board=GENERIC
 Generic_nRF52840.build.core=nRF5
 Generic_nRF52840.build.variant=Generic_nRF52840
 Generic_nRF52840.build.variant_system_lib=
- #TODO: убрать отладку
-Generic_nRF52840.build.extra_flags=-DNRF52 -gdwarf-2
+Generic_nRF52840.build.extra_flags=-DNRF52
 Generic_nRF52840.build.float_flags=-mfloat-abi=hard -mfpu=fpv4-sp-d16
 Generic_nRF52840.build.ldscript=nrf52840.ld
 

cores/nRF5/Arduino.h

@@ -92,38 +92,17 @@ void loop( void ) ;
 
 #define bit(b) (1UL << (b))
 
-//TODO: Проверить
 #ifdef NRF_P1
   #define digitalPinToPort(P)        ( (g_ADigitalPinMap[P] < 32) ? NRF_P0 : NRF_P1 )
 #else
   #define digitalPinToPort(P)        ( NRF_P0 )
 #endif
 
 //#define digitalPinToPort(P)        ( &(NRF_GPIO[P]) )
-//TODO: Проверить
+
 #define digitalPinToBitMask(P)     ( 1UL << ( g_ADigitalPinMap[P] < 32 ? g_ADigitalPinMap[P] : (g_ADigitalPinMap[P]-32) ) )
 //#define digitalPinToBitMask(P)     ( 1 << g_ADigitalPinMap[P] )
 
-__STATIC_INLINE NRF_GPIO_Type * nrf_gpio_pin_port_decode(uint32_t * p_pin)
-{
-    //NRFX_ASSERT(*p_pin < NUMBER_OF_PINS);
-#if (GPIO_COUNT == 2)
-        //if (*p_pin < P0_PIN_NUM)
-    if (*p_pin < 32)
-    {
-        return NRF_P0;
-    }
-    else
-    {
-        *p_pin = *p_pin & (32 - 1);
-        return NRF_P1;
-    }
-#else
-    // The oldest definition case
-    return NRF_GPIO;
-#endif
-}
-
 //#define analogInPinToBit(P)        ( )
 #define portOutputRegister(port)   ( &(port->OUTSET) )
 #define portInputRegister(port)    ( &(port->IN) )

cores/nRF5/SDK/components/device/nrf51_to_nrf52.h

@@ -78,7 +78,6 @@
 
 /* GPIO */
 /* GPIO port was renamed to P0. */
-//TODO: Разобраться
 #define NRF_GPIO        NRF_P0
 #define NRF_GPIO_BASE   NRF_P0_BASE
 

cores/nRF5/wiring.h

@@ -24,6 +24,25 @@ extern "C" {
 
 extern void init(void);
 
+__STATIC_INLINE NRF_GPIO_Type * nrf_gpio_pin_port_decode(uint32_t * p_pin)
+{
+#if (GPIO_COUNT == 2)
+        //if (*p_pin < P0_PIN_NUM)
+    if (*p_pin < 32)
+    {
+        return NRF_P0;
+    }
+    else
+    {
+        *p_pin = *p_pin & (32 - 1);
+        return NRF_P1;
+    }
+#else
+    // The oldest definition case
+    return NRF_GPIO;
+#endif
+}
+
 #ifdef __cplusplus
 }
 #endif

variants/Generic_nRF52840/variant.h

@@ -93,7 +93,6 @@ static const uint8_t SCK  = PIN_SPI_SCK ;
 /*
  * Wire Interfaces
  */
-//TODO: Определиться позднее
 #define WIRE_INTERFACES_COUNT 1
 
 #define PIN_WIRE_SDA         (20u) // P0.20