Skip to content

Commit 595a913

Browse files
pvtexpvtex
committed
LittleFS now fully implemented, set all external librarys to pvtex github repos to keep version, ESP-IDF v5 now full working, bump to version 1.1.3
1 parent 3883a32 commit 595a913

28 files changed

+288
-226
lines changed

‎.gitignore‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -88,4 +88,5 @@ bin/users.png
8888
bin/esp-rfid-users.json
8989
ESP-Debug
9090

91-
infos
91+
infos
92+
ethernet

‎CHANGELOG.md‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
# Change Log
22
All notable changes to this project will be documented in this file.
33

4+
## [1.1.3] - 2024-06-18
5+
- [firmware] ESP-IDF v5 now full working
6+
- [firmware] LittleFS now fully implemented
7+
- [firmware] set all external librarys to pvtex github repos to keep version
48
## [1.1.2] - 2024-06-17
59
- [firmware] handling of unknown tags fixed
610
## [1.1.1] - 2024-06-17

‎README-MQTT.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -501,12 +501,12 @@ On a FS format:
501501
}
502502
```
503503

504-
When saving the configuration on SPIFFS:
504+
When saving the configuration on LittleFS:
505505
```
506506
{
507507
"type":"INFO",
508508
"src":"sys",
509-
"desc":"Config stored in the SPIFFS",
509+
"desc":"Config stored in the LittleFS",
510510
"data":"xxx bytes",
511511
"time":1605991375,
512512
"cmd":"event",

‎bin/debug.bin‎

-37 KB
Binary file not shown.

‎bin/esp32-rfid-settings.json‎

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
{
2+
"command": "configfile",
3+
"network": {
4+
"bssid": "",
5+
"ssid": "esp-rfid",
6+
"wmode": 1,
7+
"hide": 0,
8+
"pswd": "",
9+
"offtime": 0,
10+
"dhcp": 1,
11+
"ip": "",
12+
"subnet": "",
13+
"gateway": "",
14+
"dns": "",
15+
"apip": "192.168.4.1",
16+
"apsubnet": "255.255.255.0",
17+
"fallbackmode": 0
18+
},
19+
"hardware": {
20+
"readertype": 1,
21+
"wgd0pin": 4,
22+
"wgd1pin": 5,
23+
"wifipin": 255,
24+
"rtype": 1,
25+
"ltype": 0,
26+
"rpin": 4,
27+
"rtime": 400,
28+
"doorname": "Door",
29+
"beeperpin": 255,
30+
"ledwaitingpin": 255,
31+
"openlockpin": 255,
32+
"doorbellpin": 255,
33+
"accessdeniedpin": 255,
34+
"useridstoragemode": "hexadecimal",
35+
"requirepincodeafterrfid": 1,
36+
"allowpincodeonly": 0,
37+
"removeparitybits": 1,
38+
"doorstatpin": 255,
39+
"maxOpenDoorTime": 0
40+
},
41+
"general": {
42+
"hostnm": "esp-rfid",
43+
"restart": 0,
44+
"pswd": "admin",
45+
"openinghours": [
46+
"111111111111111111111111",
47+
"111111111111111111111111",
48+
"111111111111111111111111",
49+
"111111111111111111111111",
50+
"111111111111111111111111",
51+
"111111111111111111111111",
52+
"111111111111111111111111"
53+
],
54+
"openinghours2": [
55+
"111111111111111111111111",
56+
"111111111111111111111111",
57+
"111111111111111111111111",
58+
"111111111111111111111111",
59+
"111111111111111111111111",
60+
"111111111111111111111111",
61+
"111111111111111111111111"
62+
]
63+
},
64+
"mqtt": {
65+
"enabled": 0,
66+
"host": "",
67+
"port": 1883,
68+
"topic": "",
69+
"autotopic": 0,
70+
"user": "",
71+
"pswd": "",
72+
"syncrate": 180,
73+
"mqttlog": 0
74+
},
75+
"ntp": {
76+
"server": "pool.ntp.org",
77+
"interval": 30,
78+
"tzinfo": ""
79+
}
80+
}

‎bin/esp32-rfid-users.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"type": "esp32-rfid-userbackup",
3+
"version": "v0.6",
4+
"list": [
5+
{
6+
"uid": "14acc06b",
7+
"acctype": 1,
8+
"acctype2": 0,
9+
"acctype3": 0,
10+
"acctype4": 0,
11+
"username": "bala",
12+
"validsince": 0,
13+
"validuntil": 2145916800,
14+
"pincode": "",
15+
"picctype": 58
16+
}
17+
]
18+
}

‎bin/generic.bin‎

2.47 KB
Binary file not shown.

‎platformio.ini‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,17 @@ upload_speed = 460800
1414
monitor_speed = 115200
1515
partitions = esp32-rfid.csv
1616
lib_deps =
17-
ArduinoJson@6.19.1
17+
https://github.com/pvtex/ArduinoJson
1818
https://github.com/pvtex/ESPAsyncWebServer
1919
https://github.com/pvtex/async-mqtt-client
2020
https://github.com/pvtex/rfid
2121
https://github.com/pvtex/Wiegand-NG-Multi-Bit-Wiegand-Library-for-Arduino
22+
https://github.com/pvtex/Time
23+
https://github.com/pvtex/Bounce2
2224
time
23-
Bounce2@2.52
2425
lib_ignore =
2526
Time
2627

27-
; boards which GPIO0 and RESET controlled using two NPN transistors as nodemcu devkit (includes wemos d1 mini)
2828
[env:generic]
2929
board_build.f_cpu = ${common.f_cpu}
3030
platform = ${common.platform}
@@ -48,7 +48,7 @@ board = ${common.board}
4848
lib_deps = ${common.lib_deps}
4949
build_flags = ${common.build_flags}
5050
-DDEBUG
51-
-DCORE_DEBUG_LEVEL=5
51+
; -DCORE_DEBUG_LEVEL=5
5252
build_src_flags = ${common.build_src_flags}
5353
extra_scripts = scripts/DBGdeploy.py
5454
upload_speed = ${common.upload_speed}

‎src/WiFiEventHandler.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
*/
77

88
#include "WiFiEventHandler.h"
9-
//#include <esp_event.h>
10-
//#include <esp_event_loop.h>
9+
#include <esp_event.h>
10+
#include <esp_event_base.h>
1111
#include "esp_event_legacy.h"
1212
#include <esp_wifi.h>
1313
#include <esp_err.h>

‎src/WiFiEventHandler.h‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,10 +38,11 @@
3838

3939
#ifndef MAIN_WIFIEVENTHANDLER_H_
4040
#define MAIN_WIFIEVENTHANDLER_H_
41-
//#include <esp_event.h>
42-
#include <esp_event_loop.h>
41+
#include <esp_event.h>
42+
#include <esp_event_base.h>
4343
#include "esp_event_legacy.h"
44-
44+
#include "freertos/FreeRTOS.h"
45+
#include "freertos/task.h"
4546

4647
/**
4748
* @brief %WiFi state event handler.

0 commit comments

Comments
 (0)