@@ -305,32 +305,58 @@ void IrSetup()
305305{
306306 Serial.print (F (" Setting up IR receiver\n " ));
307307
308+ uint8_t vccPin = IR_VCC ;
309+ uint8_t gndPin = IR_GND ;
310+ uint8_t recvPin = IR_RECV_PIN ;
311+
308312 #ifdef ON_DESK_MFD_ESP_MAC
309313 if (Network.macAddress () == ON_DESK_MFD_ESP_MAC )
310314 {
311- pinMode (TEST_IR_VCC_TEST , OUTPUT );
312- digitalWrite (TEST_IR_VCC_TEST , HIGH );
313- pinMode (TEST_IR_GND , OUTPUT );
314- digitalWrite (TEST_IR_GND , LOW );
315-
316- irrecv = new IRrecv (TEST_IR_RECV_PIN );
317- irrecv->enableIRIn (); // Start the receiver
318-
319- Serial.print (F (" On-desk IR receiver has been set up\n " ));
320-
321- return ;
315+ vccPin = TEST_IR_VCC_TEST ;
316+ gndPin = TEST_IR_GND ;
317+ recvPin = TEST_IR_RECV_PIN ;
318+
319+ Serial.printf_P
320+ (
321+ PSTR (" IR receiver pins: VCC = %s (GPIO%u); GND = %s (GPIO%u); RECV = %s (GPIO%u)\n " ),
322+ XSTR (TEST_IR_VCC_TEST ),
323+ TEST_IR_VCC_TEST ,
324+ XSTR (TEST_IR_GND ),
325+ TEST_IR_GND ,
326+ XSTR (TEST_IR_RECV_PIN ),
327+ TEST_IR_RECV_PIN
328+ );
329+ }
330+ else
331+ {
332+ #endif // ON_DESK_MFD_ESP_MAC
333+ Serial.printf_P
334+ (
335+ PSTR (" IR receiver pins: VCC = %s (GPIO%u); GND = %s (GPIO%u); RECV = %s (GPIO%u)\n " ),
336+ XSTR (IR_VCC ),
337+ IR_VCC ,
338+ XSTR (IR_GND ),
339+ IR_GND ,
340+ XSTR (IR_RECV_PIN ),
341+ IR_RECV_PIN
342+ );
343+ #ifdef ON_DESK_MFD_ESP_MAC
322344 } // if
323345 #endif // ON_DESK_MFD_ESP_MAC
324346
325347 // Using GPIO pins to feed the IR receiver. Should be possible with e.g. the TSOP4838 IR receiver as
326348 // it typically uses only 0.7 mA.
327- pinMode (IR_VCC , OUTPUT );
328- digitalWrite (IR_VCC , HIGH );
329- pinMode (IR_GND , OUTPUT );
330- digitalWrite (IR_GND , LOW );
349+ pinMode (vccPin , OUTPUT );
350+ digitalWrite (vccPin , HIGH );
351+ pinMode (gndPin , OUTPUT );
352+ digitalWrite (gndPin , LOW );
331353
332- irrecv = new IRrecv (IR_RECV_PIN );
354+ irrecv = new IRrecv (recvPin );
333355 irrecv->enableIRIn (); // Start the receiver
356+
357+ #ifdef ON_DESK_MFD_ESP_MAC
358+ if (Network.macAddress () == ON_DESK_MFD_ESP_MAC ) Serial.print (F (" On-desk IR receiver has been set up\n " ));
359+ #endif
334360} // IrSetup
335361
336362void IrEnable ()
0 commit comments