mirror of
https://github.com/luc-github/ESP3D.git
synced 2026-03-22 15:46:53 +01:00
### Maintenance page
* Add add tab color for mobile view
* Add spellcheck off / autocorect off in input
* Add disconnect button when authenticate enabled
* Add Invalid user or password message when authentication failed
### Board support
* Add ESP32 S2 support
* Add ESP32 S3 support
* Add ESP32 C3 support
### ESP commands
* Add command 701 to control GCODE streaming
* Remove command 901 as duplicate
* Update command 420 to add more details
* Use text as default output
* All json on all commands for formated output
### Core
* Add benchmak function to check transfer speed (for test only-not production)
* Merge code for ESP3DLib support
* Add better printer display support (M117 / Serial TFT)
* Use ESP32 analogWrite instead of emulated one
### Modules
* Display
* Refactor code
* Remove SPI ILI 9341 / 9488 support as not suitable
* Add ST7789 support (135x240 / 240x240)
* Filesystem
* Bug fixes due to esp core updates
* Better SD sharing mecanism
* Better global FS management
* FTP
* Add SD sharing support
* Better global FS management
* GCODE Host
* Add basic support for macro files
* Add ESP command support
* Use not blocking method to stream commands / handle response
* Notifications
* Add IFTTT notification service
* Add WebUI notification
* Add ESP3D display notification
* WebDav
* Add SD sharing support
* Add bug fix from https://github.com/d-a-v/ESPWebDAV
* Better global FS management
* Websocket
* Add function to handle zombies connections
* WiFi
* Fix connection to AP sometime fail
* Fix low signal not diplayed in ESP420 even connected
* Add AP Setup mode
### Libraries
* Update SDFat-2.0.6 to 2.1.2
* Update ESP32SSDP 1.1.1 to 1.2.0
* Update TFT_eSPI-1.4.11 to 2.4.61
* Update arduinoWebSockets-2.3.5 to 2.3.6
* Update esp8266-oled-ssd1306-4.0.0 to 4.3.0
* Remove lvgl support
### Tools
* Add I2C scanner script
* Add python script to simulate/stress printer serial communication
### PlatformIO
* Use latest 4.4.0 Espressif32 release (ESP32-arduino core 2.0.3)
* Add fix for Flash more than 4MB
* Add Esp32 S2/S3/C3 env
* Add ESP32-ST7789 / esp32-TTGO_T_Display env
157 lines
3.9 KiB
C++
157 lines
3.9 KiB
C++
#include "SdFat.h"
|
|
|
|
// SD_FAT_TYPE = 0 for SdFat/File as defined in SdFatConfig.h,
|
|
// 1 for FAT16/FAT32, 2 for exFAT, 3 for FAT16/FAT32 and exFAT.
|
|
#define SD_FAT_TYPE 0
|
|
/*
|
|
Change the value of SD_CS_PIN if you are using SPI and
|
|
your hardware does not use the default value, SS.
|
|
Common values are:
|
|
Arduino Ethernet shield: pin 4
|
|
Sparkfun SD shield: pin 8
|
|
Adafruit SD shields and modules: pin 10
|
|
*/
|
|
|
|
// SDCARD_SS_PIN is defined for the built-in SD on some boards.
|
|
#ifndef SDCARD_SS_PIN
|
|
const uint8_t SD_CS_PIN = SS;
|
|
#else // SDCARD_SS_PIN
|
|
// Assume built-in SD is used.
|
|
const uint8_t SD_CS_PIN = SDCARD_SS_PIN;
|
|
#endif // SDCARD_SS_PIN
|
|
|
|
// Try max SPI clock for an SD. Reduce SPI_CLOCK if errors occur.
|
|
#define SPI_CLOCK SD_SCK_MHZ(50)
|
|
|
|
// Try to select the best SD card configuration.
|
|
#if HAS_SDIO_CLASS
|
|
#define SD_CONFIG SdioConfig(FIFO_SDIO)
|
|
#elif ENABLE_DEDICATED_SPI
|
|
#define SD_CONFIG SdSpiConfig(SD_CS_PIN, DEDICATED_SPI, SPI_CLOCK)
|
|
#else // HAS_SDIO_CLASS
|
|
#define SD_CONFIG SdSpiConfig(SD_CS_PIN, SHARED_SPI, SPI_CLOCK)
|
|
#endif // HAS_SDIO_CLASS
|
|
|
|
#if SD_FAT_TYPE == 0
|
|
SdFat sd;
|
|
File file;
|
|
#elif SD_FAT_TYPE == 1
|
|
SdFat32 sd;
|
|
File32 file;
|
|
#elif SD_FAT_TYPE == 2
|
|
SdExFat sd;
|
|
ExFile file;
|
|
#elif SD_FAT_TYPE == 3
|
|
SdFs sd;
|
|
FsFile file;
|
|
#else // SD_FAT_TYPE
|
|
#error Invalid SD_FAT_TYPE
|
|
#endif // SD_FAT_TYPE
|
|
|
|
char line[40];
|
|
|
|
//------------------------------------------------------------------------------
|
|
// Store error strings in flash to save RAM.
|
|
#define error(s) sd.errorHalt(&Serial, F(s))
|
|
//------------------------------------------------------------------------------
|
|
// Check for extra characters in field or find minus sign.
|
|
char* skipSpace(char* str) {
|
|
while (isspace(*str)) str++;
|
|
return str;
|
|
}
|
|
//------------------------------------------------------------------------------
|
|
bool parseLine(char* str) {
|
|
char* ptr;
|
|
|
|
// Set strtok start of line.
|
|
str = strtok(str, ",");
|
|
if (!str) return false;
|
|
|
|
// Print text field.
|
|
Serial.println(str);
|
|
|
|
// Subsequent calls to strtok expects a null pointer.
|
|
str = strtok(nullptr, ",");
|
|
if (!str) return false;
|
|
|
|
// Convert string to long integer.
|
|
int32_t i32 = strtol(str, &ptr, 0);
|
|
if (str == ptr || *skipSpace(ptr)) return false;
|
|
Serial.println(i32);
|
|
|
|
str = strtok(nullptr, ",");
|
|
if (!str) return false;
|
|
|
|
// strtoul accepts a leading minus with unexpected results.
|
|
if (*skipSpace(str) == '-') return false;
|
|
|
|
// Convert string to unsigned long integer.
|
|
uint32_t u32 = strtoul(str, &ptr, 0);
|
|
if (str == ptr || *skipSpace(ptr)) return false;
|
|
Serial.println(u32);
|
|
|
|
str = strtok(nullptr, ",");
|
|
if (!str) return false;
|
|
|
|
// Convert string to double.
|
|
double d = strtod(str, &ptr);
|
|
if (str == ptr || *skipSpace(ptr)) return false;
|
|
Serial.println(d);
|
|
|
|
// Check for extra fields.
|
|
return strtok(nullptr, ",") == nullptr;
|
|
}
|
|
//------------------------------------------------------------------------------
|
|
void setup() {
|
|
Serial.begin(9600);
|
|
|
|
// Wait for USB Serial
|
|
while (!Serial) {
|
|
yield();
|
|
}
|
|
Serial.println("Type any character to start");
|
|
while (!Serial.available()) {
|
|
yield();
|
|
}
|
|
// Initialize the SD.
|
|
if (!sd.begin(SD_CONFIG)) {
|
|
sd.initErrorHalt(&Serial);
|
|
return;
|
|
}
|
|
// Remove any existing file.
|
|
if (sd.exists("ReadCsvDemo.csv")) {
|
|
sd.remove("ReadCsvDemo.csv");
|
|
}
|
|
// Create the file.
|
|
if (!file.open("ReadCsvDemo.csv", FILE_WRITE)) {
|
|
error("open failed");
|
|
}
|
|
// Write test data.
|
|
file.print(F(
|
|
"abc,123,456,7.89\r\n"
|
|
"def,-321,654,-9.87\r\n"
|
|
"ghi,333,0xff,5.55"));
|
|
|
|
// Rewind file for read.
|
|
file.rewind();
|
|
|
|
while (file.available()) {
|
|
int n = file.fgets(line, sizeof(line));
|
|
if (n <= 0) {
|
|
error("fgets failed");
|
|
}
|
|
if (line[n-1] != '\n' && n == (sizeof(line) - 1)) {
|
|
error("line too long");
|
|
}
|
|
if (!parseLine(line)) {
|
|
error("parseLine failed");
|
|
}
|
|
Serial.println();
|
|
}
|
|
file.close();
|
|
Serial.println(F("Done"));
|
|
}
|
|
|
|
void loop() {
|
|
}
|