mirror of
https://github.com/MarekZegare4/MeshCore-Solo.git
synced 2026-11-02 10:51:57 +00:00
Fix T1000-E sensor power pin mapping
This commit is contained in:
@@ -69,10 +69,6 @@ public:
|
|||||||
#ifdef PIN_3V3_ACC_EN
|
#ifdef PIN_3V3_ACC_EN
|
||||||
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
||||||
#endif
|
#endif
|
||||||
#ifdef SENSOR_EN
|
|
||||||
digitalWrite(SENSOR_EN, LOW);
|
|
||||||
#endif
|
|
||||||
|
|
||||||
// set led on and wait for button release before poweroff
|
// set led on and wait for button release before poweroff
|
||||||
#ifdef LED_PIN
|
#ifdef LED_PIN
|
||||||
digitalWrite(LED_PIN, HIGH);
|
digitalWrite(LED_PIN, HIGH);
|
||||||
|
|||||||
@@ -72,7 +72,6 @@ float t1000e_get_temperature(void) {
|
|||||||
unsigned int ntc_v, vcc_v;
|
unsigned int ntc_v, vcc_v;
|
||||||
|
|
||||||
digitalWrite(PIN_3V3_EN, HIGH);
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
digitalWrite(SENSOR_EN, HIGH);
|
|
||||||
analogReference(AR_INTERNAL_3_0);
|
analogReference(AR_INTERNAL_3_0);
|
||||||
analogReadResolution(12);
|
analogReadResolution(12);
|
||||||
delay(10);
|
delay(10);
|
||||||
@@ -80,7 +79,6 @@ float t1000e_get_temperature(void) {
|
|||||||
vcc_v = (rail_v > NTC_REF_VCC) ? NTC_REF_VCC : rail_v;
|
vcc_v = (rail_v > NTC_REF_VCC) ? NTC_REF_VCC : rail_v;
|
||||||
ntc_v = (1000.0 * AREF_VOLTAGE * analogRead(TEMP_SENSOR)) / 4096;
|
ntc_v = (1000.0 * AREF_VOLTAGE * analogRead(TEMP_SENSOR)) / 4096;
|
||||||
digitalWrite(PIN_3V3_EN, LOW);
|
digitalWrite(PIN_3V3_EN, LOW);
|
||||||
digitalWrite(SENSOR_EN, LOW);
|
|
||||||
|
|
||||||
return get_heater_temperature(vcc_v, ntc_v);
|
return get_heater_temperature(vcc_v, ntc_v);
|
||||||
}
|
}
|
||||||
@@ -90,13 +88,11 @@ uint32_t t1000e_get_light(void) {
|
|||||||
unsigned int lux_v = 0;
|
unsigned int lux_v = 0;
|
||||||
|
|
||||||
digitalWrite(PIN_3V3_EN, HIGH);
|
digitalWrite(PIN_3V3_EN, HIGH);
|
||||||
digitalWrite(SENSOR_EN, HIGH);
|
|
||||||
analogReference(AR_INTERNAL_3_0);
|
analogReference(AR_INTERNAL_3_0);
|
||||||
analogReadResolution(12);
|
analogReadResolution(12);
|
||||||
delay(10);
|
delay(10);
|
||||||
lux_v = 1000 * analogRead(LUX_SENSOR) * AREF_VOLTAGE / 4096;
|
lux_v = 1000 * analogRead(LUX_SENSOR) * AREF_VOLTAGE / 4096;
|
||||||
lux = get_light_lv(lux_v);
|
lux = get_light_lv(lux_v);
|
||||||
digitalWrite(SENSOR_EN, LOW);
|
|
||||||
digitalWrite(PIN_3V3_EN, LOW);
|
digitalWrite(PIN_3V3_EN, LOW);
|
||||||
|
|
||||||
return lux;
|
return lux;
|
||||||
|
|||||||
@@ -14,7 +14,7 @@ const uint32_t g_ADigitalPinMap[PINS_COUNT + 1] =
|
|||||||
1, // P0.01
|
1, // P0.01
|
||||||
2, // P0.02, AIN0 BATTERY_PIN
|
2, // P0.02, AIN0 BATTERY_PIN
|
||||||
3, // P0.03
|
3, // P0.03
|
||||||
4, // P0.04, SENSOR_EN
|
4, // P0.04
|
||||||
5, // P0.05, EXT_PWR_DETEC
|
5, // P0.05, EXT_PWR_DETEC
|
||||||
6, // P0.06, PIN_BUTTON1
|
6, // P0.06, PIN_BUTTON1
|
||||||
7, // P0.07, LORA_BUSY
|
7, // P0.07, LORA_BUSY
|
||||||
@@ -77,7 +77,6 @@ void initVariant()
|
|||||||
pinMode(PIN_3V3_EN, OUTPUT);
|
pinMode(PIN_3V3_EN, OUTPUT);
|
||||||
pinMode(PIN_3V3_ACC_EN, OUTPUT);
|
pinMode(PIN_3V3_ACC_EN, OUTPUT);
|
||||||
pinMode(BUZZER_EN, OUTPUT);
|
pinMode(BUZZER_EN, OUTPUT);
|
||||||
pinMode(SENSOR_EN, OUTPUT);
|
|
||||||
pinMode(GPS_EN, OUTPUT);
|
pinMode(GPS_EN, OUTPUT);
|
||||||
pinMode(GPS_RESET, OUTPUT);
|
pinMode(GPS_RESET, OUTPUT);
|
||||||
pinMode(GPS_VRTC_EN, OUTPUT);
|
pinMode(GPS_VRTC_EN, OUTPUT);
|
||||||
@@ -88,7 +87,6 @@ void initVariant()
|
|||||||
digitalWrite(PIN_3V3_EN, LOW);
|
digitalWrite(PIN_3V3_EN, LOW);
|
||||||
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
digitalWrite(PIN_3V3_ACC_EN, LOW);
|
||||||
digitalWrite(BUZZER_EN, LOW);
|
digitalWrite(BUZZER_EN, LOW);
|
||||||
digitalWrite(SENSOR_EN, LOW);
|
|
||||||
digitalWrite(GPS_EN, LOW);
|
digitalWrite(GPS_EN, LOW);
|
||||||
digitalWrite(GPS_RESET, LOW);
|
digitalWrite(GPS_RESET, LOW);
|
||||||
digitalWrite(GPS_VRTC_EN, LOW);
|
digitalWrite(GPS_VRTC_EN, LOW);
|
||||||
|
|||||||
@@ -120,7 +120,6 @@
|
|||||||
////////////////////////////////////////////////////////////////////////////////
|
////////////////////////////////////////////////////////////////////////////////
|
||||||
// Temp+Lux Sensor
|
// Temp+Lux Sensor
|
||||||
|
|
||||||
#define SENSOR_EN (4) // P0.4
|
|
||||||
#define TEMP_SENSOR (31) // P0.31/AIN7
|
#define TEMP_SENSOR (31) // P0.31/AIN7
|
||||||
#define LUX_SENSOR (29) // P0.29/AIN5
|
#define LUX_SENSOR (29) // P0.29/AIN5
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user