[core] Add hardware peripheral availability defines

2023-06-21 17:02:48 +02:00
parent 96412624d9
commit b38a4d5d46
23 changed files with 166 additions and 80 deletions
--- a/cores/beken-7231n/base/lt_defs.h
+++ b/cores/beken-7231n/base/lt_defs.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#error "Don't include this file directly"
+
+#define LT_HW_BLE 1
--- a/cores/beken-7231t/base/lt_defs.h
+++ b/cores/beken-7231t/base/lt_defs.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#error "Don't include this file directly"
+
+#define LT_HW_BLE 1
--- a/cores/beken-7251/base/lt_defs.h
+++ b/cores/beken-7251/base/lt_defs.h
@@ -0,0 +1,5 @@
+#pragma once
+
+#error "Don't include this file directly"
+
+#define LT_HW_BLE 1
--- a/cores/beken-72xx/arduino/libraries/Serial/Serial.cpp
+++ b/cores/beken-72xx/arduino/libraries/Serial/Serial.cpp
@@ -2,10 +2,10 @@

 #include "SerialPrivate.h"

-#if HAS_SERIAL1
+#if LT_HW_UART1
 SerialClass Serial1(UART1_PORT);
 #endif
-#if HAS_SERIAL2
+#if LT_HW_UART2
 SerialClass Serial2(UART2_PORT);
 #endif

--- a/cores/beken-72xx/arduino/src/lt_defs.h
+++ b/cores/beken-72xx/arduino/src/lt_defs.h
@@ -2,7 +2,6 @@

 #error "Don't include this file directly"

-#define LT_ARD_HAS_WIFI	  1
-#define LT_ARD_HAS_SERIAL 1
-
+#define LT_ARD_HAS_WIFI	   1
+#define LT_ARD_HAS_SERIAL  1
 #define LT_ARD_MD5_HOSTAPD 1
--- a/cores/beken-72xx/base/lt_defs.h
+++ b/cores/beken-72xx/base/lt_defs.h
@@ -2,11 +2,16 @@

 #error "Don't include this file directly"

-#define LT_HAS_PRINTF	1
-#define LT_HAS_LWIP		1
-#define LT_HAS_LWIP2	1
-#define LT_HAS_FREERTOS 1
-#define LT_HAS_MBEDTLS	1
+#define LT_HAS_FLASH	 1
+#define LT_HAS_FREERTOS	 1
+#define LT_HAS_LWIP		 1
+#define LT_HAS_LWIP2	 1
+#define LT_HAS_MBEDTLS	 1
+#define LT_HAS_OTA		 1
+#define LT_HAS_PRINTF	 1
+#define LT_HW_DEEP_SLEEP 1
+#define LT_HW_WATCHDOG	 1
+#define LT_HW_WIFI		 1

 #define LT_HEAP_FUNC	xPortGetFreeHeapSize
 #define LT_REALLOC_FUNC pvPortRealloc
--- a/cores/beken-72xx/base/lt_family.h
+++ b/cores/beken-72xx/base/lt_family.h
@@ -2,13 +2,13 @@

 #pragma once

-#include LT_VARIANT_H
+#include <lt_pins.h>

 // Choose the main UART output port
 #ifndef LT_UART_DEFAULT_PORT
-#if HAS_SERIAL2
+#if LT_HW_UART2
 #define LT_UART_DEFAULT_PORT 2
-#elif HAS_SERIAL1
+#elif LT_HW_UART1
 #define LT_UART_DEFAULT_PORT 1
 #else
 #error "No serial port is available"
--- a/cores/common/arduino/libraries/api/Serial/Serial.h
+++ b/cores/common/arduino/libraries/api/Serial/Serial.h
@@ -8,31 +8,6 @@

 using namespace arduino;

-#if HAS_SERIAL0
-#ifndef PIN_SERIAL0_RX
-#define PIN_SERIAL0_RX PIN_INVALID
-#endif
-#ifndef PIN_SERIAL0_TX
-#define PIN_SERIAL0_TX PIN_INVALID
-#endif
-#endif
-#if HAS_SERIAL1
-#ifndef PIN_SERIAL1_RX
-#define PIN_SERIAL1_RX PIN_INVALID
-#endif
-#ifndef PIN_SERIAL1_TX
-#define PIN_SERIAL1_TX PIN_INVALID
-#endif
-#endif
-#if HAS_SERIAL2
-#ifndef PIN_SERIAL2_RX
-#define PIN_SERIAL2_RX PIN_INVALID
-#endif
-#ifndef PIN_SERIAL2_TX
-#define PIN_SERIAL2_TX PIN_INVALID
-#endif
-#endif
-
 class SerialClass : public HardwareSerial {
  private:
 	uint32_t port;
--- a/cores/common/arduino/src/Arduino.h
+++ b/cores/common/arduino/src/Arduino.h
@@ -44,13 +44,13 @@ using namespace arduino;
 #include <Serial.h>

 #if HAS_SERIAL_CLASS
-#if HAS_SERIAL0
+#if LT_HW_UART0
 extern SerialClass Serial0;
 #endif
-#if HAS_SERIAL1
+#if LT_HW_UART1
 extern SerialClass Serial1;
 #endif
-#if HAS_SERIAL2
+#if LT_HW_UART2
 extern SerialClass Serial2;
 #endif
 #endif
--- a/cores/common/arduino/src/wiring/wiring_custom.h
+++ b/cores/common/arduino/src/wiring/wiring_custom.h
@@ -22,7 +22,6 @@ extern "C" {
 #define PIN_UART (1 << 11)

 #define PIN_MODE_ALL 0xFFFFFFFF
-#define PIN_INVALID	 255

 typedef struct PinData_s PinData;

--- a/cores/common/base/libretiny.h
+++ b/cores/common/base/libretiny.h
@@ -44,6 +44,7 @@
 // APIs
 #include "lt_api.h"		  // main API function definitions
 #include "lt_logger.h"	  // UART logger utility
+#include "lt_pins.h"	  // additional pin macros
 #include "lt_posix_api.h" // POSIX compat functions
 // printf silencing methods
 #include <printf_port.h>
--- a/cores/common/base/lt_pins.h
+++ b/cores/common/base/lt_pins.h
@@ -0,0 +1,69 @@
+/* Copyright (c) Kuba Szczodrzyński 2023-06-21. */
+
+#include LT_VARIANT_H
+
+#define PIN_INVALID 255
+
+#define LT_HW_UART0 HAS_SERIAL0
+#define LT_HW_UART1 HAS_SERIAL1
+#define LT_HW_UART2 HAS_SERIAL2
+#define LT_HW_I2C0	HAS_WIRE0
+#define LT_HW_I2C1	HAS_WIRE1
+#define LT_HW_I2C2	HAS_WIRE2
+#define LT_HW_SPI0	HAS_SPI0
+#define LT_HW_SPI1	HAS_SPI1
+#define LT_HW_SPI2	HAS_SPI2
+
+#if LT_HW_UART0
+#ifndef PIN_SERIAL0_RX
+#define PIN_SERIAL0_RX PIN_INVALID
+#endif
+#ifndef PIN_SERIAL0_TX
+#define PIN_SERIAL0_TX PIN_INVALID
+#endif
+#endif
+
+#if LT_HW_UART1
+#ifndef PIN_SERIAL1_RX
+#define PIN_SERIAL1_RX PIN_INVALID
+#endif
+#ifndef PIN_SERIAL1_TX
+#define PIN_SERIAL1_TX PIN_INVALID
+#endif
+#endif
+
+#if LT_HW_UART2
+#ifndef PIN_SERIAL2_RX
+#define PIN_SERIAL2_RX PIN_INVALID
+#endif
+#ifndef PIN_SERIAL2_TX
+#define PIN_SERIAL2_TX PIN_INVALID
+#endif
+#endif
+
+#if LT_HW_I2C0
+#ifndef PIN_WIRE0_SDA
+#define PIN_WIRE0_SDA PIN_INVALID
+#endif
+#ifndef PIN_WIRE0_SCL
+#define PIN_WIRE0_SCL PIN_INVALID
+#endif
+#endif
+
+#if LT_HW_I2C1
+#ifndef PIN_WIRE1_SDA
+#define PIN_WIRE1_SDA PIN_INVALID
+#endif
+#ifndef PIN_WIRE1_SCL
+#define PIN_WIRE1_SCL PIN_INVALID
+#endif
+#endif
+
+#if LT_HW_I2C2
+#ifndef PIN_WIRE2_SDA
+#define PIN_WIRE2_SDA PIN_INVALID
+#endif
+#ifndef PIN_WIRE2_SCL
+#define PIN_WIRE2_SCL PIN_INVALID
+#endif
+#endif
--- a/cores/realtek-amb/arduino/src/main.cpp
+++ b/cores/realtek-amb/arduino/src/main.cpp
@@ -7,7 +7,7 @@ extern "C" {

 osThreadId main_tid = 0;

-#if LT_AUTO_DOWNLOAD_REBOOT && LT_ARD_HAS_SERIAL && defined(PIN_SERIAL2_RX) && defined(PIN_SERIAL2_TX)
+#if LT_AUTO_DOWNLOAD_REBOOT && LT_ARD_HAS_SERIAL && LT_HW_UART2
 void lt_init_arduino() {
 	// initialize auto-download-reboot parser
 	Serial2.begin(115200);
--- a/cores/realtek-amb/base/lt_defs.h
+++ b/cores/realtek-amb/base/lt_defs.h
@@ -2,7 +2,9 @@

 #error "Don't include this file directly"

-#define LT_HAS_PRINTF 1
+#define LT_HAS_FLASH   1
+#define LT_HW_WATCHDOG 1
+#define LT_HW_WIFI	   1

 #define LT_HEAP_FUNC	xPortGetFreeHeapSize
 #define LT_REALLOC_FUNC pvPortReAlloc
--- a/cores/realtek-ambz/arduino/libraries/Serial/Serial.cpp
+++ b/cores/realtek-ambz/arduino/libraries/Serial/Serial.cpp
@@ -2,13 +2,13 @@

 #include "SerialPrivate.h"

-#if HAS_SERIAL0
+#if LT_HW_UART0
 SerialClass Serial0(0, PIN_SERIAL0_RX, PIN_SERIAL0_TX);
 #endif
-#if HAS_SERIAL1
+#if LT_HW_UART1
 SerialClass Serial1(1, PIN_SERIAL1_RX, PIN_SERIAL1_TX);
 #endif
-#if HAS_SERIAL2
+#if LT_HW_UART2
 SerialClass Serial2(2, PIN_SERIAL2_RX, PIN_SERIAL2_TX);
 #endif

--- a/cores/realtek-ambz/arduino/src/lt_defs.h
+++ b/cores/realtek-ambz/arduino/src/lt_defs.h
@@ -2,6 +2,5 @@

 #error "Don't include this file directly"

-#define LT_ARD_HAS_SERIAL 1
-
+#define LT_ARD_HAS_SERIAL	1
 #define LT_ARD_MD5_POLARSSL 1
--- a/cores/realtek-ambz/base/lt_defs.h
+++ b/cores/realtek-ambz/base/lt_defs.h
@@ -2,7 +2,9 @@

 #error "Don't include this file directly"

+#define LT_HAS_FREERTOS 1
 #define LT_HAS_LWIP		1
 #define LT_HAS_LWIP2	1
-#define LT_HAS_FREERTOS 1
 #define LT_HAS_MBEDTLS	1
+#define LT_HAS_OTA		1
+#define LT_HAS_PRINTF	1
--- a/cores/realtek-ambz/base/lt_family.h
+++ b/cores/realtek-ambz/base/lt_family.h
@@ -2,15 +2,15 @@

 #pragma once

-#include LT_VARIANT_H
+#include <lt_pins.h>

 // Choose the main UART output port
 #ifndef LT_UART_DEFAULT_PORT
-#if HAS_SERIAL2
+#if LT_HW_UART2
 #define LT_UART_DEFAULT_PORT 2
-#elif HAS_SERIAL0
+#elif LT_HW_UART0
 #define LT_UART_DEFAULT_PORT 0
-#elif HAS_SERIAL1
+#elif LT_HW_UART1
 #define LT_UART_DEFAULT_PORT 1
 #else
 #error "No serial port is available"
--- a/cores/realtek-ambz2/arduino/libraries/Serial/Serial.cpp
+++ b/cores/realtek-ambz2/arduino/libraries/Serial/Serial.cpp
@@ -2,13 +2,13 @@

 #include "SerialPrivate.h"

-#if HAS_SERIAL0
+#if LT_HW_UART0
 SerialClass Serial0(0, PIN_SERIAL0_RX, PIN_SERIAL0_TX);
 #endif
-#if HAS_SERIAL1
+#if LT_HW_UART1
 SerialClass Serial1(1, PIN_SERIAL1_RX, PIN_SERIAL1_TX);
 #endif
-#if HAS_SERIAL2
+#if LT_HW_UART2
 SerialClass Serial2(2, PIN_SERIAL2_RX, PIN_SERIAL2_TX);
 #endif

--- a/cores/realtek-ambz2/arduino/src/lt_defs.h
+++ b/cores/realtek-ambz2/arduino/src/lt_defs.h
@@ -3,8 +3,7 @@
 #error "Don't include this file directly"

 #define LT_ARD_HAS_SERIAL	  1
-#define LT_ARD_HAS_WIFI		  1
 #define LT_ARD_HAS_SOFTSERIAL 0
+#define LT_ARD_HAS_WIFI		  1
 #define LT_ARD_HAS_WIRE		  0
-
-#define LT_ARD_MD5_MBEDTLS 1
+#define LT_ARD_MD5_MBEDTLS	  1
--- a/cores/realtek-ambz2/base/lt_defs.h
+++ b/cores/realtek-ambz2/base/lt_defs.h
@@ -2,7 +2,9 @@

 #error "Don't include this file directly"

+#define LT_HAS_FREERTOS 1
 #define LT_HAS_LWIP		1
 #define LT_HAS_LWIP2	1
-#define LT_HAS_FREERTOS 1
 #define LT_HAS_MBEDTLS	1
+#define LT_HAS_PRINTF	1
+#define LT_HW_BLE		1
--- a/cores/realtek-ambz2/base/lt_family.h
+++ b/cores/realtek-ambz2/base/lt_family.h
@@ -2,15 +2,15 @@

 #pragma once

-#include LT_VARIANT_H
+#include <lt_pins.h>

 // Choose the main UART output port
 #ifndef LT_UART_DEFAULT_PORT
-#if HAS_SERIAL2
+#if LT_HW_UART2
 #define LT_UART_DEFAULT_PORT 2
-#elif HAS_SERIAL0
+#elif LT_HW_UART0
 #define LT_UART_DEFAULT_PORT 0
-#elif HAS_SERIAL1
+#elif LT_HW_UART1
 #define LT_UART_DEFAULT_PORT 1
 #else
 #error "No serial port is available"