From a65838b44511d5c175dac7b5257b684482d987a4 Mon Sep 17 00:00:00 2001
From: Martino Facchin <m.facchin@arduino.cc>
Date: Mon, 14 Aug 2017 16:31:09 +0200
Subject: [PATCH] remove pmic defaults from initVariant()
---
variants/mkrgsm1400/variant.cpp | 23 +++++------------------
1 file changed, 5 insertions(+), 18 deletions(-)
diff --git a/variants/mkrgsm1400/variant.cpp b/variants/mkrgsm1400/variant.cpp
index e087a8c2..b883e231 100644
--- a/variants/mkrgsm1400/variant.cpp
+++ b/variants/mkrgsm1400/variant.cpp
@@ -180,20 +180,6 @@ SERCOM sercom5(SERCOM5);
#define VOLTAGE_LIMIT_4V36 (0x6 << 3)
#define VOLTAGE_LIMIT_4V04 (0x2 << 3)
-static inline void set_pmic_safe_defaults() {
- PERIPH_WIRE.initMasterWIRE(100000);
- PERIPH_WIRE.enableWIRE();
- pinPeripheral(PIN_WIRE_SDA, g_APinDescription[PIN_WIRE_SDA].ulPinType);
- pinPeripheral(PIN_WIRE_SCL, g_APinDescription[PIN_WIRE_SCL].ulPinType);
-
- PERIPH_WIRE.startTransmissionWIRE( PMIC_ADDRESS, WIRE_WRITE_FLAG );
- PERIPH_WIRE.sendDataMasterWIRE(PMIC_REG02);
- PERIPH_WIRE.sendDataMasterWIRE(0);
- PERIPH_WIRE.prepareCommandBitsWire(WIRE_MASTER_ACT_STOP);
-
- PERIPH_WIRE.disableWIRE();
-}
-
static inline void disable_battery_charging() {
PERIPH_WIRE.initMasterWIRE(100000);
PERIPH_WIRE.enableWIRE();
@@ -210,18 +196,19 @@ static inline void disable_battery_charging() {
#else
-static inline void set_pmic_safe_defaults() {}
static inline void disable_battery_charging() {}
#endif
void initVariant() {
- pinMode(32, INPUT_PULLDOWN);
+
+ pinMode(32, OUTPUT);
+ digitalWrite(32, LOW);
+ pinMode(32, INPUT);
if (analogRead(32) < 800) {
disable_battery_charging();
- } else {
- set_pmic_safe_defaults();
}
+
// Workaround for RTS not being controlled correctly
pinMode(28, OUTPUT);
digitalWrite(28, LOW);
--
GitLab