Merge pull request #7 from jonasniesner/jonasniesner-patch-3

fix pinout

HGD4_reversed/platformio.ini

@@ -19,5 +19,6 @@ lib_deps =
 	adafruit/Adafruit LIS3DH@^1.3.0
 	sparkfun/SparkFun Ambient Light Sensor Arduino Library@^1.0.4
 	https://github.com/stm32duino/LPS22HB
+	vshymanskyy/TinyGSM@^0.12.0
 build_unflags = -DNRF52 -DUSE_LFXO
-build_flags = -DNRF52840_XXAA -DUSE_LFRC
+build_flags = -DNRF52840_XXAA -DUSE_LFRC

HGD4_reversed/src/main.cpp

@@ -8,6 +8,11 @@ LPS22HBSensor lps22hb(&Wire);
 Adafruit_LIS3DH acc1 = Adafruit_LIS3DH(ACCL1_CS);
 Adafruit_LIS3DH acc2 = Adafruit_LIS3DH(ACCL2_CS);
 
+
+void testmodem(){
+  //SerialAT.begin(9600);
+}
+
 void setup() {
   gpioinit();
 }
@@ -17,9 +22,14 @@ void loop() {
   Serial.println("|---------Starting loop---------|");
   //powerupesp();
   //powerupmodem();
+  measureacc();
   measuretemp();
   measurepressure();
   lightsense();
+  Serial.println("vbat");
+  Serial.println(((float)analogRead(VBAT_DIV) / 1000.0) * 6.0);
+  Serial.println("SW");
+  Serial.println(digitalRead(PWR_SW_IN));
   delay(1000);
 }
 
@@ -29,11 +39,10 @@ void wd_handler() {
   digitalWrite(DONE,LOW);
 }
 
-
 void gpioinit(){
   //latch on the main power
   pinMode(PWR_LATCH , OUTPUT);
-  digitalWrite(PWR_LATCH , HIGH);
+  digitalWrite(PWR_LATCH , LOW);
   //setup watchdog feeding
   pinMode(WAKE, INPUT);
   pinMode(DONE, OUTPUT);
@@ -42,8 +51,9 @@ void gpioinit(){
   Serial.begin(115200);
   //setup I2C bus
   Wire.begin();
-  //set i2c pins 
-  pinMode(I2C_SDA, OUTPUT);
+  //power up sensors
+  pinMode(SENSOR_PWR, OUTPUT);
+  digitalWrite(SENSOR_PWR, HIGH);
   //needed for some boards
   wd_handler();
   //set up leds
@@ -58,6 +68,7 @@ void gpioinit(){
   digitalWrite(ESP_PWR,LOW);
   pinMode(MODEM_PWRKEY,OUTPUT);
   digitalWrite(MODEM_PWRKEY,LOW);
+  pinMode(PWR_SW_IN, INPUT);
 }
 
 void powerupesp(){
@@ -181,4 +192,4 @@ void measureacc(){
   Serial.print("X:  "); Serial.print(acc2.x);
   Serial.print("  \tY:  "); Serial.print(acc2.y);
   Serial.print("  \tZ:  "); Serial.print(acc2.z);
-}
+}

HGD4_reversed/src/main.h

@@ -6,10 +6,13 @@
 #include "ens210.h"
 #include "SparkFun_VEML6030_Ambient_Light_Sensor.h"
 #include <LPS22HBSensor.h>
+#include <TinyGsmClient.h>
 
 void measuretemp();
 void measurepressure();
 void lightsense();
 void powerupesp();
 void wd_handler();
-void gpioinit();
+void gpioinit();
+void measureacc();
+void powerupmodem();

HGD4_reversed/variants/hgd6/variant.h

@@ -38,35 +38,34 @@ extern "C"
 // PIN setup
 #define GREEN_LED              (0)
 #define RED_LED                (1)
-#define PWR_LATCH              (2)
+#define VBAT_DIV               (2)
 #define ACCL1_CS               (4)
 #define ACCL2_CS               (6)
 #define SPI_MISO               (8)
 #define WAKE                   (9)
 #define DONE                   (10)
+#define SENSOR_PWR             (11)
 #define SPI_CLK                (12)
 #define I2C_SCL                (13)
 #define I2C_SDA                (15)
 #define MODEM_RXD              (17)
 #define MODEM_TXD              (22)
+#define ACC_INT                (26)
 #define MODEM_ESP_PWR          (29)
+#define PWR_LATCH              (31)
 #define DEBUG_RXD              (32)
 #define DEBUG_TXD              (33)
 #define MODEM_PWRKEY           (34)
+#define PWR_SW_IN              (38)
 #define SPI_MOSI               (41)
 #define ESP_RXD                (42)
 #define ESP_TXD                (43)
 #define ESP_PWR                (45)
+#define ESP_GPIO0              (47)
 
-#define PIN_A2               (3)
-#define PIN_A3               (4)
-#define PIN_A4               (5)
-#define PIN_A5               (6)
+#define PIN_A1               (VBAT_DIV)
 
-static const uint8_t A2  = PIN_A2 ;
-static const uint8_t A3  = PIN_A3 ;
-static const uint8_t A4  = PIN_A4 ;
-static const uint8_t A5  = PIN_A5 ;
+static const uint8_t A1  = PIN_A1 ;
 
 #define ADC_RESOLUTION    14
 
@@ -75,6 +74,9 @@ static const uint8_t A5  = PIN_A5 ;
 #define PIN_SERIAL_RX       DEBUG_RXD
 #define PIN_SERIAL_TX       DEBUG_TXD
 
+#define PIN_SERIAL2_RX       MODEM_RXD
+#define PIN_SERIAL2_TX       MODEM_TXD
+
 #define SPI_INTERFACES_COUNT 1
 
 #define PIN_SPI_MISO         SPI_MISO
@@ -97,6 +99,12 @@ static const uint8_t SDA = PIN_WIRE_SDA;
 static const uint8_t SCL = PIN_WIRE_SCL;
 
 #define AL_ADDR 0x29
+#define TINY_GSM_MODEM_BG95
+#define SerialAT Serial1
+#define SerialMon Serial
+#define TINY_GSM_DEBUG SerialMon
+#define GSM_AUTOBAUD_MIN 9600
+#define GSM_AUTOBAUD_MAX 57600
 
 #ifdef __cplusplus
 }