Added support for TTGO T-Beam V1, and possibly others

Author: nunomcruz

README.md

@@ -142,6 +142,7 @@ You can change the board type by using the BOARD variable:
 We currently support the following BOARD types:
 
 	WIPY LOPY SIPY GPY FIPY LOPY4
+
 
 For OEM modules, please use the following BOARD type:
 
@@ -152,6 +153,13 @@ L04: LOPY4
 G01: GPY
 ```
 
+Additionaly we also support a third party BOARD from TTGO, the T-Beam version 1, please use the following BOARD type:
+
+	TBEAMv1
+
+More info on this board can be found here: https://github.com/LilyGO/TTGO-T-Beam
+
+
 To specify a serial port other than /dev/ttyUSB0, use ESPPORT variable:
 
     $ # On MacOS
@@ -179,7 +187,7 @@ To create a release package that can be flashed with the Pycom firmware tool:
 To create a release package for all currently supported Pycom boards:
 
     $ cd esp32
-    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD release; done
+    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4 TBEAMv1; do make BOARD=$BOARD clean && make BOARD=$BOARD release; done
 
 To specify a directory other than the default build/ directory:
 
@@ -190,7 +198,7 @@ To specify a directory other than the default build/ directory:
 To create a release package for all currently supported Pycom boards in a directory other than the default build/ directory:
 
     $ cd esp32
-    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4; do make BOARD=$BOARD clean && make BOARD=$BOARD RELEASE_DIR=~/pycom-packages release; done
+    $ for BOARD in WIPY LOPY SIPY GPY FIPY LOPY4 TBEAMv1; do make BOARD=$BOARD clean && make BOARD=$BOARD RELEASE_DIR=~/pycom-packages release; done
 
 To inclue a step for copying IDF libs from IDF_PATH specify the following variable in the make command
 

esp32/Makefile

@@ -41,6 +41,10 @@ COPY_IDF_LIB ?= 0
 LTE_LOG_BUFF ?= 0
 RGB_LED ?= enable
 
+ifeq ($(BOARD), $(filter $(BOARD), TBEAMv1))
+    RGB_LED ?= disable
+endif
+
 # by default openthread over LoRa is enabled
 OPENTHREAD = off
 
@@ -88,7 +92,7 @@ CFLAGS_XTENSA = -DESP_PLATFORM -Wpointer-arith -Wall -Werror=all -Wno-error=unus
 CFLAGS_XTENSA_OPT = -Os
 CFLAGS_XTENSA_PSRAM = -mfix-esp32-psram-cache-issue
 
-CFLAGS = $(CFLAGS_XTENSA) $(CFLAGS_XTENSA_PSRAM) $(CFLAGS_XTENSA_OPT) -nostdlib -std=gnu99 -g3 -ggdb -fstrict-volatile-bitfields -Iboards/$(BOARD)
+CFLAGS = $(CFLAGS_XTENSA) $(CFLAGS_XTENSA_PSRAM) $(CFLAGS_XTENSA_OPT) -nostdlib -std=gnu99 -g3 -ggdb -fstrict-volatile-bitfields -Iboards/$(BOARD) -DBOARD_$(BOARD)
 CFLAGS_SIGFOX = $(CFLAGS_XTENSA) -O2 -nostdlib -std=gnu99 -g3 -ggdb -fstrict-volatile-bitfields -Iboards/$(BOARD)
 
 LDFLAGS = -nostdlib -Wl,-Map=$(@:.elf=.map) -Wl,--no-check-sections -u call_user_start_cpu0

esp32/application.mk

@@ -316,13 +316,13 @@ OBJ = $(PY_O)
 ifeq ($(BOARD), $(filter $(BOARD), LOPY FIPY))
 OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1272_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
 endif
-ifeq ($(BOARD), $(filter $(BOARD), LOPY4))
+ifeq ($(BOARD), $(filter $(BOARD), LOPY4 TBEAMv1))
 OBJ += $(addprefix $(BUILD)/, $(APP_LORA_SRC_C:.c=.o) $(APP_LIB_LORA_SRC_C:.c=.o) $(APP_SX1276_SRC_C:.c=.o) $(APP_MODS_LORA_SRC_C:.c=.o))
 endif
 ifeq ($(BOARD), $(filter $(BOARD), SIPY))
 OBJ += $(addprefix $(BUILD)/, $(APP_SIGFOX_MOD_SRC_C:.c=.o))
 endif
-ifeq ($(BOARD), $(filter $(BOARD), LOPY4 FIPY))
+ifeq ($(BOARD), $(filter $(BOARD), LOPY4 FIPY TBEAMv1))
 OBJ += $(addprefix $(BUILD)/, $(APP_SIGFOX_MOD_SRC_C:.c=.o))
 endif
 ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
@@ -331,7 +331,7 @@ endif
 
 # add OPENTHREAD code only if flag enabled and for LOPY, LOPY4 and FIPY
 ifeq ($(OPENTHREAD), on)
-ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY TBEAMv1))
 OBJ += $(addprefix $(BUILD)/, $(APP_LORA_OPENTHREAD_SRC_C:.c=.o) $(APP_MOD_MESH_SRC_C:.c=.o))
 endif
 endif # ifeq ($(OPENTHREAD), on)
@@ -346,18 +346,18 @@ BOOT_OBJ = $(addprefix $(BUILD)/, $(BOOT_SRC_C:.c=.o))
 
 # List of sources for qstr extraction
 SRC_QSTR += $(APP_MODS_SRC_C) $(APP_UTIL_SRC_C) $(APP_STM_SRC_C) $(APP_LIB_SRC_C)
-ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY TBEAMv1))
 SRC_QSTR += $(APP_MODS_LORA_SRC_C)
 endif
-ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY))
+ifeq ($(BOARD), $(filter $(BOARD), SIPY LOPY4 FIPY TBEAMv1))
 SRC_QSTR += $(APP_SIGFOX_MOD_SRC_C)
 endif
 ifeq ($(BOARD),$(filter $(BOARD), FIPY GPY))
 SRC_QSTR += $(APP_MODS_LTE_SRC_C)
 endif
 
 ifeq ($(OPENTHREAD), on)
-ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY))
+ifeq ($(BOARD), $(filter $(BOARD), LOPY LOPY4 FIPY TBEAMv1))
 SRC_QSTR += $(APP_MOD_MESH_SRC_C)
 endif
 endif # ifeq ($(OPENTHREAD), on)
@@ -425,6 +425,14 @@ endif
 ifeq ($(BOARD), LOPY)
     APP_BIN = $(BUILD)/lopy.bin
 endif
+ifeq ($(BOARD), TBEAMv1)
+    APP_BIN = $(BUILD)/tbeamv1.bin
+    $(BUILD)/sigfox/radio_sx127x.o: CFLAGS = $(CFLAGS_SIGFOX)
+    $(BUILD)/sigfox/timer.o: CFLAGS = $(CFLAGS_SIGFOX)
+    $(BUILD)/sigfox/transmission.o: CFLAGS = $(CFLAGS_SIGFOX)
+    $(BUILD)/sigfox/targets/%.o: CFLAGS = $(CFLAGS_SIGFOX)
+    $(BUILD)/lora/spi-board.o: CFLAGS = $(CFLAGS_SIGFOX)
+endif
 ifeq ($(BOARD), LOPY4)
     APP_BIN = $(BUILD)/lopy4.bin
     $(BUILD)/sigfox/radio_sx127x.o: CFLAGS = $(CFLAGS_SIGFOX)
@@ -638,7 +646,7 @@ else
 ifeq ($(BOARD), $(filter $(BOARD), SIPY))
 	$(ECHO) "$(ESPTOOLPY_WRITE_FLASH) 0x0 $(BOOTLOADER_REFLASH_DIGEST_ENC) $(PART_OFFSET) $(PART_BIN_ENCRYPT_8MB) $(APP_OFFSET) $(APP_BIN_ENCRYPT)"
 	$(ECHO) "Generating Encrypted Images for 4MB devices, you can use make flash and it would be handled automatically!"
-endif #($(BOARD), $(filter $(BOARD), SIPY))
+endif #($(BOARD), $(filter $(BOARD), SIPY TBEAMv1))
 	$(ECHO) "$(ESPTOOLPY_WRITE_FLASH) 0x0 $(BOOTLOADER_REFLASH_DIGEST_ENC) $(PART_OFFSET) $(PART_BIN_ENCRYPT_4MB) $(APP_OFFSET) $(APP_BIN_ENCRYPT)"
 endif #ifeq ($(BOARD), $(filter $(BOARD), FIPY GPY LOPY4))
 	$(ECHO) $(SEPARATOR)

esp32/boards/make-pins.py

@@ -139,7 +139,7 @@ def parse_af_file(self, filename, pin_col, pinname_col, af_start_col):
                     raise ValueError("Invalid pin number {:s} in row {:s}".format(row[pin_col]), row)
                 pin = Pin(row[pinname_col], pin_num)
                 # FIXME: hack to force the SX1272 pins to be available
-                if row[pinname_col] == 'GPIO17' or row[pinname_col] == 'GPIO18' or row[pinname_col] == 'GPIO23':
+                if row[pinname_col] == 'GPIO17' or row[pinname_col] == 'GPIO18' or row[pinname_col] == 'GPIO26' or row[pinname_col] == 'GPIO23' or row[pinname_col] == 'GPIO14':
                     pin.board_pin = True
                 self.cpu_pins.append(NamedPin(row[pinname_col], pin))
 #                af_idx = 0

esp32/fatfs/src/drivers/sflash_diskio.c

@@ -48,8 +48,13 @@ DRESULT sflash_disk_init (void) {
     if (!sflash_init_done) {
         // this is how we diferentiate flash sizes in Pycom modules
         if (esp32_get_chip_rev() > 0) {
+#if defined(BOARD_TBEAMv1)
+            sflash_start_address = SFLASH_START_ADDR_4MB;
+            sflash_fs_sector_count = SFLASH_FS_SECTOR_COUNT_4MB;
+#else
             sflash_start_address = SFLASH_START_ADDR_8MB;
             sflash_fs_sector_count = SFLASH_FS_SECTOR_COUNT_8MB;
+#endif
         } else {
             sflash_start_address = SFLASH_START_ADDR_4MB;
             sflash_fs_sector_count = SFLASH_FS_SECTOR_COUNT_4MB;

esp32/ftp/updater.c

@@ -70,7 +70,11 @@ static esp_err_t updater_spi_flash_write(size_t dest_addr, void *src, size_t siz
 bool updater_read_boot_info (boot_info_t *boot_info, uint32_t *boot_info_offset) {
     esp_partition_info_t partition_info[PARTITIONS_COUNT_4MB];
 
+#if defined(BOARD_TBEAMv1)
+    uint8_t part_count = PARTITIONS_COUNT_4MB;
+#else
     uint8_t part_count = (esp32_get_chip_rev() > 0 ? PARTITIONS_COUNT_8MB : PARTITIONS_COUNT_4MB);
+#endif
 
     ESP_LOGV(TAG, "Reading boot info\n");
 
@@ -100,7 +104,11 @@ bool updater_check_path (void *path) {
 
 bool updater_start (void) {
 
+#if defined(BOARD_TBEAMv1)
+    updater_data.size = IMG_SIZE_4MB;
+#else
     updater_data.size = (esp32_get_chip_rev() > 0 ? IMG_SIZE_8MB : IMG_SIZE_4MB);
+#endif
     // check which one should be the next active image
     updater_data.offset = updater_ota_next_slot_address();
 
@@ -245,7 +253,11 @@ bool updater_write_boot_info(boot_info_t *boot_info, uint32_t boot_info_offset)
 
 int updater_ota_next_slot_address() {
 
+#if defined(BOARD_TBEAMv1)
+    int ota_offset = IMG_UPDATE1_OFFSET_4MB;
+#else
     int ota_offset = (esp32_get_chip_rev() > 0 ? IMG_UPDATE1_OFFSET_8MB : IMG_UPDATE1_OFFSET_4MB);
+#endif
 
     // check which one should be the next active image
     if (updater_read_boot_info (&boot_info, &boot_info_offset)) {
@@ -258,15 +270,23 @@ int updater_ota_next_slot_address() {
             }
             else
             {
+#if defined(BOARD_TBEAMv1)
+                ota_offset = IMG_UPDATE1_OFFSET_4MB;
+#else
                 ota_offset = (esp32_get_chip_rev() > 0 ? IMG_UPDATE1_OFFSET_8MB : IMG_UPDATE1_OFFSET_4MB);
+#endif
             }
         }
         else
         {
             if(boot_info.ActiveImg == IMG_ACT_FACTORY)
 
             {
+#if defined(BOARD_TBEAMv1)
+                ota_offset = IMG_UPDATE1_OFFSET_4MB;
+#else
                 ota_offset = (esp32_get_chip_rev() > 0 ? IMG_UPDATE1_OFFSET_8MB : IMG_UPDATE1_OFFSET_4MB);
+#endif
             }
             else
             {

esp32/hal/esp32_mphal.c

@@ -41,7 +41,7 @@
 #include "driver/timer.h"
 
 typedef void (*HAL_tick_user_cb_t)(void);
-#if defined (LOPY) || defined(LOPY4) || defined(FIPY)
+#if defined (LOPY) || defined(LOPY4) || defined(FIPY) || defined (TBEAMv1)
 DRAM_ATTR static HAL_tick_user_cb_t HAL_tick_user_cb;
 
 #define TIMER1_ALARM_TIME_MS        1U
@@ -51,7 +51,7 @@ DRAM_ATTR static HAL_tick_user_cb_t HAL_tick_user_cb;
 #endif
 
 
-#if defined (LOPY) || defined(LOPY4) || defined(FIPY)
+#if defined (LOPY) || defined(LOPY4) || defined(FIPY) || defined (TBEAMv1)
 IRAM_ATTR static void HAL_TimerCallback (void* arg) {
 
     if (HAL_tick_user_cb != NULL) {
@@ -72,7 +72,7 @@ void HAL_set_tick_cb (void *cb) {
 
 void mp_hal_init(bool soft_reset) {
     if (!soft_reset) {
-    #if defined (LOPY) || defined(LOPY4) || defined(FIPY)
+    #if defined (LOPY) || defined(LOPY4) || defined(FIPY) || defined (TBEAMv1)
         // setup the HAL timer for LoRa
         HAL_tick_user_cb = NULL;
 

esp32/hal/esp32_mphal.h

@@ -10,7 +10,7 @@
 #ifndef _INCLUDED_MPHAL_H_
 #define _INCLUDED_MPHAL_H_
 
-#if defined (LOPY) || defined(LOPY4) || defined(FIPY)
+#if defined (LOPY) || defined(LOPY4) || defined(FIPY) || defined (TBEAMv1)
 void HAL_set_tick_cb (void *cb);
 #endif
 void mp_hal_init(bool soft_reset);

esp32/lora/board.c

@@ -48,7 +48,7 @@ void BoardInitMcu( void )
     #if defined(LOPY) || defined (FIPY)
         SpiInit( &SX1272.Spi, RADIO_MOSI, RADIO_MISO, RADIO_SCLK, NC );
         SX1272IoInit( );
-    #elif defined(LOPY4)
+    #elif defined(LOPY4) || defined (TBEAMv1)
         SpiInit( &SX1276.Spi, RADIO_MOSI, RADIO_MISO, RADIO_SCLK, NC );
         SX1276IoInit( );
     #endif
@@ -64,7 +64,7 @@ void BoardDeInitMcu( void )
 #if defined(LOPY) || defined (FIPY)
     SpiDeInit( &SX1272.Spi );
     SX1272IoDeInit( );
-#elif defined(LOPY4)
+#elif defined(LOPY4) || defined (TBEAMv1)
     SpiDeInit( &SX1276.Spi );
     SX1276IoDeInit( );
 #endif

esp32/lora/board.h

@@ -46,7 +46,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 #if defined(LOPY) || defined (FIPY)
 #include "sx1272/sx1272.h"
 #include "sx1272-board.h"
-#elif defined(LOPY4)
+#elif defined(LOPY4) || defined (TBEAMv1)
 #include "sx1276/sx1276.h"
 #include "sx1276-board.h"
 #endif
@@ -63,7 +63,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 /*!
  * Board MCU pins definitions
  */
-#if defined (LOPY) || defined (LOPY4) || defined (FIPY)
+#if defined (LOPY) || defined (LOPY4) || defined (FIPY) || defined (TBEAMv1)
 #define RADIO_RESET                                 micropy_lpwan_reset_pin_index
 
 #define RADIO_MOSI                                  GPIO27