Merge pull request #2 from cyberman54/cyberman54-TEMPERATURE

Cyberman54 temperature
cyberman54 · Jul 25, 2021 · 1fef692 · 1fef692
2 parents 876f39a + c45d63d
commit 1fef692
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 18 deletions.
diff --git a/src/lmic/lmic.h b/src/lmic/lmic.h
@@ -486,6 +486,8 @@ struct lmic_radio_data_s {
     ostime_t    txlate_ticks;
     // number of tx late launches.
     unsigned    txlate_count;
+    // radio chip raw temperature value.
+    s1_t	temperature;
 };
 
 /*

diff --git a/src/lmic/oslmic.h b/src/lmic/oslmic.h
@@ -115,7 +115,7 @@ int os_init_ex (const void *pPinMap);
 void os_runloop (void);
 void os_runloop_once (void);
 u1_t radio_rssi (void);
-s1_t radio_GetRawTemp(void);
+s1_t radio_raw_temp(void);
 void radio_monitor_rssi(ostime_t n, oslmic_radio_rssi_t *pRssi);
 
 //================================================================================

diff --git a/src/lmic/radio.c b/src/lmic/radio.c
@@ -861,6 +861,12 @@ static void txlora () {
 // start transmitter (buf=LMIC.frame, len=LMIC.dataLen)
 static void starttx () {
     u1_t const rOpMode = readReg(RegOpMode);
+
+    // update radio chip raw temperature value
+    LMIC.radio.temperature = radio_raw_temp();
+#if LMIC_DEBUG_LEVEL > 0
+  LMIC_DEBUG_PRINTF("RegTemp=%d\n", LMIC.radio.temperature);
+#endif
 
     // originally, this code ASSERT()ed, but asserts are both bad and
     // blunt instruments. If we see that we're not in sleep mode,
@@ -1177,21 +1183,14 @@ u1_t radio_rssi () {
 }
 
 // Reads the raw temperature
-// \retval New raw temperature reading in 2's complement format
-s1_t radio_GetRawTemp(void) {
+// \retval New raw temperature reading
+s1_t radio_raw_temp(void) {
 
 #define RF_IMAGECAL_TEMPMONITOR_MASK 0xFE
 #define RF_IMAGECAL_TEMPMONITOR_ON 0x00
 #define RF_IMAGECAL_TEMPMONITOR_OFF 0x01
 
-  s1_t temp = 0;
-  u1_t previousOpMode, RegTemp;
-
-  // Save current Operation Mode
-  previousOpMode = readReg(RegOpMode);
-
-  // Put device in FSK Sleep Mode
-  opmode(OPMODE_SLEEP);
+  s1_t RegTemp = 0;
 
   // select FSK modem (from sleep mode)
   opmodeFSK();
@@ -1218,16 +1217,12 @@ s1_t radio_GetRawTemp(void) {
   RegTemp = readReg(FSKRegTemp);
 
   if ((RegTemp & 0x80) == 0x80) {
-    temp = 255 - RegTemp;
+    RegTemp = 255 - RegTemp;
   } else {
-    temp = RegTemp;
-    temp *= -1;
+    RegTemp *= -1;
   }
 
-  // Reload previous Op Mode
-  writeReg(RegOpMode, previousOpMode);
-
-  return temp;
+  return RegTemp;
 }
 
 /// \brief get the current RSSI on the current channel.