Merge pull request #1 from tlrobinson/pins-config

Add setPins() and setSPIFrequency() + misc other begin() changes

src/Layer1.h

@@ -40,6 +40,9 @@ class Layer1Class {
     int init();
     int send_packet(char* data, int len);
 
+    void setPins(int cs, int reset, int dio);
+    void setSPIFrequency(uint32_t frequency);
+
 private:
     uint8_t hex_digit(char ch);
     int isHashNew(char incoming[SHA1_LENGTH]);
@@ -53,6 +56,7 @@ class Layer1Class {
     int _csPin;
     int _resetPin;
     int _DIOPin;
+    uint32_t _spiFrequency;
 };
 
 extern Layer1Class Layer1;

src/Layer1_LoRa.cpp

@@ -13,7 +13,8 @@ Layer1Class::Layer1Class() :
 
     _csPin(LORA_DEFAULT_CS_PIN),
     _resetPin(LORA_DEFAULT_RESET_PIN),
-    _DIOPin(LORA_DEFAULT_DIO0_PIN)
+    _DIOPin(LORA_DEFAULT_DIO0_PIN),
+    _spiFrequency(100E3)
 
 {
 
@@ -131,24 +132,29 @@ int Layer1Class::DIOPin(){
     return _DIOPin;
 }
 
-int Layer1Class::init(){ // maybe this should take the pins and spreading factor as inputs?
+void Layer1Class::setPins(int cs, int reset, int dio){
+    _csPin = cs;
+    _resetPin = reset;
+    _DIOPin = dio;
+}
 
-    pinMode(_csPin, OUTPUT);
-    pinMode(_DIOPin, INPUT);
+void Layer1Class::setSPIFrequency(uint32_t frequency){
+    _spiFrequency = frequency;
+}
+
+int Layer1Class::init(){ // maybe this should take the pins and spreading factor as inputs?
 
     LoRa.setPins(_csPin, _resetPin, _DIOPin); // set CS, reset, DIO pin
+    LoRa.setSPIFrequency(_spiFrequency);
 
     if (!LoRa.begin(915E6)) {             // initialize ratio at 915 MHz
-        Serial.printf("LoRa init failed. Check your connections.\r\n");
         return _loraInitialized;
     }
 
-    LoRa.setSPIFrequency(100E3);
     LoRa.setSpreadingFactor(9);           // ranges from 6-12,default 7 see API docs
     LoRa.onReceive(onReceive);
     LoRa.receive();
 
-    Serial.printf("LoRa init succeeded.\r\n");
     _loraInitialized = 1;
     return _loraInitialized;
 }