Skip to content

Commit 1b1b1c4

Browse files
smck915smck915
committed
Updated current display format
1 parent fee4102 commit 1b1b1c4

File tree

2 files changed

+73
-74
lines changed

2 files changed

+73
-74
lines changed

‎PrimaryConverter/Firmware/Atmel/2020_srw_rc_car_primary/2020_srw_rc_car_primary.cproj

+72-73
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,8 @@
4040
</dependencies>
4141
</framework-data>
4242
</AsfFrameworkConfig>
43-
<avrtool>com.atmel.avrdbg.tool.simulator</avrtool>
44-
<avrtoolserialnumber>
45-
</avrtoolserialnumber>
43+
<avrtool>com.atmel.avrdbg.tool.ispmk2</avrtool>
44+
<avrtoolserialnumber>000200122158</avrtoolserialnumber>
4645
<avrdeviceexpectedsignature>0x1E9516</avrdeviceexpectedsignature>
4746
<com_atmel_avrdbg_tool_medbg>
4847
<ToolOptions>
@@ -66,11 +65,11 @@
6665
</ToolNumber>
6766
<ToolName xmlns="">Simulator</ToolName>
6867
</com_atmel_avrdbg_tool_simulator>
69-
<avrtoolinterfaceclock>0</avrtoolinterfaceclock>
68+
<avrtoolinterfaceclock>125000</avrtoolinterfaceclock>
7069
<com_atmel_avrdbg_tool_ispmk2>
7170
<ToolOptions>
7271
<InterfaceProperties>
73-
<IspClock>0</IspClock>
72+
<IspClock>125000</IspClock>
7473
</InterfaceProperties>
7574
<InterfaceName>ISP</InterfaceName>
7675
</ToolOptions>
@@ -93,79 +92,79 @@
9392
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
9493
<ToolchainSettings>
9594
<AvrGcc>
96-
<avrgcc.common.Device>-mmcu=atmega328pb -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\gcc\dev\atmega328pb"</avrgcc.common.Device>
97-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
98-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
99-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
100-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
101-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
102-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
103-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
104-
<avrgcc.compiler.symbols.DefSymbols>
105-
<ListValues>
106-
<Value>NDEBUG</Value>
107-
</ListValues>
108-
</avrgcc.compiler.symbols.DefSymbols>
109-
<avrgcc.compiler.directories.IncludePaths>
110-
<ListValues>
111-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
112-
</ListValues>
113-
</avrgcc.compiler.directories.IncludePaths>
114-
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
115-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
116-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
117-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
118-
<avrgcc.linker.libraries.Libraries>
119-
<ListValues>
120-
<Value>libm</Value>
121-
</ListValues>
122-
</avrgcc.linker.libraries.Libraries>
123-
<avrgcc.assembler.general.IncludePaths>
124-
<ListValues>
125-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
126-
</ListValues>
127-
</avrgcc.assembler.general.IncludePaths>
128-
</AvrGcc>
95+
<avrgcc.common.Device>-mmcu=atmega328pb -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\gcc\dev\atmega328pb"</avrgcc.common.Device>
96+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
97+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
98+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
99+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
100+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
101+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
102+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
103+
<avrgcc.compiler.symbols.DefSymbols>
104+
<ListValues>
105+
<Value>NDEBUG</Value>
106+
</ListValues>
107+
</avrgcc.compiler.symbols.DefSymbols>
108+
<avrgcc.compiler.directories.IncludePaths>
109+
<ListValues>
110+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
111+
</ListValues>
112+
</avrgcc.compiler.directories.IncludePaths>
113+
<avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
114+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
115+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
116+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
117+
<avrgcc.linker.libraries.Libraries>
118+
<ListValues>
119+
<Value>libm</Value>
120+
</ListValues>
121+
</avrgcc.linker.libraries.Libraries>
122+
<avrgcc.assembler.general.IncludePaths>
123+
<ListValues>
124+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
125+
</ListValues>
126+
</avrgcc.assembler.general.IncludePaths>
127+
</AvrGcc>
129128
</ToolchainSettings>
130129
</PropertyGroup>
131130
<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
132131
<ToolchainSettings>
133132
<AvrGcc>
134-
<avrgcc.common.Device>-mmcu=atmega328pb -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\gcc\dev\atmega328pb"</avrgcc.common.Device>
135-
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
136-
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
137-
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
138-
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
139-
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
140-
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
141-
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
142-
<avrgcc.compiler.symbols.DefSymbols>
143-
<ListValues>
144-
<Value>DEBUG</Value>
145-
</ListValues>
146-
</avrgcc.compiler.symbols.DefSymbols>
147-
<avrgcc.compiler.directories.IncludePaths>
148-
<ListValues>
149-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
150-
</ListValues>
151-
</avrgcc.compiler.directories.IncludePaths>
152-
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
153-
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
154-
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
155-
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
156-
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
157-
<avrgcc.linker.libraries.Libraries>
158-
<ListValues>
159-
<Value>libm</Value>
160-
</ListValues>
161-
</avrgcc.linker.libraries.Libraries>
162-
<avrgcc.assembler.general.IncludePaths>
163-
<ListValues>
164-
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
165-
</ListValues>
166-
</avrgcc.assembler.general.IncludePaths>
167-
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
168-
</AvrGcc>
133+
<avrgcc.common.Device>-mmcu=atmega328pb -B "%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\gcc\dev\atmega328pb"</avrgcc.common.Device>
134+
<avrgcc.common.outputfiles.hex>True</avrgcc.common.outputfiles.hex>
135+
<avrgcc.common.outputfiles.lss>True</avrgcc.common.outputfiles.lss>
136+
<avrgcc.common.outputfiles.eep>True</avrgcc.common.outputfiles.eep>
137+
<avrgcc.common.outputfiles.srec>True</avrgcc.common.outputfiles.srec>
138+
<avrgcc.common.outputfiles.usersignatures>False</avrgcc.common.outputfiles.usersignatures>
139+
<avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
140+
<avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
141+
<avrgcc.compiler.symbols.DefSymbols>
142+
<ListValues>
143+
<Value>DEBUG</Value>
144+
</ListValues>
145+
</avrgcc.compiler.symbols.DefSymbols>
146+
<avrgcc.compiler.directories.IncludePaths>
147+
<ListValues>
148+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
149+
</ListValues>
150+
</avrgcc.compiler.directories.IncludePaths>
151+
<avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
152+
<avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
153+
<avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
154+
<avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
155+
<avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
156+
<avrgcc.linker.libraries.Libraries>
157+
<ListValues>
158+
<Value>libm</Value>
159+
</ListValues>
160+
</avrgcc.linker.libraries.Libraries>
161+
<avrgcc.assembler.general.IncludePaths>
162+
<ListValues>
163+
<Value>%24(PackRepoDir)\atmel\ATmega_DFP\1.6.364\include\</Value>
164+
</ListValues>
165+
</avrgcc.assembler.general.IncludePaths>
166+
<avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
167+
</AvrGcc>
169168
</ToolchainSettings>
170169
</PropertyGroup>
171170
<ItemGroup>

‎PrimaryConverter/Firmware/Atmel/2020_srw_rc_car_primary/usart0.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ void usart0_transmit_data()
8888
sprintf(buffer_temp1, "TEMP1: %ld deg\n\r", adc_get_avg_temp1());
8989
sprintf(buffer_temp2, "TEMP2: %ld deg\n\r", adc_get_avg_temp2());
9090
sprintf(buffer_temp3, "TEMP3: %ld deg\n\r", adc_get_avg_temp3());
91-
sprintf(buffer_isens, "ISENS: %ld mV\n\r", adc_get_avg_current());
91+
sprintf(buffer_isens, "ISENS: %ld mA\n\r", adc_get_avg_current());
9292
sprintf(buffer_vsens, "VSENS: %ld mV\n\r\n\r", adc_get_avg_voltage());
9393

9494
usart0_transmit_string("ADC_DATA\n\r--------\n\r");

0 commit comments

Comments
 (0)