Skip to content

Commit 522b843

Browse files
lyusupovlyusupov
committed
[nRF52] update of Seeed T1000-E GPIO pins map
1 parent eea7f42 commit 522b843

File tree

3 files changed

+74
-11
lines changed

3 files changed

+74
-11
lines changed

‎software/firmware/source/SoftRF/src/platform/iomap/Seeed_T1000E.h

+25-9
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,17 @@
33
#define SOC_GPIO_PIN_CONS_T1000_RX _PINNUM(0, 17) // P0.17
44
#define SOC_GPIO_PIN_CONS_T1000_TX _PINNUM(0, 16) // P0.16
55

6+
/* AG3335 */
67
#define SOC_GPIO_PIN_GNSS_T1000_RX _PINNUM(0, 14) // P0.14
78
#define SOC_GPIO_PIN_GNSS_T1000_TX _PINNUM(0, 13) // P0.13
89

910
#define SOC_GPIO_PIN_GNSS_T1000_PPS SOC_UNUSED_PIN
1011
#define SOC_GPIO_PIN_GNSS_T1000_EN _PINNUM(1, 11) // P1.11 active HIGH
12+
#define SOC_GPIO_PIN_GNSS_T1000_OUT _PINNUM(1, 14) // P1.14 RESETB OUT
1113
#define SOC_GPIO_PIN_GNSS_T1000_RST _PINNUM(1, 15) // P1.15 active HIGH
12-
#define SOC_GPIO_PIN_GNSS_T1000_VRTC _PINNUM(0, 8) // P0.08
13-
#define SOC_GPIO_PIN_GNSS_T1000_SINT _PINNUM(1, 12) // P1.12
14-
#define SOC_GPIO_PIN_GNSS_T1000_RINT _PINNUM(0, 15) // P0.15
14+
#define SOC_GPIO_PIN_GNSS_T1000_VRTC _PINNUM(0, 8) // P0.08 VRTC EN
15+
#define SOC_GPIO_PIN_GNSS_T1000_SINT _PINNUM(1, 12) // P1.12 SLEEP Interrupt
16+
#define SOC_GPIO_PIN_GNSS_T1000_RINT _PINNUM(0, 15) // P0.15 RTC Interrupt
1517

1618
/* SPI */
1719
#define SOC_GPIO_PIN_T1000_MOSI _PINNUM(1, 9) // P1.09
@@ -29,21 +31,22 @@
2931
#define SOC_GPIO_PIN_T1000_SCL _PINNUM(0, 27) // P0.27
3032

3133
/* button */
32-
#define SOC_GPIO_PIN_T1000_BUTTON _PINNUM(0, 6) // P0.06
34+
#define SOC_GPIO_PIN_T1000_BUTTON _PINNUM(0, 6) // P0.06 Key IO, must be configured as input_pulldown
3335

3436
/* LED */
3537
#define SOC_GPIO_LED_T1000_GREEN _PINNUM(0, 24) // P0.24 active HIGH
38+
#define SOC_GPIO_LED_T1000_RED _PINNUM(0, 3) // P0.03 NC?
3639

3740
/* ADC */
38-
#define SOC_GPIO_PIN_T1000_BATTERY _PINNUM(0, 2) // P0.02
39-
#define SOC_GPIO_PIN_T1000_VCC _PINNUM(0, 4) // P0.04
40-
#define SOC_GPIO_PIN_T1000_TEMP _PINNUM(0, 31) // P0.31
41-
#define SOC_GPIO_PIN_T1000_LUX _PINNUM(0, 29) // P0.29
41+
#define SOC_GPIO_PIN_T1000_BATTERY _PINNUM(0, 2) // P0.02 Baterry level dectect
42+
#define SOC_GPIO_PIN_T1000_VCC _PINNUM(0, 4) // P0.04 VCC voltage dectect
43+
#define SOC_GPIO_PIN_T1000_TEMP _PINNUM(0, 31) // P0.31 Temperature Sensor ADC input
44+
#define SOC_GPIO_PIN_T1000_LUX _PINNUM(0, 29) // P0.29 Light Sensor ADC input
4245

4346
#define SOC_ADC_T1000_VOLTAGE_DIV (2.0F) // 100K + 100K voltage divider on VBAT
4447

4548
/* battery charger */
46-
#define SOC_GPIO_PIN_T1000_CHG_PWR _PINNUM(0, 5) // P0.05
49+
#define SOC_GPIO_PIN_T1000_CHG_PWR _PINNUM(0, 5) // P0.05 Charger insert dectect, must be configured as no pullup or pulldown
4750
#define SOC_GPIO_PIN_T1000_CHG_STATUS _PINNUM(1, 3) // P1.03 active LOW
4851
#define SOC_GPIO_PIN_T1000_CHG_DONE _PINNUM(1, 4) // P1.04 active LOW
4952

@@ -57,3 +60,16 @@
5760

5861
/* Sensors */
5962
#define SOC_GPIO_PIN_T1000_3V3_EN _PINNUM(1, 6) // P1.06
63+
64+
/* GD25Q64C (?) or P25Q16H (?) SPI flash */
65+
#define SOC_GPIO_PIN_SFL_T1000_MOSI _PINNUM(0, 21) // P0.21
66+
#define SOC_GPIO_PIN_SFL_T1000_MISO _PINNUM(0, 22) // P0.22
67+
#define SOC_GPIO_PIN_SFL_T1000_SCK _PINNUM(0, 19) // P0.19
68+
#define SOC_GPIO_PIN_SFL_T1000_SS _PINNUM(0, 20) // P0.20
69+
#define SOC_GPIO_PIN_SFL_T1000_HOLD _PINNUM(1, 0) // P1.00
70+
#define SOC_GPIO_PIN_SFL_T1000_WP _PINNUM(0, 23) // P0.23
71+
72+
#define SOC_GPIO_PIN_SFL_T1000_EN _PINNUM(1, 13) // P1.13 active HIGH
73+
74+
/* misc. */
75+
#define SOC_GPIO_PIN_T1000_MCU_RESET _PINNUM(0, 18) // P0.18

‎software/firmware/source/SoftRF/src/platform/nRF52.cpp

+35-2
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,12 @@ static uint8_t mx25_status_config[3] = {0x00, 0x00, 0x00};
250250
enum {
251251
MX25R1635F_INDEX,
252252
ZD25WQ16B_INDEX,
253+
254+
P25Q16H_INDEX,
255+
GD25Q64C_INDEX,
256+
253257
W25Q128JV_INDEX,
258+
254259
EXTERNAL_FLASH_DEVICE_COUNT
255260
};
256261

@@ -259,6 +264,9 @@ static SPIFlash_Device_t possible_devices[] = {
259264
// LilyGO T-Echo
260265
[MX25R1635F_INDEX] = MX25R1635F,
261266
[ZD25WQ16B_INDEX] = ZD25WQ16B,
267+
// Seeed T1000-E
268+
[P25Q16H_INDEX] = P25Q16H,
269+
[GD25Q64C_INDEX] = GD25Q64C,
262270
// LilyGO T-Ultima
263271
[W25Q128JV_INDEX] = W25Q128JV_PM,
264272
};
@@ -803,7 +811,10 @@ static void nRF52_setup()
803811
// digitalWrite(OTG_ENABLE_PIN, HIGH);
804812
} else {
805813
Wire.end();
814+
}
815+
#endif /* EXCLUDE_PMU */
806816

817+
if (nRF52_board != NRF52_LILYGO_TULTIMA) {
807818
#if !defined(EXCLUDE_IMU)
808819
pinMode(SOC_GPIO_PIN_T1000_ACC_EN, INPUT_PULLUP);
809820
delay(5);
@@ -844,10 +855,15 @@ static void nRF52_setup()
844855
NRF_POWER->SYSTEMOFF = 1;
845856
#endif /* ARDUINO_ARCH_MBED */
846857
}
858+
859+
pinMode(SOC_GPIO_PIN_SFL_T1000_EN, OUTPUT);
860+
digitalWrite(SOC_GPIO_PIN_SFL_T1000_EN, HIGH);
861+
862+
// pinMode(SOC_GPIO_LED_T1000_RED, OUTPUT);
863+
// digitalWrite(SOC_GPIO_LED_T1000_RED, HIGH);
847864
}
848865
#endif /* EXCLUDE_IMU */
849866
}
850-
#endif /* EXCLUDE_PMU */
851867

852868
#if !defined(ARDUINO_ARCH_MBED) && !defined(ARDUINO_ARCH_ZEPHYR)
853869
switch (nRF52_board)
@@ -929,6 +945,14 @@ static void nRF52_setup()
929945
SOC_GPIO_PIN_SFL_WP,
930946
SOC_GPIO_PIN_SFL_HOLD);
931947
break;
948+
case NRF52_SEEED_T1000E:
949+
ft = new Adafruit_FlashTransport_QSPI(SOC_GPIO_PIN_SFL_T1000_SCK,
950+
SOC_GPIO_PIN_SFL_T1000_SS,
951+
SOC_GPIO_PIN_SFL_T1000_MOSI,
952+
SOC_GPIO_PIN_SFL_T1000_MISO,
953+
SOC_GPIO_PIN_SFL_T1000_WP,
954+
SOC_GPIO_PIN_SFL_T1000_HOLD);
955+
break;
932956
case NRF52_LILYGO_TULTIMA:
933957
ft = new Adafruit_FlashTransport_QSPI(SOC_GPIO_PIN_SFL_TULTIMA_SCK,
934958
SOC_GPIO_PIN_SFL_TULTIMA_SS,
@@ -938,7 +962,6 @@ static void nRF52_setup()
938962
SOC_GPIO_PIN_SFL_TULTIMA_HOLD);
939963
break;
940964
case NRF52_NORDIC_PCA10059:
941-
case NRF52_SEEED_T1000E:
942965
default:
943966
break;
944967
}
@@ -1606,6 +1629,12 @@ static void nRF52_post_init()
16061629
Serial.flush();
16071630

16081631
} else if (nRF52_board == NRF52_SEEED_T1000E) {
1632+
#if 0
1633+
Serial.println();
1634+
Serial.print (F("SPI FLASH JEDEC ID: "));
1635+
Serial.print (spiflash_id, HEX); Serial.print(" ");
1636+
#endif
1637+
16091638
Serial.println();
16101639
Serial.println(F("Seeed T1000-E Power-on Self Test"));
16111640
Serial.println();
@@ -1619,6 +1648,9 @@ static void nRF52_post_init()
16191648
Serial.print(F("GNSS : "));
16201649
Serial.println(hw_info.gnss == GNSS_MODULE_AG33 ? F("PASS") : F("FAIL"));
16211650
Serial.flush();
1651+
Serial.print(F("FLASH : "));
1652+
Serial.println(hw_info.storage == STORAGE_FLASH ? F("PASS") : F("FAIL"));
1653+
Serial.flush();
16221654

16231655
#if !defined(EXCLUDE_IMU)
16241656
Serial.print(F("IMU : "));
@@ -2040,6 +2072,7 @@ static void nRF52_fini(int reason)
20402072
pinMode(SOC_GPIO_PIN_T1000_SS, INPUT_PULLUP);
20412073

20422074
digitalWrite(SOC_GPIO_LED_T1000_GREEN, 1-LED_STATE_ON);
2075+
pinMode(SOC_GPIO_PIN_SFL_T1000_EN, INPUT);
20432076
pinMode(SOC_GPIO_LED_T1000_GREEN, INPUT);
20442077
break;
20452078

‎software/firmware/source/libraries/Adafruit_SPIFlash/src/flash_devices.h

+14
Original file line numberDiff line numberDiff line change
@@ -526,4 +526,18 @@ typedef struct {
526526
.single_status_byte = false, .is_fram = false, \
527527
}
528528

529+
// Settings for the Puya Semiconductor P25Q16H 2MiB QSPI flash.
530+
// Datasheet:
531+
// https://www.puyasemi.com/uploadfiles/2021/12/202112201130233023.pdf
532+
#define P25Q16H \
533+
{ \
534+
.total_size = (1 << 21), /* 2 MiB */ \
535+
.start_up_time_us = 5000, .manufacturer_id = 0x85, \
536+
.memory_type = 0x60, .capacity = 0x15, .max_clock_speed_mhz = 104, \
537+
.quad_enable_bit_mask = 0x02, .has_sector_protection = false, \
538+
.supports_fast_read = true, .supports_qspi = true, \
539+
.supports_qspi_writes = true, .write_status_register_split = false, \
540+
.single_status_byte = false, .is_fram = false, \
541+
}
542+
529543
#endif // MICROPY_INCLUDED_ATMEL_SAMD_EXTERNAL_FLASH_DEVICES_H

0 commit comments

Comments
 (0)