T-Impulse cleanup

Author: UT2UH

variants/T-IMPULSE-S76G/variant.cpp

@@ -57,13 +57,10 @@ extern const PinDescription g_APinDescription[PINS_COUNT] =
     { GPIOB, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PB7),  STM32L0_GPIO_PIN_PB7,            0,                                             PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //SDA
     { GPIOB, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PB6),  STM32L0_GPIO_PIN_PB6,            0,                                             PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //SCL
     // 16 - Analog pin
-    { GPIOC, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PC4),  STM32L0_GPIO_PIN_PC4,            (PIN_ATTR_EXTI),                               PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_14   },    //BAT_VOL_DET
-    // 17..21 - Special pins (USB_DM, USB_DP, no USB_VBUS, SWD)
+    { GPIOC, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PC4),  STM32L0_GPIO_PIN_PC4,            (PIN_ATTR_EXTI),                               PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_14   },    //PIN_VBAT
+    // 17..18 - Special pins (USB_DM, USB_DP)
     { NULL,  STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PA11), STM32L0_GPIO_PIN_PA11,           (PIN_ATTR_EXTI),                               PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //DM
     { NULL,  STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PA12), STM32L0_GPIO_PIN_PA12,           (PIN_ATTR_EXTI),                               PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //DP
-    { NULL,  0,                                            STM32L0_GPIO_PIN_NONE,           0,                                             PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //VBUS_USB
-    { GPIOA, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PA13), STM32L0_GPIO_PIN_PA13,           (PIN_ATTR_SWD | PIN_ATTR_EXTI),                PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //SWCLK
-    { GPIOA, STM32L0_GPIO_PIN_MASK(STM32L0_GPIO_PIN_PA14), STM32L0_GPIO_PIN_PA14,           (PIN_ATTR_SWD | PIN_ATTR_EXTI),                PWM_INSTANCE_NONE,  PWM_CHANNEL_NONE, ADC_CHANNEL_NONE },    //SWDIO
 };
 
 static uint8_t stm32l0_usart4_rx_fifo[32];
@@ -94,13 +91,16 @@ extern const stm32l0_i2c_params_t g_WireParams = {
     },
 };
 
+extern stm32l0_i2c_t g_Wire;
+
 void RadioInit( const RadioEvents_t *events, uint32_t freq )
 {
     SX1276Init(events, freq);
 }
 
 void initVariant()
 {
+    //S76G_Initialize(STM32L0_GPIO_PIN_PD7, STM32L0_GPIO_PIN_NONE);
     // Enable 1V8 Power Switch
     stm32l0_gpio_pin_configure(STM32L0_GPIO_PIN_PB0, (STM32L0_GPIO_PARK_NONE | STM32L0_GPIO_PUPD_NONE | STM32L0_GPIO_OSPEED_LOW | STM32L0_GPIO_OTYPE_PUSHPULL | STM32L0_GPIO_MODE_OUTPUT));
     stm32l0_gpio_pin_write(STM32L0_GPIO_PIN_PB0, 1);
@@ -129,6 +129,9 @@ void initVariant()
     // Set Ant Rx/Tx switch to Rx Mode
     stm32l0_gpio_pin_configure(STM32L0_GPIO_PIN_PA1, (STM32L0_GPIO_PARK_NONE | STM32L0_GPIO_PUPD_NONE | STM32L0_GPIO_OSPEED_LOW | STM32L0_GPIO_OTYPE_PUSHPULL | STM32L0_GPIO_MODE_OUTPUT));
     stm32l0_gpio_pin_write(STM32L0_GPIO_PIN_PA1, 1);
+    // Disable TCXO_EN pin
+    //stm32l0_gpio_pin_configure(STM32L0_GPIO_PIN_PD7, (STM32L0_GPIO_PARK_NONE | STM32L0_GPIO_PUPD_NONE | STM32L0_GPIO_OSPEED_LOW | STM32L0_GPIO_OTYPE_PUSHPULL | STM32L0_GPIO_MODE_OUTPUT));
+    //stm32l0_gpio_pin_write(STM32L0_GPIO_PIN_PD7, 0);
     // Configure RESET as input
     stm32l0_gpio_pin_configure(STM32L0_GPIO_PIN_PB10, (STM32L0_GPIO_PARK_NONE | STM32L0_GPIO_MODE_ANALOG));
     armv6m_core_udelay(6000);   // Wait 6 ms

variants/T-IMPULSE-S76G/variant.h

@@ -42,20 +42,20 @@
 #define STM32L0_CONFIG_PIN_VBAT           STM32L0_GPIO_PIN_PC4
 #define STM32L0_CONFIG_CHANNEL_VBAT       STM32L0_ADC_CHANNEL_14
 #define STM32L0_CONFIG_VBAT_PERIOD        40
-#define STM32L0_CONFIG_VBAT_SCALE         ((float)1.27)
+#define STM32L0_CONFIG_VBAT_SCALE         ((float)2.08)
 
 #define STM32L0_CONFIG_PIN_GNSS_ENABLE    STM32L0_GPIO_PIN_PA3
-#define STM32L0_CONFIG_PIN_LEV_SHIFT_EN   STM32L0_GPIO_PIN_PC6
+#define STM32L0_CONFIG_PIN_LSHIFTER_EN    STM32L0_GPIO_PIN_PC6
 #define STM32L0_CONFIG_PIN_GNSS_PPS       STM32L0_GPIO_PIN_PB5
 #define STM32L0_CONFIG_PIN_GNSS_RX        STM32L0_GPIO_PIN_PC11_USART4_RX
 #define STM32L0_CONFIG_PIN_GNSS_TX        STM32L0_GPIO_PIN_PC10_USART4_TX
-#define GPS_PWR_SWITCH          (2ul)   //PA3
-#define GPS_LEVEL_SHIFTER_EN    (3ul)   //PC6
-#define GPS_RST                 (4ul)   //PB2
-#define GPS_RX                  (5ul)   //PC11
-#define GPS_TX                  (6ul)   //PC10
-#define GPS_PPS                 (7ul)   //PB5
-#define GPS_BAUD_RATE           115200
+#define GPS_PWR_SWITCH                    (2ul)
+#define GPS_LEVEL_SHIFTER_EN              (3ul)
+#define GPS_RST                           (4ul)
+#define GPS_RX                            (5ul)
+#define GPS_TX                            (6ul)
+#define GPS_PPS                           (7ul)
+#define GPS_BAUD_RATE                     115200
 
 #define USBCON
 
@@ -81,15 +81,16 @@ extern "C"
  *----------------------------------------------------------------------------*/
 
 // Number of pins defined in PinDescription array
-#define PINS_COUNT           (22u)
-#define NUM_DIGITAL_PINS     (21u)
+#define PINS_COUNT           (19u)
+#define NUM_DIGITAL_PINS     (18u)
 #define NUM_ANALOG_INPUTS    (1u)
 #define NUM_ANALOG_OUTPUTS   (0u)
 
 /*
  * Analog pins
  */
 #define PIN_A0               (16ul)
+#define PIN_VBAT             (16ul)
 
 static const uint8_t A0  = PIN_A0;
 
@@ -132,8 +133,6 @@ static const uint8_t SCL = PIN_WIRE_SCL;
  */
 #define PIN_USB_DM           (17ul)
 #define PIN_USB_DP           (18ul) 
-#define PIN_USB_VBUS         (19ul)
-
 
 #ifdef __cplusplus
 }