mirror
/
RadioLib
kopia lustrzana https://github.com/jgromes/RadioLib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

[RF69] Changed shaping datatype to uint8_t

pull/163/head
jgromes 2020-07-06 08:52:30 +02:00
rodzic acdd70693d
commit 263410ffb1
2 zmienionych plików z 19 dodań i 19 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

31
src/modules/RF69/RF69.cpp
Wyświetl plik

@ -704,25 +704,24 @@ int16_t RF69::setPromiscuousMode(bool promiscuous) {
return(state);
}
int16_t RF69::setDataShaping(float sh) {
int16_t RF69::setDataShaping(uint8_t sh) {
// set mode to standby
int16_t state = standby();
RADIOLIB_ASSERT(state);
// set data shaping
sh *= 10.0;
if(abs(sh - 0.0) <= 0.001) {
state = _mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_NO_SHAPING, 1, 0);
} else if(abs(sh - 3.0) <= 0.001) {
state = _mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_0_3, 1, 0);
} else if(abs(sh - 5.0) <= 0.001) {
state = _mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_0_5, 1, 0);
} else if(abs(sh - 10.0) <= 0.001) {
state = _mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_1_0, 1, 0);
} else {
return(ERR_INVALID_DATA_SHAPING);
switch(sh) {
case RADIOLIB_SHAPING_NONE:
return(_mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_NO_SHAPING, 1, 0));
case RADIOLIB_SHAPING_0_3:
return(_mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_0_3, 1, 0));
case RADIOLIB_SHAPING_0_5:
return(_mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_0_5, 1, 0));
case RADIOLIB_SHAPING_1_0:
return(_mod->SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK_GAUSSIAN_1_0, 1, 0));
default:
return(ERR_INVALID_DATA_SHAPING);
}
return(state);
}
int16_t RF69::setEncoding(uint8_t encoding) {
@ -732,11 +731,11 @@ int16_t RF69::setEncoding(uint8_t encoding) {
// set encoding
switch(encoding) {
case 0:
case RADIOLIB_ENCODING_NRZ:
return(_mod->SPIsetRegValue(RF69_REG_PACKET_CONFIG_1, RF69_DC_FREE_NONE, 6, 5));
case 1:
case RADIOLIB_ENCODING_MANCHESTER:
return(_mod->SPIsetRegValue(RF69_REG_PACKET_CONFIG_1, RF69_DC_FREE_MANCHESTER, 6, 5));
case 2:
case RADIOLIB_ENCODING_WHITENING:
return(_mod->SPIsetRegValue(RF69_REG_PACKET_CONFIG_1, RF69_DC_FREE_WHITENING, 6, 5));
default:
return(ERR_INVALID_ENCODING);

7
src/modules/RF69/RF69.h
Wyświetl plik

@ -774,18 +774,19 @@ class RF69: public PhysicalLayer {
/*!
\brief Sets Gaussian filter bandwidth-time product that will be used for data shaping.
Allowed values are 0.3, 0.5 or 1.0. Set to 0 to disable data shaping.
Allowed values are RADIOLIB_SHAPING_0_3, RADIOLIB_SHAPING_0_5 or RADIOLIB_SHAPING_1_0. Set to RADIOLIB_SHAPING_NONE to disable data shaping.
\param sh Gaussian shaping bandwidth-time product that will be used for data shaping
\returns \ref status_codes
*/
int16_t setDataShaping(float sh) override;
int16_t setDataShaping(uint8_t sh) override;
/*!
\brief Sets transmission encoding.
Allowed values are RADIOLIB_ENCODING_NRZ, RADIOLIB_ENCODING_MANCHESTER and RADIOLIB_ENCODING_WHITENING.
\param encoding Encoding to be used. Set to 0 for NRZ, 1 for Manchester and 2 for whitening.
\param encoding Encoding to be used.
\returns \ref status_codes
*/