heltec: First working state

robert-hh · robert-hh · commit c990ae92e412 · 2020-09-20T21:55:35.000+02:00
Target: Heltec wireless, may work on the heltec lora
too. No success for hetler wireless lite yet.

Add definitions for the DIO1 and DIO2 lines
Changed files as little as possible to include
the changes for the heltec hardware

The board mimics as LOPY. In order to create the firware, run

make BOARD=LOPY

Tested: Raw LORA send and receive.
ToDo:
1. Test LoraWAN
2. Tidy up the code. Make a HELTEC board type.
3. Make the extra pins on heltec boards available
diff --git a/drivers/sx127x/sx1276/sx1276.c b/drivers/sx127x/sx1276/sx1276.c
@@ -188,7 +188,10 @@ SX1276_t SX1276;
 /*!
  * Hardware DIO IRQ callback initialization
  */
-DioIrqHandler *DioIrq[] = { SX1276OnDioIrq };
+// DioIrqHandler *DioIrq[] = { SX1276OnDioIrq };
+DioIrqHandler *DioIrq[] = { SX1276OnDio0Irq, SX1276OnDio1Irq,
+                            SX1276OnDio2Irq, SX1276OnDio3Irq,
+                            SX1276OnDio4Irq, NULL };
 
 /*!
  * Tx and Rx timers
@@ -979,8 +982,8 @@ void SX1276Reset( void )
         // Wait 2 ms
         DelayMs( 2 );
 
-        // Configure RESET as input
-        GpioInit( &SX1276.Reset, RADIO_RESET, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
+        // Set Reset Pin to 1 (previous: Configure RESET as input)
+        GpioInit( &SX1276.Reset, RADIO_RESET, PIN_OUTPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
 
         // Wait 6 ms
         DelayMs( 6 );
diff --git a/drivers/sx127x/sx1276/sx1276.h b/drivers/sx127x/sx1276/sx1276.h
@@ -123,6 +123,8 @@ typedef struct SX1276_s
 {
     Gpio_t        Reset;
     Gpio_t        DIO;
+    Gpio_t        DIO1;
+    Gpio_t        DIO2;
     Spi_t         Spi;
     RadioSettings_t Settings;
     uint32_t      irqFlags;
diff --git a/esp32/application.mk b/esp32/application.mk
@@ -312,7 +312,7 @@ APP_ETHERNET_SRC_C = $(addprefix mods/,\
 	)
 
 APP_SX1272_SRC_C = $(addprefix drivers/sx127x/,\
-	sx1272/sx1272.c \
+	sx1276/sx1276.c \
 	)
 
 APP_SX1276_SRC_C = $(addprefix drivers/sx127x/,\
@@ -528,8 +528,16 @@ ifeq ($(BOARD), ESP32)
 endif
 ifeq ($(BOARD), LOPY)
     APP_BIN = $(BUILD)/lopy.bin
+	CFLAGS += -DESP32_GENERIC -DHELTEC
+# set FLASH size set by make parameter.
+	ifeq ($(FLASH_SIZE), 8MB)
+		CFLAGS += -DMICROPY_HW_FLASH_SIZE=0x800000
+	endif
+	ifeq ($(FLASH_SIZE), 4MB)
+		CFLAGS += -DMICROPY_HW_FLASH_SIZE=0x400000
+	endif
 endif
-ifeq ($(BOARD), LOPY4)
+ifeq ($(BOARD), LOPY4)  # modification for Heltec boards
     APP_BIN = $(BUILD)/lopy4.bin
     ifeq ($(MOD_SIGFOX_ENABLED), 1)
         $(BUILD)/sigfox/radio_sx127x.o: CFLAGS = $(CFLAGS_SIGFOX)
diff --git a/esp32/boards/LOPY/mpconfigboard.h b/esp32/boards/LOPY/mpconfigboard.h
@@ -9,12 +9,12 @@
 
 #define LOPY
 
-#define MICROPY_HW_BOARD_NAME                                   "LoPy"
+#define MICROPY_HW_BOARD_NAME                                   "Heltec Wireless Stick"
 #define MICROPY_PY_SYS_PLATFORM                                 "LoPy"
 #define MICROPY_HW_HB_PIN_NUM                                   (0)
 #define MICROPY_HW_SAFE_PIN_NUM                                 (21)
 
-#define DEFAULT_AP_SSID                                         "lopy-wlan"
+#define DEFAULT_AP_SSID                                         "heltec-wlan"
 
 #define MICROPY_LPWAN_DIO_PIN
 
@@ -31,6 +31,14 @@ extern uint32_t micropy_lpwan_dio_pin_num;
 extern uint32_t micropy_lpwan_dio_pin_index;
 extern void * micropy_lpwan_dio_pin;
 
+extern uint32_t micropy_lpwan_dio1_pin_num;
+extern uint32_t micropy_lpwan_dio1_pin_index;
+extern void * micropy_lpwan_dio1_pin;
+
+extern uint32_t micropy_lpwan_dio2_pin_num;
+extern uint32_t micropy_lpwan_dio2_pin_index;
+extern void * micropy_lpwan_dio2_pin;
+
 extern uint32_t micropy_lpwan_ncs_pin_num;
 extern uint32_t micropy_lpwan_ncs_pin_index;
 extern void * micropy_lpwan_ncs_pin;
diff --git a/esp32/boards/LOPY/pins.csv b/esp32/boards/LOPY/pins.csv
@@ -19,6 +19,5 @@ G31,GPI35,P17
 G30,GPI34,P18
 G6,GPIO32,P19
 G7,GPIO33,P20
-G8,GPIO26,P21
 G9,GPIO25,P22
 G10,GPIO14,P23
diff --git a/esp32/boards/make-pins.py b/esp32/boards/make-pins.py
@@ -139,7 +139,8 @@ 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] == 'GPIO23':
+                if row[pinname_col] in ('GPIO14', 'GPIO18', 'GPIO26'):
                     pin.board_pin = True
                 self.cpu_pins.append(NamedPin(row[pinname_col], pin))
 #                af_idx = 0
diff --git a/esp32/bootloader/bootloader.c b/esp32/bootloader/bootloader.c
@@ -415,7 +415,7 @@ static bool find_active_image(bootloader_state_t *bs, esp_partition_pos_t *parti
         // bootmgr_verify! (so that the changes are not saved to flash)
         ESP_LOGI(TAG, "Checking safe boot pin");
         uint32_t ActiveImg = boot_info->ActiveImg;
-        uint32_t safeboot = wait_for_safe_boot (boot_info, &ActiveImg);
+        uint32_t safeboot = 0; // wait_for_safe_boot (boot_info, &ActiveImg);
         if (safeboot > 0) {
             ESP_LOGI(TAG, "Safe boot requested!");
         }
@@ -432,7 +432,6 @@ static bool find_active_image(bootloader_state_t *bs, esp_partition_pos_t *parti
                 return false;
             }
         }
-
         // load the selected active image
         memcpy(partition, &bs->image[ActiveImg], sizeof(esp_partition_pos_t));
         return true;
diff --git a/esp32/lora/board.c b/esp32/lora/board.c
@@ -45,12 +45,12 @@ void BoardInitMcu( void )
 {
     if( McuInitialized == false )
     {
-    #if defined(LOPY) || defined (FIPY)
-        SpiInit( &SX1272.Spi, RADIO_MOSI, RADIO_MISO, RADIO_SCLK, NC );
-        SX1272IoInit( );
-    #elif defined(LOPY4)
+    #if defined(LOPY4) || defined(HELTEC)
         SpiInit( &SX1276.Spi, RADIO_MOSI, RADIO_MISO, RADIO_SCLK, NC );
         SX1276IoInit( );
+    #elif defined(LOPY) || defined (FIPY)
+        SpiInit( &SX1272.Spi, RADIO_MOSI, RADIO_MISO, RADIO_SCLK, NC );
+        SX1272IoInit( );
     #endif
 
         TimerHwInit( );
@@ -61,12 +61,12 @@ void BoardInitMcu( void )
 
 void BoardDeInitMcu( void )
 {
-#if defined(LOPY) || defined (FIPY)
-    SpiDeInit( &SX1272.Spi );
-    SX1272IoDeInit( );
-#elif defined(LOPY4)
+#if defined(LOPY4) || defined(HELTEC)
     SpiDeInit( &SX1276.Spi );
     SX1276IoDeInit( );
+#elif defined(LOPY) || defined (FIPY)
+    SpiDeInit( &SX1272.Spi );
+    SX1272IoDeInit( );
 #endif
 
     McuInitialized = false;
diff --git a/esp32/lora/board.h b/esp32/lora/board.h
@@ -43,7 +43,10 @@ Maintainer: Miguel Luis and Gregory Cristian
 #include "lora/system/spi.h"
 #include "lora/system/delay.h"
 #include "radio.h"
-#if defined(LOPY) || defined (FIPY)
+#if defined(HELTEC)
+#include "sx1276/sx1276.h"
+#include "sx1276-board.h"
+#elif defined(LOPY) || defined (FIPY)
 #include "sx1272/sx1272.h"
 #include "sx1272-board.h"
 #elif defined(LOPY4)
@@ -72,6 +75,8 @@ Maintainer: Miguel Luis and Gregory Cristian
 #define RADIO_NSS                                   micropy_lpwan_ncs_pin_index
 
 #define RADIO_DIO                                   micropy_lpwan_dio_pin_index
+#define RADIO_DIO1                                  micropy_lpwan_dio1_pin_index
+#define RADIO_DIO2                                  micropy_lpwan_dio2_pin_index
 #endif
 
 void BoardInitPeriph( void );
diff --git a/esp32/lora/gpio-board.c b/esp32/lora/gpio-board.c
@@ -31,12 +31,14 @@ Maintainer: Miguel Luis and Gregory Cristian
 #include "pins.h"
 
 pin_obj_t *gpio_board_map[NBR_GP_PINS] = {
-        &pin_GPIO17,
+        &pin_GPIO14,
         &pin_GPIO18,
-        &pin_GPIO23,
+        &pin_GPIO26,
         &pin_GPIO5,
         &pin_GPIO27,
         &pin_GPIO19,
+        &pin_GPI35,
+        &pin_GPI34,
 };
 
 /*!
diff --git a/esp32/lora/pinName-board.h b/esp32/lora/pinName-board.h
@@ -34,6 +34,6 @@ Maintainer: Miguel Luis and Gregory Cristian
  * ESP32 Pin Names
  */
 #define MCU_PINS \
-    GPIO17 = 0, GPIO18, GPIO23, GPIO5, GPIO27, GPIO19, NBR_GP_PINS
+    GPIO14 = 0, GPIO18, GPIO26, GPIO5, GPIO27, GPIO19, GPI35, GPI34, NBR_GP_PINS
 
 #endif // __PIN_NAME_MCU_H__
diff --git a/esp32/lora/spi-board.c b/esp32/lora/spi-board.c
@@ -87,7 +87,7 @@ void SpiInit( Spi_t *obj, PinNames mosi, PinNames miso, PinNames sclk, PinNames
                            .bitOrder = SpiBitOrder_MSBFirst, .halfMode = SpiWorkMode_Full};
 #else
     // configure the SPI port
-    spi_attr_t spi_attr = {.mode = SpiMode_Master, .subMode = SpiSubMode_0, .speed = SpiSpeed_10MHz,
+    spi_attr_t spi_attr = {.mode = SpiMode_Master, .subMode = SpiSubMode_0, .speed = SpiSpeed_8MHz,
                            .bitOrder = SpiBitOrder_MSBFirst, .halfMode = SpiWorkMode_Full};
 #endif
     spi_init((uint32_t)obj->Spi, &spi_attr);
diff --git a/esp32/lora/sx1272-board.c b/esp32/lora/sx1272-board.c
@@ -16,7 +16,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 #include "board.h"
 #include "esp_attr.h"
 
-#if defined(LOPY) || defined (FIPY)
+#if (defined(LOPY) || defined (FIPY)) && !defined(HELTEC)
 
 #include "radio.h"
 #include "sx1272/sx1272.h"
diff --git a/esp32/lora/sx1276-board.c b/esp32/lora/sx1276-board.c
@@ -16,7 +16,7 @@ Maintainer: Miguel Luis and Gregory Cristian
 #include "board.h"
 #include "esp_attr.h"
 
-#if defined(LOPY4)
+#if defined(LOPY4) || defined(HELTEC)
 
 #include "radio.h"
 #include "sx1276/sx1276.h"
@@ -60,18 +60,25 @@ DRAM_ATTR const struct Radio_s Radio =
 void SX1276IoInit( void )
 {
     GpioInit( &SX1276.Spi.Nss, RADIO_NSS, PIN_OUTPUT, PIN_PUSH_PULL, PIN_PULL_UP, 1 );
-    GpioInit( &SX1276.DIO, RADIO_DIO, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 0 );
+    GpioInit( &SX1276.Reset, RADIO_RESET, PIN_OUTPUT, PIN_PUSH_PULL, PIN_NO_PULL, 1 );
+    GpioInit( &SX1276.DIO, RADIO_DIO, PIN_INPUT, PIN_PUSH_PULL, PIN_PULL_UP, 0 );
+    GpioInit( &SX1276.DIO1, RADIO_DIO1, PIN_INPUT, PIN_PUSH_PULL, PIN_PULL_UP, 0 );
+    GpioInit( &SX1276.DIO2, RADIO_DIO2, PIN_INPUT, PIN_PUSH_PULL, PIN_PULL_UP, 0 );
 }
 
 void SX1276IoIrqInit( DioIrqHandler **irqHandlers )
 {
     GpioSetInterrupt( &SX1276.DIO, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[0] );
+    GpioSetInterrupt( &SX1276.DIO1, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[1] );
+    GpioSetInterrupt( &SX1276.DIO2, IRQ_RISING_EDGE, IRQ_HIGH_PRIORITY, irqHandlers[2] );
 }
 
 void SX1276IoDeInit( void )
 {
     GpioInit( &SX1276.Spi.Nss, RADIO_NSS, PIN_OUTPUT, PIN_PUSH_PULL, PIN_PULL_UP, 1 );
     GpioInit( &SX1276.DIO, RADIO_DIO, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 0 );
+    GpioInit( &SX1276.DIO1, RADIO_DIO1, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 0 );
+    GpioInit( &SX1276.DIO2, RADIO_DIO2, PIN_INPUT, PIN_PUSH_PULL, PIN_NO_PULL, 0 );
 }
 
 void SX1276SetRfTxPower( int8_t power )
diff --git a/esp32/lora/sx1276-board.h b/esp32/lora/sx1276-board.h
@@ -20,6 +20,13 @@ Maintainer: Miguel Luis and Gregory Cristian
  *
  * \remark Can be automatically generated by the SX1276 GUI (not yet implemented)
  */
+
+#ifdef HELTEC  // The heltec device ses an XTAL, therefore REG_LR_TCXO -> 0x09
+#define REG_LR_TCXO_DEFAULT 0x09
+#else // Pycom device use an TCXO, therefore REG_LR_TCXO must be set to 0x19
+#define REG_LR_TCXO_DEFAULT 0x19
+#endif
+
 #define RADIO_INIT_REGISTERS_VALUE                \
 {                                                 \
     { MODEM_FSK , REG_LNA                , 0x23 },\
@@ -37,9 +44,9 @@ Maintainer: Miguel Luis and Gregory Cristian
     { MODEM_FSK , REG_IMAGECAL           , 0x02 },\
     { MODEM_FSK , REG_DIOMAPPING1        , 0x00 },\
     { MODEM_FSK , REG_DIOMAPPING2        , 0x30 },\
-    { MODEM_LORA, REG_LR_TCXO            , 0x19 },\
+    { MODEM_LORA, REG_LR_TCXO            , REG_LR_TCXO_DEFAULT },\
     { MODEM_LORA, REG_LR_PAYLOADMAXLENGTH, 0x40 },\
-}                                                 \
+}    
 
 #define RF_MID_BAND_THRESH                          525000000
 
diff --git a/esp32/main.c b/esp32/main.c
@@ -95,6 +95,14 @@ uint32_t micropy_lpwan_dio_pin_num;
 uint32_t micropy_lpwan_dio_pin_index;
 void * micropy_lpwan_dio_pin;
 
+uint32_t micropy_lpwan_dio1_pin_num;
+uint32_t micropy_lpwan_dio1_pin_index;
+void * micropy_lpwan_dio1_pin;
+
+uint32_t micropy_lpwan_dio2_pin_num;
+uint32_t micropy_lpwan_dio2_pin_index;
+void * micropy_lpwan_dio2_pin;
+
 uint32_t micropy_lpwan_ncs_pin_num;
 uint32_t micropy_lpwan_ncs_pin_index;
 void * micropy_lpwan_ncs_pin;
@@ -166,6 +174,28 @@ void app_main(void) {
     // printf("SPI RAM size : 0x%x\n", esp32_get_spiram_size());
     // printf("Reported Chip revision : %d\n", esp32_get_chip_rev());
 
+#if defined(HELTEC)
+    micropy_lpwan_ncs_pin_index = 1;  // pin index überprüfen
+    micropy_lpwan_ncs_pin_num = 18;
+    micropy_lpwan_ncs_pin = &pin_GPIO18;
+
+    micropy_lpwan_reset_pin_index = 0;
+    micropy_lpwan_reset_pin_num = 14;
+    micropy_lpwan_reset_pin = &pin_GPIO14;
+    micropy_lpwan_use_reset_pin = true;
+
+    micropy_lpwan_dio_pin_index = 2;
+    micropy_lpwan_dio_pin_num = 26;
+    micropy_lpwan_dio_pin = &pin_GPIO26;
+
+    micropy_lpwan_dio1_pin_index = 6;
+    micropy_lpwan_dio1_pin_num = 35;
+    micropy_lpwan_dio1_pin = &pin_GPI35;
+
+    micropy_lpwan_dio2_pin_index = 7;
+    micropy_lpwan_dio2_pin_num = 34;
+    micropy_lpwan_dio2_pin = &pin_GPI34;
+#else
 #ifndef ESP32_GENERIC
     if (esp32_get_chip_rev() > 0) {
         micropy_hw_antenna_diversity_pin_num = MICROPY_SECOND_GEN_ANT_SELECT_PIN_NUM;
@@ -195,6 +225,7 @@ void app_main(void) {
         micropy_lpwan_dio_pin_num = 23;
         micropy_lpwan_dio_pin = &pin_GPIO23;
     }
+#endif
 #endif
 
     if (esp32_get_spiram_size() >= 4194304) {
diff --git a/esp32/mods/machpin.c b/esp32/mods/machpin.c
@@ -132,6 +132,10 @@ void pin_init0(void) {
             if (self == &PIN_MODULE_P5 || self == &PIN_MODULE_P6 || self == &PIN_MODULE_P7) {
                continue;
             }
+        #elif defined(HELTEC)
+            if (self == &PIN_MODULE_P23 || self == &PIN_MODULE_P17 || self == &PIN_MODULE_P18) {
+               continue;
+            }
         #endif
             /* exclude the antenna switch pin from initialization as it is already initialized */
             if((micropy_hw_antenna_diversity_pin_num == MICROPY_SECOND_GEN_ANT_SELECT_PIN_NUM) && (self == &PIN_MODULE_P12))
@@ -344,6 +348,32 @@ STATIC IRAM_ATTR void machpin_intr_process (void* arg) {
         // clear the interrupt
         SET_PERI_REG_MASK(GPIO_STATUS_W1TC_REG, (1 << micropy_lpwan_dio_pin_num));
     }
+#ifdef HELTEC
+    mask = micropy_lpwan_dio1_pin_num - 32;
+    if (gpio_intr_status_h & mask) {
+        if(((pin_obj_t *)micropy_lpwan_dio1_pin)->handler != NULL)
+        {
+            ((void(*)(void))((pin_obj_t *)micropy_lpwan_dio1_pin)->handler)();
+        }
+
+        // clear this bit from the interrupt status
+        gpio_intr_status_h &= ~mask;
+        // clear the interrupt
+        SET_PERI_REG_MASK(GPIO_STATUS1_W1TC_REG, mask);
+    }
+    mask = micropy_lpwan_dio2_pin_num - 32;
+    if (gpio_intr_status_h & mask) {
+        if(((pin_obj_t *)micropy_lpwan_dio2_pin)->handler != NULL)
+        {
+            ((void(*)(void))((pin_obj_t *)micropy_lpwan_dio2_pin)->handler)();
+        }
+
+        // clear this bit from the interrupt status
+        gpio_intr_status_h &= ~mask;
+        // clear the interrupt
+        SET_PERI_REG_MASK(GPIO_STATUS1_W1TC_REG, mask);
+    }
+#endif    
 #endif
 
     mask = 1;
diff --git a/esp32/util/antenna.c b/esp32/util/antenna.c

Original file line number	Diff line number	Diff line change
`@@ -123,6 +123,8 @@ typedef struct SX1276_s`
`123`	`123`	`{`
`124`	`124`	`Gpio_t Reset;`
`125`	`125`	`Gpio_t DIO;`
	`126`	`+ Gpio_t DIO1;`
	`127`	`+ Gpio_t DIO2;`
`126`	`128`	`Spi_t Spi;`
`127`	`129`	`RadioSettings_t Settings;`
`128`	`130`	`uint32_t irqFlags;`
Original file line number	Diff line number	Diff line change
`@@ -415,7 +415,7 @@ static bool find_active_image(bootloader_state_t bs, esp_partition_pos_t parti`
`415`	`415`	`// bootmgr_verify! (so that the changes are not saved to flash)`
`416`	`416`	`ESP_LOGI(TAG, "Checking safe boot pin");`
`417`	`417`	`uint32_t ActiveImg = boot_info->ActiveImg;`
`418`		`- uint32_t safeboot = wait_for_safe_boot (boot_info, &ActiveImg);`
	`418`	`+ uint32_t safeboot = 0; // wait_for_safe_boot (boot_info, &ActiveImg);`
`419`	`419`	`if (safeboot > 0) {`
`420`	`420`	`ESP_LOGI(TAG, "Safe boot requested!");`
`421`	`421`	`}`
`@@ -432,7 +432,6 @@ static bool find_active_image(bootloader_state_t bs, esp_partition_pos_t parti`
`432`	`432`	`return false;`
`433`	`433`	`}`
`434`	`434`	`}`
`435`		`-`
`436`	`435`	`// load the selected active image`
`437`	`436`	`memcpy(partition, &bs->image[ActiveImg], sizeof(esp_partition_pos_t));`
`438`	`437`	`return true;`