PaulStoffregen/Time
1
0
Fork 1
mirror of https://github.com/PaulStoffregen/Time.git synced 2025-07-29 13:47:13 +02:00
Code Issues Packages Projects Releases Wiki Activity

Improve DateStrings, reply on Arduino.h to define PROGMEM, etc

Browse Source
This commit is contained in:
PaulStoffregen
2019-08-11 17:11:48 -07:00
parent 98c6ec9740
commit f11f6fc1de
1 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
DateStrings.cpp
View File

@ -9,22 +9,18 @@
* *
*/ */
#if defined(__AVR__) #include <Arduino.h>
#include <avr/pgmspace.h>
#else // Arduino.h should properly define PROGMEM, PGM_P, strcpy_P, pgm_read_byte, pgm_read_ptr
// for compatiblity with Arduino Due and Teensy 3.0 and maybe others? // But not all platforms define these as they should. If you find a platform needing these
// defined, or if any this becomes unnecessary as platforms improve, please send a pull req.
#if defined(ESP8266)
#undef PROGMEM
#define PROGMEM #define PROGMEM
#define PGM_P const char *
#define pgm_read_byte(addr) (*(const unsigned char *)(addr))
#define pgm_read_word(addr) (*(const unsigned char **)(addr))
#if defined(ESP8266) || defined(ARDUINO_ARCH_ESP32)
#ifndef strcpy_P
#define strcpy_P(dest, src) strcpy((dest), (src))
#endif #endif
#endif
#endif
#include <string.h> // for strcpy_P or strcpy
#include "TimeLib.h" #include "TimeLib.h"
// the short strings for each day or month must be exactly dt_SHORT_STR_LEN // the short strings for each day or month must be exactly dt_SHORT_STR_LEN
#define dt_SHORT_STR_LEN 3 // the length of short strings #define dt_SHORT_STR_LEN 3 // the length of short strings
@ -73,7 +69,7 @@ const char dayShortNames_P[] PROGMEM = "ErrSunMonTueWedThuFriSat";
char* monthStr(uint8_t month) char* monthStr(uint8_t month)
{ {
strcpy_P(buffer, (PGM_P)pgm_read_word(&(monthNames_P[month]))); strcpy_P(buffer, (PGM_P)pgm_read_ptr(&(monthNames_P[month])));
return buffer; return buffer;
} }
@ -87,7 +83,7 @@ char* monthShortStr(uint8_t month)
char* dayStr(uint8_t day) char* dayStr(uint8_t day)
{ {
strcpy_P(buffer, (PGM_P)pgm_read_word(&(dayNames_P[day]))); strcpy_P(buffer, (PGM_P)pgm_read_ptr(&(dayNames_P[day])));
return buffer; return buffer;
} }