avr/ds3231
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change i2c library

Browse Source
This commit is contained in:
BlackMark 2020-05-15 11:51:51 +02:00
parent e9d3a95239
commit f00a154e59
7 changed files with 28 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -13,3 +13,6 @@
[submodule "ds3231/type"] [submodule "ds3231/type"]
path = ds3231/type path = ds3231/type
url = git@git.blackmark.me:avr/type.git url = git@git.blackmark.me:avr/type.git
[submodule "ds3231/i2c"]
path = ds3231/i2c
url = git@git.blackmark.me:avr/i2c.git

2
ds3231/ds3231

@ -1 +1 @@
Subproject commit 04af54e7c8029f05a999f85afa0bcc194f654fed Subproject commit 27680097203f1482ba61a9cceef689305d7eadc4

30
ds3231/ds3231.cppproj
View File

@ -83,6 +83,17 @@
</custom> </custom>
<AAFDebugger> <AAFDebugger>
<AAFDebugFiles> <AAFDebugFiles>
<DebugFile>
<path>\Debug\ds3231.lss</path>
<AAFSetting>
<Label>Lss Files</Label>
<Extention>.lss</Extention>
<Regex>^\s*(?&lt;address&gt;[a-f0-9]*):\s*.*$</Regex>
<DebugEnabled>true</DebugEnabled>
<RegexGroups>address</RegexGroups>
<DebuggerExpression>$pc</DebuggerExpression>
</AAFSetting>
</DebugFile>
</AAFDebugFiles> </AAFDebugFiles>
</AAFDebugger> </AAFDebugger>
</PropertyGroup> </PropertyGroup>
@ -213,21 +224,15 @@
<Compile Include="ds3231\rtc.h"> <Compile Include="ds3231\rtc.h">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>
<Compile Include="ds3231\twi-lowlevel.cpp">
<SubType>compile</SubType>
</Compile>
<Compile Include="ds3231\twi-lowlevel.h">
<SubType>compile</SubType>
</Compile>
<Compile Include="ds3231\twi.cpp">
<SubType>compile</SubType>
</Compile>
<Compile Include="ds3231\twi.h">
<SubType>compile</SubType>
</Compile>
<Compile Include="flash\flash.hpp"> <Compile Include="flash\flash.hpp">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>
<Compile Include="i2c\hardware.hpp">
<SubType>compile</SubType>
</Compile>
<Compile Include="i2c\i2c.hpp">
<SubType>compile</SubType>
</Compile>
<Compile Include="io\io.hpp"> <Compile Include="io\io.hpp">
<SubType>compile</SubType> <SubType>compile</SubType>
</Compile> </Compile>
@ -266,6 +271,7 @@
<Folder Include="ds3231" /> <Folder Include="ds3231" />
<Folder Include="io" /> <Folder Include="io" />
<Folder Include="flash" /> <Folder Include="flash" />
<Folder Include="i2c" />
<Folder Include="uart" /> <Folder Include="uart" />
<Folder Include="type" /> <Folder Include="type" />
</ItemGroup> </ItemGroup>

1
ds3231/i2c Submodule

@ -0,0 +1 @@
Subproject commit ff131d92a1b8e92efc2ae24306d7b7cac3cfb28a

6
ds3231/main.cpp
View File

@ -1,14 +1,16 @@
#include "clock.hpp" #include "clock.hpp"
#include <avr/interrupt.h>
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#include <time.h> #include <time.h>
#include "systime.h" #include <avr/interrupt.h>
#include "uart/uart.hpp" #include "uart/uart.hpp"
#include "systime.h"
using uart_t = uart::Uart0<>; using uart_t = uart::Uart0<>;
REGISTER_UART0_INT_VECTORS(uart_t); REGISTER_UART0_INT_VECTORS(uart_t);

1
ds3231/systime.cpp
View File

@ -22,7 +22,6 @@ int SysTime::euDST( const time_t *pTime, int32_t *pZ )
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
bool SysTime::init() bool SysTime::init()
{ {
twi_init_master();
rtc_init(); rtc_init();
if( !rtc_is_ds3231() ) if( !rtc_is_ds3231() )

1
ds3231/systime.h
View File

@ -9,7 +9,6 @@
#include <time.h> #include <time.h>
#include "ds3231/twi.h"
#include "ds3231/rtc.h" #include "ds3231/rtc.h"
class SysTime class SysTime