piotr/edgetx-gx12
1
0
Fork 0
Code Issues 2 Pull Requests Actions Packages Projects Releases Wiki Activity

Fix reading from initialized memory, fix not using fake program space for i2c

Browse Source
This commit is contained in:
Arne Schwabe
2016-07-26 00:14:16 +02:00
parent fdcc60b1b9
commit 893ae215af
2 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
radio/src/targets/sky9x/i2c_driver.cpp
+1
View File
@@ -18,6 +18,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "i2c_driver.h"
#include "twi.h"
#include "board.h"
radio/src/targets/sky9x/rtc_ds3231_driver.cpp
+5 -2
View File
@@ -18,6 +18,7 @@
* GNU General Public License for more details.
*/
#include "opentx.h"
#include "rtc.h"
#include "i2c_driver.h"
@@ -26,8 +27,9 @@
void readRtc()
{
uint8_t buffer[7];
uint8_t readBuffer[7];
gtm utm;
int res = i2cReadBuffer(DS3231_I2C_ADDR, 0, 2, buffer, 7);
int res = i2cReadBuffer(DS3231_I2C_ADDR, readBuffer, 2, buffer, 7);
if (res != 0)
return;
@@ -46,6 +48,7 @@ void writeRtc(gtm* ptr)
g_rtcTime = gmktime(ptr);
g_ms100 = 0; // start of next second begins now
uint8_t buffer[7];
uint8_t read_buffer[7];
buffer[0] = toBCD(ptr->tm_sec);
buffer[1] = toBCD(ptr->tm_min);
@@ -55,7 +58,7 @@ void writeRtc(gtm* ptr)
buffer[5] = toBCD(ptr->tm_mon + 1);
uint8_t offset = ptr->tm_year >= 100 ? 100 : 0;
buffer[6] = toBCD(ptr->tm_year - offset);
i2cWriteBuffer(DS3231_I2C_ADDR, 0, 1, buffer, 7);
i2cWriteBuffer(DS3231_I2C_ADDR, read_buffer, 1, buffer, 7);
}
void rtcSetTime(struct gtm * t)