Commit: 889c5d9195e8828d6423fa4ddfb108501bfa107b - LoRa_Farm_IOT (git)

Commit MetaInfo

• Revision: 889c5d9195e8828d6423fa4ddfb108501bfa107b (tree)
• Zeit: 2019-01-05 18:08:08
• Autor: kazuhiro_kondow <simauma.circus@gmai...>
• Commiter: kazuhiro_kondow

Log Message

fix sleepmode registor control , chenge datarecord format

Ändern Zusammenfassung

• modified: LoRa_farme/farme_lora_client/farme_lora_client.ino

Diff

--- a/LoRa_farme/farme_lora_client/farme_lora_client.ino
+++ b/LoRa_farme/farme_lora_client/farme_lora_client.ino
@@ -19,7 +19,7 @@ const int SLEEP_CNT = 5; // wdt test 1.0s * 5 = 5sec
 const int RETRY_MAX = 100; // DHT11 max retry count
 
 // Sensores Uses Analog Pin
-const int SENCER_PW_PIN = PC1; // BREADBOOD fghij SIDE
+const int SENCER_PW_PIN = PC1; // analogPin A1
 const int photo_pin = A2;
 const int soilmois_pin = A3;
 const int soiltemp_pin = A4;
@@ -37,11 +37,6 @@ union float_u {
 // Store values
 int wdt_cnt = 0;
 
-// Store I/O pinMode Registers
-uint8_t store_DDRB = 0;
-uint8_t store_DDRC = 0;
-uint8_t store_DDRD = 0;
-
 // Objects
 DHT dht(dht_pin, DHTTYPE);
 
@@ -50,7 +45,7 @@ RH_RF95 rf95;
 const float frequency = 920.0;
 
 // for send data not in CRC
-const int dataLength = 26;
+const int dataLength = 21;
 
 // ProtType
 uint16_t calcByte(uint16_t crc, uint8_t b);
@@ -85,11 +80,6 @@ void setup()
     // DHT init
     dht.begin();
 
-    // Store Registers
-    store_DDRB = DDRB;
-    store_DDRC = DDRC;
-    store_DDRD = DDRD;
-
     // set sencer power off
     PORTC &= ~_BV(PC1);
     delay(10);
@@ -102,7 +92,6 @@ void loop()
 
     // Data is All Sensores value
     uint8_t data[dataLength + 2] = {0};
-    uint8_t *p_valbuf;
 
     // data[0] as Categly ID, data[1] as Area ID, data[2] as Node ID
     data[0] = 1;
@@ -216,18 +205,6 @@ void sleeping_now()
     Serial.println("call sleeping_now");
     delay(100);
 
-    // set all I/O register OUTPUT
-
-    DDRB = B111111;
-    DDRC = B111111;
-    //  DDRD = B11111111;
-    DDRD = B11111100; // for sirial.log
-    delay(10);
-
-    // set sencer power off
-    PORTB &= ~_BV(PC1);
-    delay(10);
-
     // set power-down mode
     SMCR |= (1 << SM1);
     SMCR |= 1;
@@ -273,12 +250,6 @@ void reset_WatchDogTimer()
     ADCSRA |= (1 << 7);
     wdt_cnt = 0;
 
-    // I/O register restore
-    DDRB = store_DDRB;
-    DDRC = store_DDRC;
-    DDRD = store_DDRD;
-    delay(10);
-
     Serial.println("reset_WatchDogTimer");
     delay(100);
 
@@ -317,7 +288,7 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 4; i++)
     {
-        data[11 - i] = temperature.byt[i];
+        data[6 - i] = temperature.byt[i];
     }
 
     Serial.print("Humidity: ");
@@ -325,7 +296,7 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 4; i++)
     {
-        data[15 - i] = humidity.byt[i];
+        data[10 - i] = humidity.byt[i];
     }
 
     // get PhotoSensore val
@@ -335,7 +306,7 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 2; i++)
     {
-        data[17 - i] = (uint8_t)(photosensitive_val >> (i * 8));
+        data[12 - i] = (uint8_t)(photosensitive_val >> (i * 8));
     }
 
     // get soil moisture val
@@ -345,7 +316,7 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 2; i++)
     {
-        data[19 - i] = (uint8_t)(soilmoisture_val >> (i * 8));
+        data[14 - i] = (uint8_t)(soilmoisture_val >> (i * 8));
     }
 
     // get soil temperature val
@@ -355,7 +326,7 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 4; i++)
     {
-        data[23 - i] = soiltempe.byt[i];
+        data[18 - i] = soiltempe.byt[i];
     }
 
     // get HC-SR501 val
@@ -365,11 +336,11 @@ void read_Sencers(uint8_t *data)
     delay(100);
     for (int i = 0; i < 2; i++)
     {
-        data[25 - i] = (uint8_t)(humaninduct_val >> (i * 8));
+        data[20 - i] = (uint8_t)(humaninduct_val >> (i * 8));
     }
 
     // sencer power off
-    PORTC = ~_BV(PC1);
+    PORTC &= ~_BV(PC1);
     delay(10);
 
     return;