Skip to content
Permalink
Browse files

use correct LED_PIN define

  • Loading branch information...
jp112sdl committed Dec 17, 2018
1 parent 44ea9c3 commit d052b3cd04ec4fc69399bf496a4d09e84280123b
@@ -26,6 +26,7 @@
#define SEL_PIN 9
#define CF1_PIN 7
#define CF_PIN 6
#define LED_PIN 4

// number of available peers per channel
#define PEERS_PER_SWCHANNEL 4
@@ -81,7 +82,7 @@ const struct DeviceInfo PROGMEM devinfo = {

// Configure the used hardware
typedef AvrSPI<10, 11, 12, 13> RadioSPI;
typedef AskSin<StatusLed<4>, NoBattery, Radio<RadioSPI, 2> > Hal;
typedef AskSin<StatusLed<LED_PIN>, NoBattery, Radio<RadioSPI, 2> > Hal;
Hal hal;

DEFREGISTER(Reg0, MASTERID_REGS, DREG_INTKEY, DREG_CONFBUTTONTIME, DREG_LOCALRESETDISABLE)
@@ -47,7 +47,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10,11,12,13> SPIType;
typedef Radio<SPIType,2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType,BatterySensor,RadioType> HalType;

class MeterList0Data : public List0Data {
@@ -23,7 +23,6 @@

#include <Switch.h>


// we use a Pro Mini
// Arduino pin for the LED
// D4 == PIN 4 on Pro Mini
@@ -54,7 +53,7 @@ const struct DeviceInfo PROGMEM devinfo = {
Configure the used hardware
*/
typedef AvrSPI<10, 11, 12, 13> RadioSPI;
typedef AskSin<StatusLed<4>, NoBattery, Radio<RadioSPI, 2> > Hal;
typedef AskSin<StatusLed<LED_PIN>, NoBattery, Radio<RadioSPI, 2> > Hal;

// setup the device with channel type and number of channels
typedef MultiChannelDevice<Hal, SwitchChannel<Hal, PEERS_PER_CHANNEL, List0>, 4> SwitchType;
@@ -29,8 +29,8 @@
// Arduino pin for the config button
// B0 == PIN 8 on Pro Mini
#define CONFIG_BUTTON_PIN 8

#define RELAY1_PIN 5
#define LED_PIN 4
#define RELAY1_PIN 5


// number of available peers per channel
@@ -54,7 +54,7 @@ const struct DeviceInfo PROGMEM devinfo = {
Configure the used hardware
*/
typedef AvrSPI<10, 11, 12, 13> RadioSPI;
typedef AskSin<StatusLed<4>, NoBattery, Radio<RadioSPI, 2> > Hal;
typedef AskSin<StatusLed<LED_PIN>, NoBattery, Radio<RadioSPI, 2> > Hal;

// setup the device with channel type and number of channels
typedef MultiChannelDevice<Hal, SwitchChannel<Hal, PEERS_PER_CHANNEL, List0>, 1> SwitchType;
@@ -51,7 +51,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef LibSPI<10> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef DualStatusLed<5, 4> LedType;
typedef DualStatusLed<LED_PIN2, LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> HalType;
class Hal : public HalType {
// extra clock to count button press events
@@ -51,7 +51,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef LibSPI<10> SPIType;
typedef Radio<SPIType,2> RadioType;
typedef DualStatusLed<5,4> LedType;
typedef DualStatusLed<LED_PIN2, LED_PIN> LedType;
typedef AskSin<LedType,BatterySensor,RadioType> HalType;
class Hal : public HalType {
// extra clock to count button press events
@@ -49,7 +49,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType,2> RadioType;
typedef DualStatusLed<5,4> LedType;
typedef DualStatusLed<LED_PIN2, LED_PIN> LedType;
typedef AskSin<LedType,BatterySensor,RadioType> HalType;
class Hal : public HalType {
// extra clock to count button press events
@@ -51,7 +51,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef LibSPI<10> SPIType;
typedef Radio<SPIType,2> RadioType;
typedef DualStatusLed<5,4> LedType;
typedef DualStatusLed<LED_PIN2, LED_PIN> LedType;
typedef AskSin<LedType,BatterySensor,RadioType> HalType;
class Hal : public HalType {
// extra clock to count button press events
@@ -14,6 +14,9 @@
#include <MultiChannelDevice.h>
#include <Remote.h>

#define LED_PIN 4
#define LED_PIN2 5

// Arduino pin for the config button
// B0 == PIN 8
#define CONFIG_BUTTON_PIN 8
@@ -43,7 +46,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10,11,12,13> SPIType;
typedef Radio<SPIType,2> RadioType;
typedef DualStatusLed<5,4> LedType;
typedef DualStatusLed<LED_PIN2, LED_PIN> LedType;
typedef AskSin<LedType,BatterySensor,RadioType> HalType;
class Hal : public HalType {
// extra clock to count button press events
@@ -49,7 +49,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> BaseHal;
class Hal : public BaseHal {
public:
@@ -20,6 +20,7 @@
// Arduino Pro mini 8 Mhz
// Arduino pin for the config button
#define CONFIG_BUTTON_PIN 8
#define LED_PIN 4

// number of available peers per channel
#define PEERS_PER_CHANNEL 6
@@ -50,7 +51,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> BaseHal;
class Hal : public BaseHal {
public:
@@ -18,7 +18,8 @@
// Arduino Pro mini 8 Mhz
// Arduino pin for the config button
#define CONFIG_BUTTON_PIN 8

// Arduino pin for the StatusLed
#define LED_PIN 4
// number of available peers per channel
#define PEERS_PER_CHANNEL 6

@@ -65,7 +66,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> BaseHal;
class Hal : public BaseHal {
public:
@@ -18,6 +18,7 @@
// Arduino Pro mini 8 Mhz
// Arduino pin for the config button
#define CONFIG_BUTTON_PIN 8
#define LED_PIN 4

// number of available peers per channel
#define PEERS_PER_CHANNEL 6
@@ -58,7 +59,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> BaseHal;
class Hal : public BaseHal {
public:
@@ -59,7 +59,7 @@ const struct DeviceInfo PROGMEM devinfo = {
*/
typedef AvrSPI<10, 11, 12, 13> SPIType;
typedef Radio<SPIType, 2> RadioType;
typedef StatusLed<4> LedType;
typedef StatusLed<LED_PIN> LedType;
typedef AskSin<LedType, BatterySensor, RadioType> BaseHal;
class Hal : public BaseHal {
public:

0 comments on commit d052b3c

Please sign in to comment.
You can’t perform that action at this time.