youen/OneWireArduinoSlave
4
6
Fork 4
Code Issues 6 Pull Requests Releases Wiki Activity

Better handle unknown commands

Browse Source
This commit is contained in:
destroyedlolo 2018-03-28 01:20:03 +02:00
parent 60d5d95175
commit 82e8372512
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
examples/DS18B20_DHT22/DS18B20_DHT22.ino
View File

@ -15,6 +15,8 @@ const byte owROM[7] = { 0x28, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02 };
enum OW_Cmd { enum OW_Cmd {
START_CONVERSION = 0x44, START_CONVERSION = 0x44,
WRITE_SCRATCHPAD = 0x4e,
READ_POWERSUPPLY = 0xb4,
READ_SCRATCHPAD = 0xBE READ_SCRATCHPAD = 0xBE
}; };
@ -42,13 +44,11 @@ enum DeviceState {
volatile DeviceState state = DeviceState::WAIT4RESET; volatile DeviceState state = DeviceState::WAIT4RESET;
volatile unsigned long conversionStartTime = 0; volatile unsigned long conversionStartTime = 0;
volatile int ignByte = 0; // Bytes to be ignored
void owRcv( OneWireSlave::ReceiveEvent evt, byte cmd ){ void owRcv( OneWireSlave::ReceiveEvent evt, byte cmd ){
switch( evt ){ switch( evt ){
case OneWireSlave::RE_Reset: case OneWireSlave::RE_Reset:
state = DeviceState::WAIT4COMMAND; state = DeviceState::WAIT4COMMAND;
ignByte = 0;
#ifdef DEBUG #ifdef DEBUG
Serial.println(F("Reset")); Serial.println(F("Reset"));
#endif #endif
@ -76,8 +76,13 @@ void owRcv( OneWireSlave::ReceiveEvent evt, byte cmd ){
state = DeviceState::WAIT4RESET; state = DeviceState::WAIT4RESET;
OWSlave.beginWrite((const byte*)scratchpad, 9, 0); OWSlave.beginWrite((const byte*)scratchpad, 9, 0);
break; break;
#ifdef DEBUG case OW_Cmd::WRITE_SCRATCHPAD:
case OW_Cmd::READ_POWERSUPPLY:
state = DeviceState::WAIT4RESET; // Ignore parameters
break;
default: default:
state = DeviceState::WAIT4RESET;
#ifdef DEBUG
Serial.print(F("Unknown command :")); Serial.print(F("Unknown command :"));
Serial.println( cmd, HEX ); Serial.println( cmd, HEX );
#endif #endif
@ -86,8 +91,7 @@ void owRcv( OneWireSlave::ReceiveEvent evt, byte cmd ){
} }
void setTemperature( float temp ){ // Write given temperature to the scratchpad void setTemperature( float temp ){ // Write given temperature to the scratchpad
int16_t raw = (int16_t)(temp * 16.0f + 0.5f); int16_t raw = (int16_t)(temp * 16.0f + 0.5);
// We don't care about race condition as well as only one command // We don't care about race condition as well as only one command
// can be processed at a time otherwise we are failing in error/collision // can be processed at a time otherwise we are failing in error/collision
// condition. // condition.
@ -128,8 +132,8 @@ void loop(){
Serial.print("Temperature :"); Serial.print("Temperature :");
Serial.println(temperature); Serial.println(temperature);
#endif #endif
setTemperature( temperature );
} }
setTemperature( temperature );
state = DeviceState::TEMPERATUREREADY; state = DeviceState::TEMPERATUREREADY;
OWSlave.beginWriteBit(1, true); OWSlave.beginWriteBit(1, true);
} }