ide: the attiny85 beside the atmega328p, one directory each
The presets cover both parts, so the solution should too. Studio carries avrdevice as a project property, so a part is a project rather than a configuration, and both build example/main.cpp to a .text byte-identical to their CMake counterpart: 1242 B on the mega, 1212 B on the tiny, each with the architecture its own object file says. They need separate directories, not just separate names. Studio builds into <project dir>/<Configuration> whatever OutputDirectory claims — setting it per project creates the directory and then ignores it — so two projects in one directory share example/main.o. Verified rather than assumed: with both in ide/, the single shared object read avr:25 while the mega's ELF read avr:5, so a build of one after the other without a rebuild links the wrong part's object. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
BlackMark
6
.gitignore
vendored
6
.gitignore
vendored
@@ -2,8 +2,8 @@ build/
|
|||||||
.cache/
|
.cache/
|
||||||
|
|
||||||
# Atmel Studio: generated per machine, its build outputs, and per-user state
|
# Atmel Studio: generated per machine, its build outputs, and per-user state
|
||||||
ide/*.componentinfo.xml
|
ide/*/*.componentinfo.xml
|
||||||
ide/Debug/
|
ide/*/Debug/
|
||||||
ide/Release/
|
ide/*/Release/
|
||||||
ide/.vs/
|
ide/.vs/
|
||||||
ide/*.log
|
ide/*.log
|
||||||
|
|||||||
35
README.md
35
README.md
@@ -27,11 +27,17 @@ reflect). The legacy yazoalfa-based driver lives on the `master` branch.
|
|||||||
## Atmel Studio
|
## Atmel Studio
|
||||||
|
|
||||||
`master` carries a Studio solution, so this branch does too: `ide/ds3231.atsln`
|
`master` carries a Studio solution, so this branch does too: `ide/ds3231.atsln`
|
||||||
builds `example/main.cpp` for the ATmega328P — the chip that solution targeted —
|
builds `example/main.cpp` for both parts the presets cover, each to a
|
||||||
to a **byte-identical `.text`** (1242 B) against the CMake build, with the flags
|
**byte-identical `.text`** against the CMake build — 1242 B on the ATmega328P,
|
||||||
mirrored by hand. One project, one chip: `avrdevice` is a project-level property
|
1212 B on the ATtiny85 — with the flags mirrored by hand. CMake remains the
|
||||||
in Studio, so the attiny85 half of the presets has no equivalent here, and CMake
|
build system.
|
||||||
remains the build system.
|
|
||||||
|
`avrdevice` is a project-level property in Studio, so a part means a project, not
|
||||||
|
a configuration: `ide/atmega328p/` and `ide/attiny85/`. They need separate
|
||||||
|
directories rather than separate names — Studio builds into `<project
|
||||||
|
dir>/<Configuration>` whatever `OutputDirectory` says, so two projects sharing
|
||||||
|
one directory would also share one `example/main.o`, and building one after the
|
||||||
|
other without a rebuild would link the other part's object.
|
||||||
|
|
||||||
Studio expects libavr checked out **beside this repo** and finds it at
|
Studio expects libavr checked out **beside this repo** and finds it at
|
||||||
`$(MSBuildProjectDirectory)\..\..\libavr\include` — anchored to the project,
|
`$(MSBuildProjectDirectory)\..\..\libavr\include` — anchored to the project,
|
||||||
@@ -45,15 +51,20 @@ One generated file is required before the project will load, and one command
|
|||||||
checks the flags have not drifted (both from libavr's `tools/atmelstudio/`):
|
checks the flags have not drifted (both from libavr's `tools/atmelstudio/`):
|
||||||
|
|
||||||
```sh
|
```sh
|
||||||
python ../libavr/tools/atmelstudio/componentinfo.py \
|
for mcu in atmega328p attiny85; do
|
||||||
ide/ds3231.componentinfo.xml --device ATmega328P
|
case $mcu in atmega328p) device=ATmega328P;; attiny85) device=ATtiny85;; esac
|
||||||
python ../libavr/tools/atmelstudio/check-flags.py --solution ide/ds3231.atsln \
|
python ../libavr/tools/atmelstudio/componentinfo.py \
|
||||||
--compile-commands build/atmega328p-generated/compile_commands.json \
|
"ide/$mcu/ds3231-$mcu.componentinfo.xml" --device "$device"
|
||||||
--log build/atmelstudio.log
|
python ../libavr/tools/atmelstudio/check-flags.py --solution ide/ds3231.atsln \
|
||||||
|
--project "ds3231-$mcu" \
|
||||||
|
--compile-commands "build/$mcu-generated/compile_commands.json" \
|
||||||
|
--log "build/as-$mcu.log"
|
||||||
|
done
|
||||||
```
|
```
|
||||||
|
|
||||||
Release is what the gate compares, the presets defining no debug build; Debug
|
One reference describes one part, hence `--project`. Release is what the gate
|
||||||
carries the `-Og -gdwarf-4` pair libavr's own debug preset uses.
|
compares, the presets defining no debug build; Debug carries the `-Og
|
||||||
|
-gdwarf-4` pair libavr's own debug preset uses.
|
||||||
|
|
||||||
Differences from legacy: weekday-rate alarms now actually set the DY bit
|
Differences from legacy: weekday-rate alarms now actually set the DY bit
|
||||||
(the old `setAlarmHelper` always cleared it), reads/writes are single
|
(the old `setAlarmHelper` always cleared it), reads/writes are single
|
||||||
|
|||||||
@@ -12,8 +12,8 @@
|
|||||||
<OutputFileName>$(MSBuildProjectName)</OutputFileName>
|
<OutputFileName>$(MSBuildProjectName)</OutputFileName>
|
||||||
<OutputFileExtension>.elf</OutputFileExtension>
|
<OutputFileExtension>.elf</OutputFileExtension>
|
||||||
<OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
|
<OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
|
||||||
<AssemblyName>ds3231</AssemblyName>
|
<AssemblyName>ds3231-atmega328p</AssemblyName>
|
||||||
<Name>ds3231</Name>
|
<Name>ds3231-atmega328p</Name>
|
||||||
<RootNamespace>ds3231</RootNamespace>
|
<RootNamespace>ds3231</RootNamespace>
|
||||||
<ToolchainFlavour>avr-g++-16.1.0</ToolchainFlavour>
|
<ToolchainFlavour>avr-g++-16.1.0</ToolchainFlavour>
|
||||||
<KeepTimersRunning>true</KeepTimersRunning>
|
<KeepTimersRunning>true</KeepTimersRunning>
|
||||||
@@ -45,8 +45,8 @@
|
|||||||
</avrgcccpp.compiler.symbols.DefSymbols>
|
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
<avrgcccpp.compiler.directories.IncludePaths>
|
<avrgcccpp.compiler.directories.IncludePaths>
|
||||||
<ListValues>
|
<ListValues>
|
||||||
<Value>$(MSBuildProjectDirectory)\..\include</Value>
|
<Value>$(MSBuildProjectDirectory)\..\..\include</Value>
|
||||||
<Value>$(MSBuildProjectDirectory)\..\..\libavr\include</Value>
|
<Value>$(MSBuildProjectDirectory)\..\..\..\libavr\include</Value>
|
||||||
</ListValues>
|
</ListValues>
|
||||||
</avrgcccpp.compiler.directories.IncludePaths>
|
</avrgcccpp.compiler.directories.IncludePaths>
|
||||||
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
|
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
|
||||||
@@ -75,8 +75,8 @@
|
|||||||
</avrgcccpp.compiler.symbols.DefSymbols>
|
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
<avrgcccpp.compiler.directories.IncludePaths>
|
<avrgcccpp.compiler.directories.IncludePaths>
|
||||||
<ListValues>
|
<ListValues>
|
||||||
<Value>$(MSBuildProjectDirectory)\..\include</Value>
|
<Value>$(MSBuildProjectDirectory)\..\..\include</Value>
|
||||||
<Value>$(MSBuildProjectDirectory)\..\..\libavr\include</Value>
|
<Value>$(MSBuildProjectDirectory)\..\..\..\libavr\include</Value>
|
||||||
</ListValues>
|
</ListValues>
|
||||||
</avrgcccpp.compiler.directories.IncludePaths>
|
</avrgcccpp.compiler.directories.IncludePaths>
|
||||||
<avrgcccpp.compiler.optimization.level>Optimize debugging experience (-Og)</avrgcccpp.compiler.optimization.level>
|
<avrgcccpp.compiler.optimization.level>Optimize debugging experience (-Og)</avrgcccpp.compiler.optimization.level>
|
||||||
@@ -90,11 +90,11 @@
|
|||||||
</ToolchainSettings>
|
</ToolchainSettings>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<Compile Include="..\example\main.cpp">
|
<Compile Include="..\..\example\main.cpp">
|
||||||
<SubType>compile</SubType>
|
<SubType>compile</SubType>
|
||||||
<Link>example\main.cpp</Link>
|
<Link>example\main.cpp</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
<Compile Include="..\include\ds3231\ds3231.hpp">
|
<Compile Include="..\..\include\ds3231\ds3231.hpp">
|
||||||
<SubType>compile</SubType>
|
<SubType>compile</SubType>
|
||||||
<Link>include\ds3231\ds3231.hpp</Link>
|
<Link>include\ds3231\ds3231.hpp</Link>
|
||||||
</Compile>
|
</Compile>
|
||||||
108
ide/attiny85/ds3231-attiny85.cppproj
Normal file
108
ide/attiny85/ds3231-attiny85.cppproj
Normal file
@@ -0,0 +1,108 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="14.0">
|
||||||
|
<PropertyGroup>
|
||||||
|
<SchemaVersion>2.0</SchemaVersion>
|
||||||
|
<ProjectVersion>7.0</ProjectVersion>
|
||||||
|
<ToolchainName>com.Atmel.AVRGCC8.CPP</ToolchainName>
|
||||||
|
<ProjectGuid>1d84c0f7-52b9-4a63-b7e1-9f2c48d5a306</ProjectGuid>
|
||||||
|
<avrdevice>ATtiny85</avrdevice>
|
||||||
|
<avrdeviceseries>none</avrdeviceseries>
|
||||||
|
<OutputType>Executable</OutputType>
|
||||||
|
<Language>CPP</Language>
|
||||||
|
<OutputFileName>$(MSBuildProjectName)</OutputFileName>
|
||||||
|
<OutputFileExtension>.elf</OutputFileExtension>
|
||||||
|
<OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
|
||||||
|
<AssemblyName>ds3231-attiny85</AssemblyName>
|
||||||
|
<Name>ds3231-attiny85</Name>
|
||||||
|
<RootNamespace>ds3231</RootNamespace>
|
||||||
|
<ToolchainFlavour>avr-g++-16.1.0</ToolchainFlavour>
|
||||||
|
<KeepTimersRunning>true</KeepTimersRunning>
|
||||||
|
<OverrideVtor>false</OverrideVtor>
|
||||||
|
<CacheFlash>true</CacheFlash>
|
||||||
|
<ProgFlashFromRam>true</ProgFlashFromRam>
|
||||||
|
<RamSnippetAddress>0x20000000</RamSnippetAddress>
|
||||||
|
<UncachedRange />
|
||||||
|
<preserveEEPROM>true</preserveEEPROM>
|
||||||
|
<OverrideVtorValue>exception_table</OverrideVtorValue>
|
||||||
|
<BootSegment>2</BootSegment>
|
||||||
|
<ResetRule>0</ResetRule>
|
||||||
|
<eraseonlaunchrule>0</eraseonlaunchrule>
|
||||||
|
<EraseKey />
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
|
||||||
|
<ToolchainSettings>
|
||||||
|
<AvrGccCpp>
|
||||||
|
<avrgcc.common.Device>-mmcu=attiny85</avrgcc.common.Device>
|
||||||
|
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
|
||||||
|
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
|
||||||
|
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
|
||||||
|
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
|
||||||
|
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
|
||||||
|
<avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
|
<ListValues>
|
||||||
|
<Value>NDEBUG</Value>
|
||||||
|
</ListValues>
|
||||||
|
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
|
<avrgcccpp.compiler.directories.IncludePaths>
|
||||||
|
<ListValues>
|
||||||
|
<Value>$(MSBuildProjectDirectory)\..\..\include</Value>
|
||||||
|
<Value>$(MSBuildProjectDirectory)\..\..\..\libavr\include</Value>
|
||||||
|
</ListValues>
|
||||||
|
</avrgcccpp.compiler.directories.IncludePaths>
|
||||||
|
<avrgcccpp.compiler.optimization.level>Optimize for size (-Os)</avrgcccpp.compiler.optimization.level>
|
||||||
|
<avrgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</avrgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
|
||||||
|
<avrgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</avrgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
|
||||||
|
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||||
|
<avrgcccpp.compiler.miscellaneous.OtherFlags>-std=c++26 -Wextra -mrelax -fno-exceptions -fno-rtti -fno-threadsafe-statics</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||||
|
<avrgcccpp.linker.optimization.GarbageCollectUnusedSections>True</avrgcccpp.linker.optimization.GarbageCollectUnusedSections>
|
||||||
|
<avrgcccpp.linker.miscellaneous.LinkerFlags>-mrelax</avrgcccpp.linker.miscellaneous.LinkerFlags>
|
||||||
|
</AvrGccCpp>
|
||||||
|
</ToolchainSettings>
|
||||||
|
</PropertyGroup>
|
||||||
|
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
|
||||||
|
<ToolchainSettings>
|
||||||
|
<AvrGccCpp>
|
||||||
|
<avrgcc.common.Device>-mmcu=attiny85</avrgcc.common.Device>
|
||||||
|
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
|
||||||
|
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
|
||||||
|
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
|
||||||
|
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
|
||||||
|
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
|
||||||
|
<avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
|
<ListValues>
|
||||||
|
<Value>DEBUG</Value>
|
||||||
|
</ListValues>
|
||||||
|
</avrgcccpp.compiler.symbols.DefSymbols>
|
||||||
|
<avrgcccpp.compiler.directories.IncludePaths>
|
||||||
|
<ListValues>
|
||||||
|
<Value>$(MSBuildProjectDirectory)\..\..\include</Value>
|
||||||
|
<Value>$(MSBuildProjectDirectory)\..\..\..\libavr\include</Value>
|
||||||
|
</ListValues>
|
||||||
|
</avrgcccpp.compiler.directories.IncludePaths>
|
||||||
|
<avrgcccpp.compiler.optimization.level>Optimize debugging experience (-Og)</avrgcccpp.compiler.optimization.level>
|
||||||
|
<avrgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>True</avrgcccpp.compiler.optimization.PrepareFunctionsForGarbageCollection>
|
||||||
|
<avrgcccpp.compiler.optimization.PrepareDataForGarbageCollection>True</avrgcccpp.compiler.optimization.PrepareDataForGarbageCollection>
|
||||||
|
<avrgcccpp.compiler.warnings.AllWarnings>True</avrgcccpp.compiler.warnings.AllWarnings>
|
||||||
|
<avrgcccpp.compiler.miscellaneous.OtherFlags>-std=c++26 -Wextra -mrelax -fno-exceptions -fno-rtti -fno-threadsafe-statics -gdwarf-4</avrgcccpp.compiler.miscellaneous.OtherFlags>
|
||||||
|
<avrgcccpp.linker.optimization.GarbageCollectUnusedSections>True</avrgcccpp.linker.optimization.GarbageCollectUnusedSections>
|
||||||
|
<avrgcccpp.linker.miscellaneous.LinkerFlags>-mrelax</avrgcccpp.linker.miscellaneous.LinkerFlags>
|
||||||
|
</AvrGccCpp>
|
||||||
|
</ToolchainSettings>
|
||||||
|
</PropertyGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Compile Include="..\..\example\main.cpp">
|
||||||
|
<SubType>compile</SubType>
|
||||||
|
<Link>example\main.cpp</Link>
|
||||||
|
</Compile>
|
||||||
|
<Compile Include="..\..\include\ds3231\ds3231.hpp">
|
||||||
|
<SubType>compile</SubType>
|
||||||
|
<Link>include\ds3231\ds3231.hpp</Link>
|
||||||
|
</Compile>
|
||||||
|
</ItemGroup>
|
||||||
|
<ItemGroup>
|
||||||
|
<Folder Include="example" />
|
||||||
|
<Folder Include="include" />
|
||||||
|
<Folder Include="include\ds3231" />
|
||||||
|
</ItemGroup>
|
||||||
|
<Import Project="$(AVRSTUDIO_EXE_PATH)\Vs\Compiler.targets" />
|
||||||
|
</Project>
|
||||||
@@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00
|
|||||||
# Atmel Studio Solution File, Format Version 11.00
|
# Atmel Studio Solution File, Format Version 11.00
|
||||||
VisualStudioVersion = 14.0.23107.0
|
VisualStudioVersion = 14.0.23107.0
|
||||||
MinimumVisualStudioVersion = 10.0.40219.1
|
MinimumVisualStudioVersion = 10.0.40219.1
|
||||||
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "ds3231", "ds3231.cppproj", "{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}"
|
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "ds3231-atmega328p", "atmega328p\ds3231-atmega328p.cppproj", "{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}"
|
||||||
|
EndProject
|
||||||
|
Project("{E66E83B9-2572-4076-B26E-6BE79FF3018A}") = "ds3231-attiny85", "attiny85\ds3231-attiny85.cppproj", "{1D84C0F7-52B9-4A63-B7E1-9F2C48D5A306}"
|
||||||
EndProject
|
EndProject
|
||||||
Global
|
Global
|
||||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||||
@@ -15,6 +17,10 @@ Global
|
|||||||
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Debug|AVR.Build.0 = Debug|AVR
|
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Debug|AVR.Build.0 = Debug|AVR
|
||||||
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Release|AVR.ActiveCfg = Release|AVR
|
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Release|AVR.ActiveCfg = Release|AVR
|
||||||
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Release|AVR.Build.0 = Release|AVR
|
{7B3E5A41-9C26-4D18-8F52-6A0D31C74BE9}.Release|AVR.Build.0 = Release|AVR
|
||||||
|
{1D84C0F7-52B9-4A63-B7E1-9F2C48D5A306}.Debug|AVR.ActiveCfg = Debug|AVR
|
||||||
|
{1D84C0F7-52B9-4A63-B7E1-9F2C48D5A306}.Debug|AVR.Build.0 = Debug|AVR
|
||||||
|
{1D84C0F7-52B9-4A63-B7E1-9F2C48D5A306}.Release|AVR.ActiveCfg = Release|AVR
|
||||||
|
{1D84C0F7-52B9-4A63-B7E1-9F2C48D5A306}.Release|AVR.Build.0 = Release|AVR
|
||||||
EndGlobalSection
|
EndGlobalSection
|
||||||
GlobalSection(SolutionProperties) = preSolution
|
GlobalSection(SolutionProperties) = preSolution
|
||||||
HideSolutionNode = FALSE
|
HideSolutionNode = FALSE
|
||||||
|
|||||||
Reference in New Issue
Block a user