Merge pull request #6 from soburi/bump_v2.1.0

Bump to v2.1.0

close #3

Author: soburi

boards.txt

@@ -23,7 +23,7 @@ nrf52840_pca10056.build.variant=nrf52840_pca10056
 nrf52840_pca10056.menu.network.802154=IEEE802.15.4
 nrf52840_pca10056.menu.network.802154.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-802154.conf
 nrf52840_pca10056.menu.network.ot=OpenThread
-nrf52840_pca10056.menu.network.ot.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-ot.conf -DDEPENDENCY_APPEND_OT=ot -DEXTERNAL_PROJECT_PATH_OPENTHREAD={build.system.path}/openthread
+nrf52840_pca10056.menu.network.ot.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-ot.conf
 nrf52840_pca10056.menu.network.bt=Bluetooth
 nrf52840_pca10056.menu.network.bt.build.network_conf=-DOVERLAY_APPEND_NETWORK={runtime.platform.path}/variants/{build.variant}/overlay-bt.conf
 nrf52840_pca10056.menu.uartlog.enable=Enable

cores/CMakeLists.txt

@@ -1 +1 @@
-add_subdirectory(scirocco)
+add_subdirectory(scirocco)

cores/scirocco/CMakeLists.txt

@@ -1,7 +1,24 @@
-# SPDX-License-Identifier: Apache-2.0
-zephyr_include_directories(.)
-zephyr_sources(main.cpp)
-zephyr_sources(wiring.c)
-zephyr_sources(wiring_private.c)
-
-
+# SPDX-License-Identifier: Apache-2.0
+zephyr_include_directories(.)
+
+if(NOT DEFINED ARDUINO_BUILD_PATH)
+
+zephyr_sources(HardwareSerial.cpp)
+zephyr_sources(IPAddress.cpp)
+zephyr_sources(itoa.c)
+zephyr_sources(main.cpp)
+zephyr_sources(Print.cpp)
+zephyr_sources(pulse.c)
+zephyr_sources(Stream.cpp)
+zephyr_sources(Tone.cpp)
+zephyr_sources(UartDevice.cpp)
+zephyr_sources(wiring.c)
+zephyr_sources(wiring_analog.c)
+zephyr_sources(wiring_digital.c)
+zephyr_sources(wiring_private.cpp)
+zephyr_sources(wiring_shift.c)
+zephyr_sources(WMath.cpp)
+zephyr_sources(WString.cpp)
+
+endif()
+

cores/scirocco/IPAddress.cpp

@@ -19,6 +19,8 @@
 #include "Print.h"
 #include "IPAddress.h"
 
+#if defined(CONFIG_NET_IPV4) || defined(CONFIG_NET_IPV6)
+
 #include <zephyr.h>
 #pragma GCC diagnostic ignored "-Wparentheses"
 #include <net/net_ip.h>
@@ -227,3 +229,5 @@ const IPAddress IN6ADDR::INKLOCAL_ALLROUTERS_INIT(0xff02,0,0,0, 0,0,0,2);
 const IPAddress IN6ADDR::INTERFACELOCAL_ALLNODES_INIT(0xff01,0,0,0, 0,0,0,1);
 const IPAddress IN6ADDR::INTERFACELOCAL_ALLROUTERS_INIT(0xff01,0,0,0, 0,0,0,2);
 const IPAddress IN6ADDR::SITELOCAL_ALLROUTERS_INIT(0xff05,0,0,0, 0,0,0,2);
+
+#endif

cores/scirocco/IPAddress.h

@@ -28,6 +28,8 @@
 #include "Printable.h"
 #include "WString.h"
 
+#if defined(CONFIG_NET_IPV4) || defined(CONFIG_NET_IPV6)
+
 struct z_in_addr {
   union {
 #if defined(CONFIG_NET_IPV6)
@@ -158,3 +160,5 @@ const IN6ADDR IN6ADDR;
 #endif
 
 #endif
+
+#endif

cores/scirocco/UartDevice.cpp

@@ -21,6 +21,8 @@
 #include "UartDevice.h"
 #include "Arduino.h"
 
+#ifdef CONFIG_UART_INTERRUPT_DRIVEN
+
 Uart::Uart(struct device *_s)
 {
 	uart = _s;
@@ -202,3 +204,5 @@ size_t Uart::write(const uint8_t data)
 {
 	return write(&data, 1);
 }
+
+#endif

cores/scirocco/UartDevice.h

@@ -19,6 +19,8 @@
 
 #pragma once
 
+#ifdef __cplusplus
+
 #include <zephyr.h>
 #include <uart.h>
 #include "HardwareSerial.h"
@@ -72,3 +74,5 @@ class Uart : public HardwareSerial
     SercomParityMode extractParity(uint8_t config);
 #endif
 };
+
+#endif

cores/scirocco/WInterrupts.h

@@ -20,7 +20,6 @@
 #define _WIRING_INTERRUPTS_
 
 #include <stdint.h>
-#include "wiring_private.h"
 
 #ifdef __cplusplus
 extern "C" {
@@ -41,21 +40,15 @@ typedef void (*voidFuncPtr)(void);
  * \brief Specifies a named Interrupt Service Routine (ISR) to call when an interrupt occurs.
  *        Replaces any previous function that was attached to the interrupt.
  */
-inline void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode) { w_attach_interrupt(pin, callback, mode); }
+void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode);
 
 /*
  * \brief Turns off the given interrupt.
  */
-inline void detachInterrupt(uint32_t pin) { w_detach_interrupt(pin); }
+void detachInterrupt(uint32_t pin);
 
 #ifdef __cplusplus
 }
-
-inline void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode, uint32_t pinmode, uint32_t extraflag=0)
-{
-	w_configure_gpio_interrupt(pin, callback, mode, pinmode, extraflag);
-}
-
 #endif
 
 #endif

cores/scirocco/main.cpp

@@ -27,6 +27,8 @@ void initVariant() { }
 // Initialize C library
 extern "C" void __libc_init_array(void);
 
+#ifdef CONFIG_ARDUINO_MAIN_LOOP
+
 /*
  * \brief Main entry point of Arduino application
  */
@@ -57,3 +59,5 @@ int main( void )
 
   return 0;
 }
+
+#endif

cores/scirocco/wiring.c

@@ -1,5 +1,3 @@
-#include "Arduino.h"
-
-void init()
+void __attribute__((__weak__)) init()
 {
 }

cores/scirocco/wiring_analog.c

@@ -27,7 +27,7 @@ extern "C" {
 #include <adc.h>
 #include <pwm.h>
 
-static int pwm_resolution = 255;
+#ifdef CONFIG_ADC
 
 void analogReference( eAnalogReference ulMode )
 {
@@ -58,9 +58,26 @@ void _analogReadResolution(int res)
 	adc_channel_setup(NULL, &cfg);
 }
 
+#endif
+
+#ifdef CONFIG_PWM
+
+struct pindev { int pin; char* name; };
+static struct pindev pwm_pinmap[] = W_PWM_PIN2DEV_MAP;
+
+static char* pwm_dev_name(int pin)
+{
+	for(int i=0; i<sizeof(pwm_pinmap)/sizeof(struct pindev); i++) {
+		if(pwm_pinmap[i].pin == pin) return pwm_pinmap[i].name;
+	}
+	return NULL;
+}
+
+static int pwm_resolution = 255;
+
 void analogWrite( uint32_t ulPin, uint32_t ulValue )
 {
-	struct device* dev = device_get_binding(W_PWM_DEV_NAME(ulPin));
+	struct device* dev = device_get_binding(pwm_dev_name(ulPin));
 	if(!dev) return;
 
 	pwm_pin_set_cycles(dev, ulPin, pwm_resolution, ulValue);
@@ -72,6 +89,7 @@ void analogWriteResolution(int res)
 }
 
 
+#endif
 
 
 #ifdef __cplusplus

cores/scirocco/wiring_private.c renamed to cores/scirocco/wiring_digital.c

@@ -5,12 +5,39 @@
 #include "wiring_private.h"
 #include "WInterrupts.h"
 
-int w_pin_mode[W_GPIO_PIN_NUM] = { 0 };
-struct w_gpio_callbacks w_callbacks[W_GPIO_PIN_NUM] = { 0 };
+#ifndef W_GPIO_PINS_PER_PORT
+#define W_GPIO_PINS_PER_PORT 32
+#endif
+
+#ifndef W_GPIO_PORT_NUM
+#define W_GPIO_PORT_NUM (sizeof(gpio_port_names)/sizeof(const char*))
+#endif
+
+#ifndef W_PIN2PORT
+#define W_PIN2PORT(x) (gpio_port_names[x / W_GPIO_PINS_PER_PORT])
+#endif
+
+#ifndef W_PIN2PORTPIN
+#define W_PIN2PORTPIN(x) (x % W_GPIO_PINS_PER_PORT)
+#endif
+
+#ifndef W_GPIO_PIN_NUM
+#define W_GPIO_PIN_NUM (W_GPIO_PINS_PER_PORT * W_GPIO_PORT_NUM)
+#endif
+
+
+struct w_gpio_callbacks {
+	struct gpio_callback z_callback;
+	voidFuncPtr callback;
+};
+
+static const char* gpio_port_names[] = W_GPIO_PORT_NAMES;
+static int w_pin_mode[W_GPIO_PIN_NUM] = { 0 };
+static struct w_gpio_callbacks w_callbacks[W_GPIO_PIN_NUM] = { 0 };
 
 static void gpio_handler(struct device *port, struct gpio_callback *cb, u32_t pins)
 {
-	for(int i=0; i<W_GPIO_PIN_NUM; i++)
+	for(uint32_t i=0; i<W_GPIO_PIN_NUM; i++)
 	{
 		if( (&w_callbacks[i].z_callback) == cb) {
 			w_callbacks[i].callback();
@@ -71,29 +98,40 @@ void w_configure_gpio_interrupt(uint32_t pin, voidFuncPtr callback, uint32_t int
 		gpio_pin_enable_callback(device_get_binding(W_PIN2PORT(pin)), pin);
 	}
 	else {
-		w_detach_interrupt(pin);
+		detachInterrupt(pin);
 	}
 
 }
 
-void w_attach_interrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
+void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode)
 {
 	uint32_t pinmode = w_pin_mode[pin];
 	w_configure_gpio_interrupt(pin, callback, mode, pinmode, 0);
 }
-
-void w_detach_interrupt(uint32_t pin)
+/*
+void attachInterrupt(uint32_t pin, voidFuncPtr callback, uint32_t mode, uint32_t pinmode, uint32_t extraflag)
+{
+	w_configure_gpio_interrupt(pin, callback, mode, pinmode, extraflag);
+}
+*/
+void detachInterrupt(uint32_t pin)
 {
 	gpio_pin_disable_callback(device_get_binding(W_PIN2PORT(pin)), pin);
 	gpio_remove_callback(device_get_binding(W_PIN2PORT(pin)), &w_callbacks[pin].z_callback);
 }
 
-void w_digital_write( uint32_t ulPin, uint32_t ulVal )
+void pinMode( uint32_t dwPin, uint32_t dwMode )
+{
+	w_configure_gpio_interrupt(dwPin, NULL, -1, dwMode, 0);
+}
+
+
+void digitalWrite( uint32_t ulPin, uint32_t ulVal )
 {
 	gpio_pin_write(device_get_binding(W_PIN2PORT(ulPin)), W_PIN2PORTPIN(ulPin), ulVal ? 1 : 0);
 }
 
-int w_digital_read( uint32_t ulPin )
+int digitalRead( uint32_t ulPin )
 {
 	u32_t value;
 	gpio_pin_read(device_get_binding(W_PIN2PORT(ulPin)), W_PIN2PORTPIN(ulPin), &value);

cores/scirocco/wiring_digital.h

@@ -19,8 +19,6 @@
 #ifndef _WIRING_DIGITAL_
 #define _WIRING_DIGITAL_
 
-#include "wiring_private.h"
-
 #ifdef __cplusplus
  extern "C" {
 #endif
@@ -33,7 +31,7 @@
  * \param ulPin The number of the pin whose mode you wish to set
  * \param ulMode Can be INPUT, OUTPUT, INPUT_PULLUP or INPUT_PULLDOWN
  */
-inline void pinMode( uint32_t dwPin, uint32_t dwMode ) { w_configure_gpio_interrupt(dwPin, NULL, -1, dwMode, 0); }
+extern void pinMode( uint32_t dwPin, uint32_t dwMode ) ;
 
 /**
  * \brief Write a HIGH or a LOW value to a digital pin.
@@ -55,7 +53,7 @@ inline void pinMode( uint32_t dwPin, uint32_t dwMode ) { w_configure_gpio_interr
  * \param dwPin the pin number
  * \param dwVal HIGH or LOW
  */
-inline void digitalWrite( uint32_t dwPin, uint32_t dwVal ) { w_digital_write(dwPin, dwVal); }
+extern void digitalWrite( uint32_t dwPin, uint32_t dwVal ) ;
 
 /**
  * \brief Reads the value from a specified digital pin, either HIGH or LOW.
@@ -64,7 +62,7 @@ inline void digitalWrite( uint32_t dwPin, uint32_t dwVal ) { w_digital_write(dwP
  *
  * \return HIGH or LOW
  */
-inline int digitalRead( uint32_t ulPin ) { return w_digital_read(ulPin); }
+extern int digitalRead( uint32_t ulPin ) ;
 
 #ifdef __cplusplus
 }