Skip to content

Commit a5f4007

Browse files
authored
Update CI and SAMD board defs (#1302)
1 parent e8c1a16 commit a5f4007

File tree

3 files changed

+44
-10
lines changed

3 files changed

+44
-10
lines changed

MyConfig.h

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -703,8 +703,7 @@
703703
//#define MY_RFM69_RST_PIN (9)
704704

705705
#ifdef MY_RF69_RESET
706-
// legacy, older board files
707-
// not enabled now: #warning MY_RF69_RESET is depreciated, please use MY_RFM69_RST_PIN instead.
706+
#warning MY_RF69_RESET is depreciated, please use MY_RFM69_RST_PIN instead.
708707
#define MY_RFM69_RST_PIN MY_RF69_RESET
709708
#endif
710709

@@ -720,8 +719,7 @@
720719
*/
721720
#ifndef MY_RFM69_IRQ_PIN
722721
#ifdef MY_RF69_IRQ_PIN
723-
// legacy, older board files
724-
// not enabled now: #warning MY_RF69_IRQ_PIN is depreciated, please use MY_RFM69_IRQ_PIN instead.
722+
#warning MY_RF69_IRQ_PIN is depreciated, please use MY_RFM69_IRQ_PIN instead.
725723
#define MY_RFM69_IRQ_PIN MY_RF69_IRQ_PIN
726724
#else
727725
#define MY_RFM69_IRQ_PIN DEFAULT_RFM69_IRQ_PIN
@@ -734,8 +732,7 @@
734732
*/
735733
#ifndef MY_RFM69_IRQ_NUM
736734
#ifdef MY_RF69_IRQ_NUM
737-
// legacy, older board files
738-
// not enabled now: #warning MY_RF69_IRQ_NUM is depreciated, please use MY_RFM69_IRQ_NUM instead.
735+
#warning MY_RF69_IRQ_NUM is depreciated, please use MY_RFM69_IRQ_NUM instead.
739736
#define MY_RFM69_IRQ_NUM MY_RF69_IRQ_NUM
740737
#else
741738
#define MY_RFM69_IRQ_NUM digitalPinToInterrupt(MY_RFM69_IRQ_PIN)
@@ -748,8 +745,7 @@
748745
*/
749746
#ifndef MY_RFM69_CS_PIN
750747
#ifdef MY_RF69_SPI_CS
751-
// legacy, older board files
752-
// not enabled now: #warning MY_RF69_SPI_CS is depreciated, please use MY_RFM69_CS_PIN instead.
748+
#warning MY_RF69_SPI_CS is depreciated, please use MY_RFM69_CS_PIN instead.
753749
#define MY_RFM69_CS_PIN MY_RF69_SPI_CS
754750
#else
755751
#define MY_RFM69_CS_PIN DEFAULT_RFM69_CS_PIN

core/MyProtocol.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ bool protocolSerial2MyMessage(MyMessage &message, char *inputString)
8585

8686
char *protocolMyMessage2Serial(MyMessage &message)
8787
{
88-
(void)snprintf_P(_fmtBuffer, MY_GATEWAY_MAX_SEND_LENGTH,
88+
(void)snprintf_P(_fmtBuffer, (uint8_t)MY_GATEWAY_MAX_SEND_LENGTH,
8989
PSTR("%" PRIu8 ";%" PRIu8 ";%" PRIu8 ";%" PRIu8 ";%" PRIu8 ";%s\n"), message.sender,
9090
message.sensor, mGetCommand(message), mGetEcho(message), message.type,
9191
message.getString(_convBuffer));
@@ -94,7 +94,7 @@ char *protocolMyMessage2Serial(MyMessage &message)
9494

9595
char *protocolMyMessage2MQTT(const char *prefix, MyMessage &message)
9696
{
97-
(void)snprintf_P(_fmtBuffer, MY_GATEWAY_MAX_SEND_LENGTH,
97+
(void)snprintf_P(_fmtBuffer, (uint8_t)MY_GATEWAY_MAX_SEND_LENGTH,
9898
PSTR("%s/%" PRIu8 "/%" PRIu8 "/%" PRIu8 "/%" PRIu8 "/%" PRIu8 ""), prefix,
9999
message.sender, message.sensor, mGetCommand(message), mGetEcho(message), message.type);
100100
return _fmtBuffer;

hal/architecture/SAMD/MyHwSAMD.h

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,44 @@ extEEPROM eep(MY_EXT_EEPROM_SIZE, 1, MY_EXT_EEPROM_PAGE_SIZE,
5757
#define snprintf_P(s, f, ...) snprintf((s), (f), __VA_ARGS__)
5858
#define vsnprintf_P(s, n, f, ...) vsnprintf((s), (n), (f), __VA_ARGS__)
5959

60+
// redefine 8 bit types of inttypes.h (as of SAMD board defs 1.8.1)
61+
#undef PRId8
62+
#undef PRIi8
63+
#undef PRIo8
64+
#undef PRIu8
65+
#undef PRIx8
66+
#undef PRIX8
67+
#undef PRIdLEAST8
68+
#undef PRIiLEAST8
69+
#undef PRIoLEAST8
70+
#undef PRIuLEAST8
71+
#undef PRIxLEAST8
72+
#undef PRIXLEAST8
73+
#undef PRIdFAST8
74+
#undef PRIiFAST8
75+
#undef PRIoFAST8
76+
#undef PRIuFAST8
77+
#undef PRIxFAST8
78+
#undef PRIXFAST8
79+
#define PRId8 "d"
80+
#define PRIi8 "i"
81+
#define PRIo8 "o"
82+
#define PRIu8 "u"
83+
#define PRIx8 "x"
84+
#define PRIX8 "X"
85+
#define PRIdLEAST8 "d"
86+
#define PRIiLEAST8 "i"
87+
#define PRIoLEAST8 "o"
88+
#define PRIuLEAST8 "u"
89+
#define PRIxLEAST8 "x"
90+
#define PRIXLEAST8 "X"
91+
#define PRIdFAST8 "d"
92+
#define PRIiFAST8 "i"
93+
#define PRIoFAST8 "o"
94+
#define PRIuFAST8 "u"
95+
#define PRIxFAST8 "x"
96+
#define PRIXFAST8 "X"
97+
6098
// Define these as macros to save valuable space
6199
#define hwDigitalWrite(__pin, __value) digitalWrite(__pin, __value)
62100
#define hwDigitalRead(__pin) digitalRead(__pin)

0 commit comments

Comments
 (0)