Skip to content

Commit 1f07d7e

Browse files
tekka007tekka007
authored
Update debug message table (#965)
1 parent 2d5c4a0 commit 1f07d7e

File tree

6 files changed

+77
-91
lines changed

6 files changed

+77
-91
lines changed

‎core/MySensorsCore.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@
4040
* |E| SYS | SUB | Message | Comment
4141
* |-|-----|-----|---------------------------------------------|----------------------------------------------------------------------------
4242
* |!| MCO | BGN | HW ERR | Error HW initialization (e.g. ext. EEPROM)
43-
* | | MCO | BGN | INIT %%s,CP=%%s,LIB=%%s | Core initialization, capabilities (CP), library version (LIB)
43+
* | | MCO | BGN | INIT %%s,CP=%%s,VER=%%s | Core initialization, capabilities (CP), library version (VER)
4444
* | | MCO | BGN | BFR | Callback before()
4545
* | | MCO | BGN | STP | Callback setup()
4646
* | | MCO | BGN | INIT OK,TSP=%%d | Core initialised, transport status (TSP): 0=not initialised, 1=initialised, NA=not available

‎core/MyTransport.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -31,27 +31,27 @@
3131
* - <b>TSF</b>: messages emitted by transport support functions
3232
* - SUB SYSTEMS:
3333
* - Transport state machine (<b>TSM</b>)
34-
* - TSM:INIT from <b>stInit</b> Initialize transport and radio
35-
* - TSM:FPAR from <b>stParent</b> Find parent
36-
* - TSM:ID from <b>stID</b> Check/request node ID, if dynamic node ID set
37-
* - TSM:UPL from <b>stUplink</b> Verify uplink connection by pinging GW
38-
* - TSM:READY from <b>stReady</b> Transport is ready and fully operational
39-
* - TSM:FAIL from <b>stFailure</b> Failure in transport link or transport HW
34+
* - TSM:<b>INIT</b> from <b>stInit</b> Initialize transport and radio
35+
* - TSM:<b>FPAR</b> from <b>stParent</b> Find parent
36+
* - TSM:<b>ID</b> from <b>stID</b> Check/request node ID, if dynamic node ID set
37+
* - TSM:<b>UPL</b> from <b>stUplink</b> Verify uplink connection by pinging GW
38+
* - TSM:<b>READY</b> from <b>stReady</b> Transport is ready and fully operational
39+
* - TSM:<b>FAIL</b> from <b>stFailure</b> Failure in transport link or transport HW
4040
* - Transport support function (<b>TSF</b>)
41-
* - TSF:CKU from @ref transportCheckUplink(), checks connection to GW
42-
* - TSF:SID from @ref transportAssignNodeID(), assigns node ID
43-
* - TSF:PNG from @ref transportPingNode(), pings a node
44-
* - TSF:WUR from @ref transportWaitUntilReady(), waits until transport is ready
45-
* - TSF:CRT from @ref transportClearRoutingTable(), clears routing table stored in EEPROM
46-
* - TSF:LRT from @ref transportLoadRoutingTable(), loads RAM routing table from EEPROM (only GW/repeaters)
47-
* - TSF:SRT from @ref transportSaveRoutingTable(), saves RAM routing table to EEPROM (only GW/repeaters)
48-
* - TSF:MSG from @ref transportProcessMessage(), processes incoming message
49-
* - TSF:SAN from @ref transportInvokeSanityCheck(), calls transport-specific sanity check
50-
* - TSF:RTE from @ref transportRouteMessage(), sends message
51-
* - TSF:SND from @ref transportSendRoute(), sends message if transport is ready (exposed)
52-
* - TSF:TDI from @ref transportDisable()
53-
* - TSF:TRI from @ref transportReInitialise()
54-
* - TSF:SIR from @ref transportSignalReport()
41+
* - TSF:<b>CKU</b> from @ref transportCheckUplink(), checks connection to GW
42+
* - TSF:<b>SID</b> from @ref transportAssignNodeID(), assigns node ID
43+
* - TSF:<b>PNG</b> from @ref transportPingNode(), pings a node
44+
* - TSF:<b>WUR</b> from @ref transportWaitUntilReady(), waits until transport is ready
45+
* - TSF:<b>CRT</b> from @ref transportClearRoutingTable(), clears routing table stored in EEPROM
46+
* - TSF:<b>LRT</b> from @ref transportLoadRoutingTable(), loads RAM routing table from EEPROM (only GW/repeaters)
47+
* - TSF:<b>SRT</b> from @ref transportSaveRoutingTable(), saves RAM routing table to EEPROM (only GW/repeaters)
48+
* - TSF:<b>MSG</b> from @ref transportProcessMessage(), processes incoming message
49+
* - TSF:<b>SAN</b> from @ref transportInvokeSanityCheck(), calls transport-specific sanity check
50+
* - TSF:<b>RTE</b> from @ref transportRouteMessage(), sends message
51+
* - TSF:<b>SND</b> from @ref transportSendRoute(), sends message if transport is ready (exposed)
52+
* - TSF:<b>TDI</b> from @ref transportDisable()
53+
* - TSF:<b>TRI</b> from @ref transportReInitialise()
54+
* - TSF:<b>SIR</b> from @ref transportSignalReport()
5555
*
5656
* Transport debug log messages:
5757
*

‎drivers/RF24/RF24.h

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MySensors Arduino library handles the wireless radio link and protocol
33
* between your home built sensors/actuators and HA controller of choice.
44
* The sensors forms a self healing radio network with optional repeaters. Each
@@ -34,26 +34,26 @@
3434
* RF24 driver-related log messages, format: [!]SYSTEM:[SUB SYSTEM:]MESSAGE
3535
* - [!] Exclamation mark is prepended in case of error
3636
*
37-
* |E| SYS | SUB | Message | Comment
38-
* |-|-------|-------|-----------------------------------|---------------------------------------------------------------------
39-
* | | RF24 | INIT | | Initialise RF24 radio
40-
* | | RF24 | INIT | PIN,CE=%d,CS=%d | Pin configuration: chip enable (CE), chip select (CS)
41-
* |!| RF24 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
42-
* | | RF24 | SPP | PCT=%d,TX LEVEL=%d | Set TX level, input TX percent (PCT)
43-
* | | RF24 | RBR | REG=%d,VAL=%d | Read register (REG), value=(VAL)
44-
* | | RF24 | WBR | REG=%d,VAL=%d | Write register (REG), value=(VAL)
45-
* | | RF24 | FRX | | Flush RX buffer
46-
* | | RF24 | FTX | | Flush TX buffer
47-
* | | RF24 | OWP | RCPT=%d | Open writing pipe, recipient=(RCPT)
48-
* | | RF24 | STL | | Start listening
49-
* | | RF24 | SPL | | Stop listening
50-
* | | RF24 | SLP | | Set radio to sleep
51-
* | | RF24 | SBY | | Set radio to standby
52-
* | | RF24 | TXM | TO=%d,LEN=%d | Transmit message to=(TO), length=(LEN)
53-
* |!| RF24 | TXM | MAX_RT | Max TX retries, no ACK received
54-
* |!| RF24 | GDP | PYL INV | Invalid payload size
55-
* | | RF24 | RXM | LEN=%d | Read message, length=(LEN)
56-
* | | RF24 | STX | LEVEL=%d | Set TX level, level=(LEVEL)
37+
* |E| SYS | SUB | Message | Comment
38+
* |-|------|------|--------------------|---------------------------------------------------------------------
39+
* | | RF24 | INIT | | Initialise RF24 radio
40+
* | | RF24 | INIT | PIN,CE=%d,CS=%d | Pin configuration: chip enable (CE), chip select (CS)
41+
* |!| RF24 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
42+
* | | RF24 | SPP | PCT=%d,TX LEVEL=%d | Set TX level, input TX percent (PCT)
43+
* | | RF24 | RBR | REG=%d,VAL=%d | Read register (REG), value=(VAL)
44+
* | | RF24 | WBR | REG=%d,VAL=%d | Write register (REG), value=(VAL)
45+
* | | RF24 | FRX | | Flush RX buffer
46+
* | | RF24 | FTX | | Flush TX buffer
47+
* | | RF24 | OWP | RCPT=%d | Open writing pipe, recipient=(RCPT)
48+
* | | RF24 | STL | | Start listening
49+
* | | RF24 | SPL | | Stop listening
50+
* | | RF24 | SLP | | Set radio to sleep
51+
* | | RF24 | SBY | | Set radio to standby
52+
* | | RF24 | TXM | TO=%d,LEN=%d | Transmit message to=(TO), length=(LEN)
53+
* |!| RF24 | TXM | MAX_RT | Max TX retries, no ACK received
54+
* |!| RF24 | GDP | PYL INV | Invalid payload size
55+
* | | RF24 | RXM | LEN=%d | Read message, length=(LEN)
56+
* | | RF24 | STX | LEVEL=%d | Set TX level, level=(LEVEL)
5757
*
5858
*/
5959

‎drivers/RFM69/new/RFM69_new.h

Lines changed: 14 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -42,20 +42,20 @@
4242
* RFM69 driver-related log messages, format: [!]SYSTEM:[SUB SYSTEM:]MESSAGE
4343
* - [!] Exclamation mark is prepended in case of error
4444
*
45-
* |E| SYS | SUB | Message | Comment
46-
* |-|-------|-------|-----------------------------------|-----------------------------------------------------------------------------------
47-
* | | RFM69 | INIT | | Initialise RFM69 radio
48-
* | | RFM69 | INIT | PIN,CS=%d,IQP=%d,IQN=%d[,RST=%d] | Pin configuration: chip select (CS), IRQ pin (IQP), IRQ number (IQN), Reset (RST)
49-
* |!| RFM69 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
50-
* | | RFM69 | PTX | NO ADJ | TX power level, no adjustment
51-
* | | RFM69 | PTX | LEVEL=%d dbM | TX power level, set to (LEVEL) dBm
52-
* | | RFM69 | SLEEP | | Radio in sleep mode
53-
* | | RFM69 | SAC | SEND ACK,TO=%d,RSSI=%d | ACK sent to (TO), RSSI of incoming message (RSSI)
54-
* | | RFM69 | ATC | ADJ TXL,cR=%d,tR=%d,TXL=%d | Adjust TX power level (TXL) to match set RSSI (sR), current RSSI (cR)
55-
* | | RFM69 | SWR | SEND,TO=%d,RETRY=%d | Send to (TO), retry if no ACK received (RETRY)
56-
* | | RFM69 | SWR | ACK,FROM=%d,SEQ=%d,RSSI=%d | ACK received from (FROM), sequence nr (SEQ), ACK RSSI (RSSI)
57-
* |!| RFM69 | SWR | NACK | Message sent, no ACK received
58-
* | | RFM69 | SPP | PCT=%d,TX LEVEL=%d | Set TX level, input TX percent (PCT)
45+
* |E| SYS | SUB | Message | Comment
46+
* |-|-------|-------|----------------------------------|-----------------------------------------------------------------------------------
47+
* | | RFM69 | INIT | | Initialise RFM69 radio
48+
* | | RFM69 | INIT | PIN,CS=%d,IQP=%d,IQN=%d[,RST=%d] | Pin configuration: chip select (CS), IRQ pin (IQP), IRQ number (IQN), Reset (RST)
49+
* |!| RFM69 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
50+
* | | RFM69 | PTX | NO ADJ | TX power level, no adjustment
51+
* | | RFM69 | PTX | LEVEL=%d dbM | TX power level, set to (LEVEL) dBm
52+
* | | RFM69 | SLEEP | | Radio in sleep mode
53+
* | | RFM69 | SAC | SEND ACK,TO=%d,RSSI=%d | ACK sent to (TO), RSSI of incoming message (RSSI)
54+
* | | RFM69 | ATC | ADJ TXL,cR=%d,tR=%d,TXL=%d | Adjust TX power level (TXL) to match set RSSI (sR), current RSSI (cR)
55+
* | | RFM69 | SWR | SEND,TO=%d,RETRY=%d | Send to (TO), retry if no ACK received (RETRY)
56+
* | | RFM69 | SWR | ACK,FROM=%d,SEQ=%d,RSSI=%d | ACK received from (FROM), sequence nr (SEQ), ACK RSSI (RSSI)
57+
* |!| RFM69 | SWR | NACK | Message sent, no ACK received
58+
* | | RFM69 | SPP | PCT=%d,TX LEVEL=%d | Set TX level, input TX percent (PCT)
5959
*
6060
* @brief API declaration for RFM69
6161
*
@@ -211,19 +211,6 @@ extern HardwareSPI SPI; //!< SPI
211211
#define RFM69_868MHZ (868000000ul) //!< RFM69_868MHZ
212212
#define RFM69_915MHZ (915000000ul) //!< RFM69_915MHZ
213213

214-
/*
215-
#if !defined(RFM69_FREQ_MSB)
216-
#define RFM69_FREQ_MSB (uint8_t)(MY_RFM69_FREQUENCY == RFM69_315MHZ ? RFM69_FRFMSB_315 : (MY_RFM69_FREQUENCY == RFM69_433MHZ ? RFM69_FRFMSB_433_92 : (MY_RFM69_FREQUENCY == RFM69_868MHZ ? RFM69_FRFMSB_868 : RFM69_FRFMSB_915))) //!< FREQ_MSB
217-
#endif
218-
219-
#if !defined(RFM69_FREQ_MID)
220-
#define RFM69_FREQ_MID (uint8_t)(MY_RFM69_FREQUENCY == RFM69_315MHZ ? RFM69_FRFMID_315 : (MY_RFM69_FREQUENCY == RFM69_433MHZ ? RFM69_FRFMID_433_92 : (MY_RFM69_FREQUENCY == RFM69_868MHZ ? RFM69_FRFMID_868 : RFM69_FRFMID_915))) //!< FREQ_MID
221-
#endif
222-
223-
#if !defined(RFM69_FREQ_LSB)
224-
#define RFM69_FREQ_LSB (uint8_t)(MY_RFM69_FREQUENCY == RFM69_315MHZ ? RFM69_FRFLSB_315 : (MY_RFM69_FREQUENCY == RFM69_433MHZ ? RFM69_FRFLSB_433_92 : (MY_RFM69_FREQUENCY == RFM69_868MHZ ? RFM69_FRFLSB_868 : RFM69_FRFLSB_915))) //!< FREQ_LSB
225-
#endif
226-
*/
227214
#define RFM69_COURSE_TEMP_COEF (-90) //!< puts the temperature reading in the ballpark, user can fine tune the returned value
228215
#define RFM69_FXOSC (32*1000000ul) //!< OSC freq, 32MHz
229216
#define RFM69_FSTEP (RFM69_FXOSC / 524288.0f) //!< FXOSC / 2^19 = 32MHz / 2^19 (p13 in datasheet)
@@ -233,7 +220,6 @@ extern HardwareSPI SPI; //!< SPI
233220
#define RFM69_LISTEN_IDLE_US MY_RFM69_DEFAULT_LISTEN_IDLE_US //!< RFM69_LISTEN_IDLE_US
234221
#endif
235222

236-
237223
/**
238224
* @brief Radio modes
239225
*/

‎drivers/RFM95/RFM95.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
*
1919
* Based on Mike McCauley's RFM95 library, Copyright (C) 2014 Mike McCauley <[email protected]>
2020
* Radiohead http://www.airspayce.com/mikem/arduino/RadioHead/index.html
21-
* RFM95 driver refactored and optimized for MySensors, Copyright (C) 2016 Olivier Mauti <[email protected]>
21+
* RFM95 driver refactored and optimized for MySensors, Copyright (C) 2017 Olivier Mauti <[email protected]>
2222
*
2323
*/
2424

‎drivers/RFM95/RFM95.h

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*
1+
/*
22
* The MySensors Arduino library handles the wireless radio link and protocol
33
* between your home built sensors/actuators and HA controller of choice.
44
* The sensors forms a self healing radio network with optional repeaters. Each
@@ -40,32 +40,32 @@
4040
* RFM95 driver-related log messages, format: [!]SYSTEM:[SUB SYSTEM:]MESSAGE
4141
* - [!] Exclamation mark is prepended in case of error
4242
*
43-
* |E| SYS | SUB | Message | Comment
44-
* |-|-------|-------|-----------------------------------|-----------------------------------------------------------------------------------
45-
* | | RFM95 | INIT | | Initialise RFM95 radio
46-
* | | RFM95 | INIT | PIN,CS=%d,IQP=%d,IQN=%d[,RST=%d] | Pin configuration: chip select (CS), IRQ pin (IQP), IRQ number (IQN), Reset (RST)
47-
* |!| RFM95 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
48-
* | | RFM95 | RCV | SEND ACK | ACK request received, sending ACK back
49-
* | | RFM95 | PTC | LEVEL=%d | Set TX power level
50-
* | | RFM95 | SAC | SEND ACK,TO=%d,RSSI=%d,SNR=%d | Send ACK to node (TO), RSSI of received message (RSSI), SNR of message (SNR)
51-
* | | RFM95 | ATC | ADJ TXL,cR=%d,tR=%d,TXL=%d | Adjust TX level, current RSSI (cR), target RSSI (tR), TX level (TXL)
52-
* | | RFM95 | SWR | SEND,TO=%d,RETRY=%d | Send message to (TO), NACK retry counter (RETRY)
53-
* | | RFM95 | SWR | ACK FROM=%d,SEQ=%d,RSSI=%d,SNR=%d | ACK received from node (FROM), seq ID (SEQ), (RSSI), (SNR)
54-
* |!| RFM95 | SWR | NACK | No ACK received
55-
* | | RFM95 | SPP | PCT=%d,TX LEVEL=%d | Set TX level, input TX percent (PCT)
43+
* |E| SYS | SUB | Message | Comment
44+
* |-|-------|------|------------------------------------|-----------------------------------------------------------------------------------
45+
* | | RFM95 | INIT | | Initialise RFM95 radio
46+
* | | RFM95 | INIT | PIN,CS=%d,IQP=%d,IQN=%d[,RST=%d] | Pin configuration: chip select (CS), IRQ pin (IQP), IRQ number (IQN), Reset (RST)
47+
* |!| RFM95 | INIT | SANCHK FAIL | Sanity check failed, check wiring or replace module
48+
* | | RFM95 | RCV | SEND ACK | ACK request received, sending ACK back
49+
* | | RFM95 | PTC | LEVEL=%d | Set TX power level
50+
* | | RFM95 | SAC | SEND ACK,TO=%d,RSSI=%d,SNR=%d | Send ACK to node (TO), RSSI of received message (RSSI), SNR of message (SNR)
51+
* | | RFM95 | ATC | ADJ TXL,cR=%d,tR=%d,TXL=%d | Adjust TX level, current RSSI (cR), target RSSI (tR), TX level (TXL)
52+
* | | RFM95 | SWR | SEND,TO=%d,RETRY=%d | Send message to (TO), NACK retry counter (RETRY)
53+
* | | RFM95 | SWR | ACK FROM=%d,SEQ=%d,RSSI=%d,SNR=%d | ACK received from node (FROM), seq ID (SEQ), (RSSI), (SNR)
54+
* |!| RFM95 | SWR | NACK | No ACK received
55+
* | | RFM95 | SPP | PCT=%d,TX LEVEL=%d | Set TX level percent (PCT), TX level (LEVEL)
5656
*
5757
* RFM95 modem configuration
5858
*
5959
* BW = Bandwidth in kHz
6060
* CR = Error correction code
6161
* SF = Spreading factor, chips / symbol
6262
*
63-
* | CONFIG | REG_1D | REG_1E | REG_26 | BW | CR | SF | Comment | air-time (15 bytes)
64-
* |------------------|--------|--------|--------|-------|-----|------|------------------------------------------------
65-
* | BW125CR45SF128 | 0x72 | 0x74 | 0x04 | 125 | 4/5 | 128 | Default, medium range | 50ms
66-
* | BW500CR45SF128 | 0x92 | 0x74 | 0x04 | 500 | 4/5 | 128 | Fast, short range | 15ms
67-
* | BW31_25CR48SF512 | 0x48 | 0x94 | 0x04 | 31.25 | 4/8 | 512 | Slow, long range | 900ms
68-
* | BW125CR48SF4096 | 0x78 | 0xC4 | 0x0C | 125 | 4/8 | 4096 | Slow, long range | 1500ms
63+
* | CONFIG | REG_1D | REG_1E | REG_26 | BW | CR | SF | Comment | air-time (15 bytes)
64+
* |------------------|--------|--------|--------|-------|-----|------|-----------------------|------------------------
65+
* | BW125CR45SF128 | 0x72 | 0x74 | 0x04 | 125 | 4/5 | 128 | Default, medium range | 50ms
66+
* | BW500CR45SF128 | 0x92 | 0x74 | 0x04 | 500 | 4/5 | 128 | Fast, short range | 15ms
67+
* | BW31_25CR48SF512 | 0x48 | 0x94 | 0x04 | 31.25 | 4/8 | 512 | Slow, long range | 900ms
68+
* | BW125CR48SF4096 | 0x78 | 0xC4 | 0x0C | 125 | 4/8 | 4096 | Slow, long range | 1500ms
6969
*
7070
* See here for air-time calculation: https://docs.google.com/spreadsheets/d/1voGAtQAjC1qBmaVuP1ApNKs1ekgUjavHuVQIXyYSvNc
7171
*

0 commit comments

Comments
 (0)