Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
028fe85586 | ||
|
|
27e16c3d1b | ||
|
|
6f9c99edb6 |
No files matched your search
+1
-1
@@ -9,7 +9,7 @@
|
||||
; https://docs.platformio.org/page/projectconf.html
|
||||
|
||||
[common]
|
||||
version = "3.4.5"
|
||||
version = "3.4.6"
|
||||
to_old_version = "3.4.0"
|
||||
|
||||
[env:esp32dev]
|
||||
|
||||
+19
-5
@@ -6,21 +6,35 @@
|
||||
//#define PN532_MOSI 23
|
||||
//#define PN532_SS 5
|
||||
//#define PN532_MISO 19
|
||||
const uint8_t PN532_IRQ = 15; //32 for ESP32 Dev, 15 for ESP32-S3;
|
||||
const uint8_t PN532_RESET = 16; //33 for ESP32 Dev, 16 for ESP32-S3;
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t PN532_IRQ = 15;
|
||||
const uint8_t PN532_RESET = 16;
|
||||
#else
|
||||
const uint8_t PN532_IRQ = 32;
|
||||
const uint8_t PN532_RESET = 33;
|
||||
#endif
|
||||
// ***** PN532
|
||||
|
||||
// ***** HX711 (Waage)
|
||||
// HX711 circuit wiring
|
||||
const uint8_t LOADCELL_DOUT_PIN = 19; //16 for ESP32 Dev, 19 for ESP32-S3;
|
||||
const uint8_t LOADCELL_SCK_PIN = 20; //17 for ESP32 Dev, 20 for ESP32-S3;
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t LOADCELL_DOUT_PIN = 19;
|
||||
const uint8_t LOADCELL_SCK_PIN = 20;
|
||||
#else
|
||||
const uint8_t LOADCELL_DOUT_PIN = 16;
|
||||
const uint8_t LOADCELL_SCK_PIN = 17;
|
||||
#endif
|
||||
const uint8_t calVal_eepromAdress = 0;
|
||||
const uint16_t SCALE_LEVEL_WEIGHT = 500;
|
||||
// ***** HX711
|
||||
|
||||
// ***** TTP223 (Touch Sensor)
|
||||
// TTP223 circuit wiring
|
||||
const uint8_t TTP223_PIN = 7; //25 for ESP32 Dev, 7 for ESP32-S3;
|
||||
#if CONFIG_IDF_TARGET_ESP32S3
|
||||
const uint8_t TTP223_PIN = 7;
|
||||
#else
|
||||
const uint8_t TTP223_PIN = 25;
|
||||
#endif
|
||||
// ***** TTP223
|
||||
|
||||
|
||||
|
||||
+13
@@ -13,6 +13,17 @@
|
||||
//Adafruit_PN532 nfc(PN532_SCK, PN532_MISO, PN532_MOSI, PN532_SS);
|
||||
Adafruit_PN532 nfc(PN532_IRQ, PN532_RESET);
|
||||
|
||||
// Adafruit_PN532::begin() toggles RSTPDN too briefly (~1ms/2ms) for some PN532
|
||||
// modules to reliably leave powerdown, which then makes getFirmwareVersion()
|
||||
// return 0 right after begin(). Pulse it explicitly with more margin first.
|
||||
static void pulsePn532Reset() {
|
||||
pinMode(PN532_RESET, OUTPUT);
|
||||
digitalWrite(PN532_RESET, LOW);
|
||||
delay(50);
|
||||
digitalWrite(PN532_RESET, HIGH);
|
||||
delay(200);
|
||||
}
|
||||
|
||||
TaskHandle_t RfidReaderTask;
|
||||
// AsyncWebServerRequest* volatile activeNfcWriteRequest = nullptr; // Removed
|
||||
SemaphoreHandle_t nfcRequestMutex = NULL;
|
||||
@@ -561,6 +572,7 @@ uint8_t ntag2xx_WriteNDEF(const char *payload) {
|
||||
Serial.println("1. Neuinitialisierung des PN532...");
|
||||
|
||||
// Reinitialize the PN532
|
||||
pulsePn532Reset();
|
||||
nfc.begin();
|
||||
vTaskDelay(pdMS_TO_TICKS(500)); // Give it time to initialize
|
||||
|
||||
@@ -2335,6 +2347,7 @@ void scanRfidTask(void * parameter) {
|
||||
void startNfc() {
|
||||
nfcRequestMutex = xSemaphoreCreateMutex();
|
||||
oledShowProgressBar(4, NUM_SETUP_STEPS, DISPLAY_BOOT_TEXT, tr(STR_NFC_INIT));
|
||||
pulsePn532Reset();
|
||||
nfc.begin(); // Beginne Kommunikation mit RFID Leser
|
||||
|
||||
delay(1000);
|
||||
|
||||
Reference in new issue
Block a user