diff --git a/DSTAT/src/config/conf_board.h b/DSTAT/src/config/conf_board.h
index ca27c6d7183c7c61eff220cb2ed7a657bb9487f8..4fb468eaf49297e39eaf8612eac3a184dc659ede 100644
--- a/DSTAT/src/config/conf_board.h
+++ b/DSTAT/src/config/conf_board.h
@@ -11,4 +11,11 @@
#define BOARD_VER_MAJOR 1
#define BOARD_VER_MINOR 2
+
+// Default Settings (only used if EEPROM is empty)
+#define SETTINGS_MAX5443_OFFSET 0
+#define SETTINGS_TCS_ENABLED 0
+#define SETTINGS_TCS_CLEAR_THRESHOLD 10000U
+
+
#endif // CONF_BOARD_H
diff --git a/DSTAT/src/experiment.c b/DSTAT/src/experiment.c
index 8a92928e75e05162f397b8493c5dbdf3940ecb3a..c56799566ce781d9f4cb62b93ab7c983472b9ccd 100644
--- a/DSTAT/src/experiment.c
+++ b/DSTAT/src/experiment.c
@@ -16,6 +16,7 @@
*/
#include "experiment.h"
+#include "config/conf_board.h"
//Public variable definitions
uint16_t g_gain = POT_GAIN_30k;
@@ -53,6 +54,97 @@ typedef void (*port_callback_t) (void);
static port_callback_t portd_int0_callback;
static port_callback_t portd_int1_callback;
+void experiment_handler(char command){
+ static int16_t p1, p2, p3;
+ static uint16_t u1, u2, u3, u4;
+ static uint8_t p5, o1, o2, o3;
+ static int16_t pcv1, pcv2;
+ static uint16_t pct1, pct2;
+
+ switch (command){
+ case 'A': //ADS Buffer/rate/PGA values from ads1255.h
+ scanf("%hhx%hhx%hhx",&o1,&o2,&o3);
+ printf("#A: %x %x %x\r\n",o1,o2,o3);
+ ads1255_setup(o1, o2, o3);
+ break;
+
+ case 'G': //Gain
+ scanf("%u",&g_gain);
+ printf("#G: %u\r\n", g_gain);
+ pot_set_gain(); //uses global g_gain, so no params
+ break;
+
+ case 'L': //LSV - start, stop, slope
+ scanf("%u%u%i%i%i%i%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1);
+ precond(pcv1,pct1,pcv2,pct2);
+ lsv_experiment(p1,p2,u1,2);
+ break;
+
+ case 'C': //CV - v1, v2, start, scans, slope
+ scanf("%u%u%i%i%i%i%i%hhu%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&p3,&p5,&u1);
+ precond(pcv1,pct1,pcv2,pct2);
+ cv_experiment(p1,p2,p3,p5,u1);
+ break;
+
+ case 'S': //SWV - start, stop, step size, pulse_height, frequency, scans
+ scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
+ precond(pcv1,pct1,pcv2,pct2);
+ swv_experiment(p1,p2,u1,u2,u3,u4);
+ break;
+
+ case 'D': //DPV - start, stop, step size, pulse_height, period, width
+ scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
+ precond(pcv1,pct1,pcv2,pct2);
+ dpv_experiment(p1,p2,u1,u2,u3,u4);
+ break;
+
+ #if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR >= 2
+ case 'P': //potentiometry - time, OCP/poteniometry
+ scanf("%u%hhu",&pct1, &o1);
+ pot_experiment(pct1, o1);
+ break;
+ #endif
+
+ case 'R': //CA - steps, step_dac[], step_seconds[]
+ scanf("%hhu",&p5); //get number of steps
+ printf("#Steps: %u\n\r", p5);
+
+ //allocate arrays for steps
+ uint16_t * step_dac = malloc(p5*sizeof(uint16_t));
+ uint16_t * step_seconds = malloc(p5*sizeof(uint16_t));
+
+ //check for successful allocation
+ if (!step_dac || !step_seconds){
+ printf("#ERR: Could not allocate memory\n\r");
+ break;
+ }
+
+ uint8_t i;
+
+ for (i=0; i<p5; i++){
+ scanf("%u", &step_dac[i]); // get voltage steps (dac units)
+ printf("#DAC: %u\n\r", step_dac[i]);
+ }
+
+ for (i=0; i<p5; i++){
+ scanf("%u", &step_seconds[i]); //get step durations (seconds)
+ printf("#Time: %u\n\r", step_seconds[i]);
+ }
+
+ ca_experiment(p5, step_dac, step_seconds);
+
+ //free arrays
+ free(step_dac);
+ free(step_seconds);
+
+ break;
+
+ default:
+ printf("#ERR: Command %c not recognized\n\r", command);
+ }
+}
+
+
uint16_t set_timer_period(uint32_t period, volatile void *tc)
{
/**
diff --git a/DSTAT/src/experiment.h b/DSTAT/src/experiment.h
index 6597f120bc597b89ba4f937bd4ebf0a4916a64c9..75d5bda20a158e4c12cf1bcd4edf9385196283fe 100644
--- a/DSTAT/src/experiment.h
+++ b/DSTAT/src/experiment.h
@@ -75,6 +75,7 @@
extern uint16_t g_gain;
extern uint8_t autogain_enable;
+void experiment_handler(char command);
void pot_init(void);
void pot_set_gain(void);
void volt_exp_start(void);
diff --git a/DSTAT/src/main.c b/DSTAT/src/main.c
index 0faf725e03b8e9ec5a5ba8a8342968eec4fd67c5..bcbd1a028905f2545c7958bf4f3eac8ba440d4b1 100644
--- a/DSTAT/src/main.c
+++ b/DSTAT/src/main.c
@@ -12,11 +12,6 @@
#include <math.h>
#include <stdint.h>
-//Internal global variables
-int16_t p1, p2, p3, p4;
-uint16_t u1, u2, u3, u4;
-uint8_t p5, o1, o2, o3;
-
//Internal function declarations
int8_t command_handler(char command);
@@ -27,88 +22,16 @@ int8_t command_handler(char command){
* Calls functions in
* @param command Command character input.
*/
-
- static int16_t pcv1, pcv2;
- static uint16_t pct1, pct2;
-
- switch (command){
- case 'A': //ADS Buffer/rate/PGA values from ads1255.h
- scanf("%hhx%hhx%hhx",&o1,&o2,&o3);
- printf("#A: %x %x %x\r\n",o1,o2,o3);
- ads1255_setup(o1, o2, o3);
- break;
-
- case 'G': //Gain
- scanf("%u",&g_gain);
- printf("#G: %u\r\n", g_gain);
- pot_set_gain(); //uses global g_gain, so no params
- break;
-
- case 'L': //LSV - start, stop, slope
- scanf("%u%u%i%i%i%i%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1);
- precond(pcv1,pct1,pcv2,pct2);
- lsv_experiment(p1,p2,u1,2);
- break;
-
- case 'C': //CV - v1, v2, start, scans, slope
- scanf("%u%u%i%i%i%i%i%hhu%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&p3,&p5,&u1);
- precond(pcv1,pct1,pcv2,pct2);
- cv_experiment(p1,p2,p3,p5,u1);
- break;
-
- case 'S': //SWV - start, stop, step size, pulse_height, frequency, scans
- scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
- precond(pcv1,pct1,pcv2,pct2);
- swv_experiment(p1,p2,u1,u2,u3,u4);
- break;
-
- case 'D': //DPV - start, stop, step size, pulse_height, period, width
- scanf("%u%u%i%i%i%i%u%u%u%u",&pct1,&pct2,&pcv1,&pcv2,&p1,&p2,&u1,&u2,&u3,&u4);
- precond(pcv1,pct1,pcv2,pct2);
- dpv_experiment(p1,p2,u1,u2,u3,u4);
- break;
-
- #if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR >= 2
- case 'P': //potentiometry - time, OCP/poteniometry
- scanf("%u%hhu",&pct1, &o1);
- pot_experiment(pct1, o1);
- break;
- #endif
-
- case 'R': //CA - steps, step_dac[], step_seconds[]
- scanf("%hhu",&p5); //get number of steps
- printf("#Steps: %u\n\r", p5);
-
- //allocate arrays for steps
- uint16_t * step_dac = malloc(p5*sizeof(uint16_t));
- uint16_t * step_seconds = malloc(p5*sizeof(uint16_t));
-
- //check for successful allocation
- if (!step_dac || !step_seconds){
- printf("#ERR: Could not allocate memory\n\r");
- break;
- }
-
- uint8_t i;
-
- for (i=0; i<p5; i++){
- scanf("%u", &step_dac[i]); // get voltage steps (dac units)
- printf("#DAC: %u\n\r", step_dac[i]);
- }
-
- for (i=0; i<p5; i++){
- scanf("%u", &step_seconds[i]); //get step durations (seconds)
- printf("#Time: %u\n\r", step_seconds[i]);
- }
- ca_experiment(p5, step_dac, step_seconds);
-
- //free arrays
- free(step_dac);
- free(step_seconds);
-
- break;
-
+ switch (command){
+ case 'E': //Experiment options
+ experiment_handler(getchar());
+ break;
+
+ case 'S': //Settings options
+ settings_handler(getchar());
+ break;
+
case 'V': //check version
printf("V%u.%u\n", BOARD_VER_MAJOR, BOARD_VER_MINOR);
break;
@@ -160,6 +83,8 @@ int main(void){
autogain_enable = 0;
g_gain = POT_GAIN_30k;
pot_set_gain();
+
+ settings_read_eeprom();
// Wait for application connection - Get 'c', reply 'K', get 'k'
diff --git a/DSTAT/src/max5443.c b/DSTAT/src/max5443.c
index 57fb25c35b4ff17d12ef045ca4a750a13906251c..b36b22a2eb285d8c9a6f96bdd57173c68544ba18 100644
--- a/DSTAT/src/max5443.c
+++ b/DSTAT/src/max5443.c
@@ -35,18 +35,18 @@ void max5443_set_voltage1(uint16_t dacindex){
uint16_t ui16;
} buffer;
- if (settings.max5443_offset < 0)
+ if (settings.settings.max5443_offset < 0)
{
- settings.max5443_offset = abs(settings.max5443_offset);
- if (((uint16_t)settings.max5443_offset) > dacindex)
+ settings.settings.max5443_offset = abs(settings.settings.max5443_offset);
+ if (((uint16_t)settings.settings.max5443_offset) > dacindex)
buffer.ui16 = 0;
else
- buffer.ui16 = dacindex - (uint16_t)settings.max5443_offset;
+ buffer.ui16 = dacindex - (uint16_t)settings.settings.max5443_offset;
}
- else if (((uint16_t)settings.max5443_offset) > (65535 - dacindex))
+ else if (((uint16_t)settings.settings.max5443_offset) > (65535 - dacindex))
buffer.ui16 = 65535;
else
- buffer.ui16 = dacindex + (uint16_t)settings.max5443_offset;
+ buffer.ui16 = dacindex + (uint16_t)settings.settings.max5443_offset;
irqflags_t flags;
flags = cpu_irq_save();
diff --git a/DSTAT/src/max5443.h b/DSTAT/src/max5443.h
index d46330dc01116a8a1127a1067dea4d7eb6e01750..e302f04abd5cee3bd36cf5105e0d14bf1f8d6523 100644
--- a/DSTAT/src/max5443.h
+++ b/DSTAT/src/max5443.h
@@ -14,8 +14,6 @@
void max5443_init_pins(void);
void max5443_init_module(void);
-void max5443_read_eeprom(void);
-void max5443_write_eeprom(void);
void max5443_set_voltage1(uint16_t dacindex);
//void max5443_set_voltage_8bit(uint8_t dacindex);
diff --git a/DSTAT/src/settings.c b/DSTAT/src/settings.c
index 6092986d64c599cef4a7142b84b3a50b63c865d1..9cb5631bf95ff388f10fe9be74b978b13c7d3680 100644
--- a/DSTAT/src/settings.c
+++ b/DSTAT/src/settings.c
@@ -8,25 +8,55 @@
// Save/Retrieve settings from EEPROM
#include "settings.h"
+#include "config/conf_board.h"
-// From module: NVM - Non Volatile Memory
-#include <nvm.h>
-
-// From module: NVM - Non volatile memory access
-#include <common_nvm.h>
-
-#define SETTINGS_EEPROM_PARAM_PAGE 1
+#define SETTINGS_EEPROM_PARAM_PAGE 0
#define SETTINGS_EEPROM_OFFSET_ADDR SETTINGS_EEPROM_PARAM_PAGE * EEPROM_PAGE_SIZE
+void settings_handler(char command){
+ switch (command){
+ case 'D': //Reset defaults
+ settings_restore_defaults();
+ break;
+
+ case 'R': //Read settings from EEPROM
+ settings_read_eeprom();
+ break;
+
+ case 'W': //Write new settings
+ scanf("%i%hhu%u", &settings.settings.max5443_offset, &settings.settings.tcs_enabled, &settings.settings.tcs_clear_threshold);
+ settings_write_eeprom();
+ break;
+
+ default:
+ printf("#ERR: Command %c not recognized\n\r", command);
+ }
+}
+
void settings_read_eeprom(void){
- nvm_eeprom_read_buffer(SETTINGS_EEPROM_OFFSET_ADDR, &settings, EEPROM_PAGE_SIZE);
printf("#INFO: SETTINGS\n\r");
- printf("#INFO: max5443_offset = %u\n\r", settings.max5443_offset);
- printf("#INFO: tls_enabled = %u\n\r", settings.tls_enabled);
- printf("#INFO: tls_clear_threshold = %u\n\r", settings.tls_clear_threshold);
+ nvm_eeprom_read_buffer(SETTINGS_EEPROM_OFFSET_ADDR, &settings, EEPROM_PAGE_SIZE);
+ if (settings.settings.programmed != 1) {
+ printf("#INFO: EEPROM not programmed\n\r");
+ settings_restore_defaults();
+ }
+ printf("#INFO: max5443_offset = %u\n\r", settings.settings.max5443_offset);
+ printf("#INFO: tls_enabled = %u\n\r", settings.settings.tcs_enabled);
+ printf("#INFO: tls_clear_threshold = %u\n\r", settings.settings.tcs_clear_threshold);
}
void settings_write_eeprom(void){
nvm_eeprom_load_page_to_buffer(&settings);
nvm_eeprom_atomic_write_page(SETTINGS_EEPROM_OFFSET_ADDR);
-}
\ No newline at end of file
+}
+
+void settings_restore_defaults(void){
+ printf("#INFO: Restoring EEPROM Defaults\n\r");
+ settings.settings.programmed = 1;
+ settings.settings.max5443_offset = SETTINGS_MAX5443_OFFSET;
+ settings.settings.tcs_enabled = SETTINGS_TCS_ENABLED;
+ settings.settings.tcs_clear_threshold = SETTINGS_TCS_CLEAR_THRESHOLD;
+
+ settings_write_eeprom();
+}
+
diff --git a/DSTAT/src/settings.h b/DSTAT/src/settings.h
index 11df3e8f8f79a0e23b03bbb5cc14095669a352a6..2c8ccbbacce5f04cf0fe2e8d070b55d8b58ecfe3 100644
--- a/DSTAT/src/settings.h
+++ b/DSTAT/src/settings.h
@@ -11,15 +11,27 @@
#include <stdio.h>
-struct{ //Make sure this doesn't exceed 32 bytes
+// From module: NVM - Non Volatile Memory
+#include <nvm.h>
+
+// From module: NVM - Non volatile memory access
+#include <common_nvm.h>
+
+struct settings_list { //Make sure this doesn't exceed 32 bytes
+ uint8_t programmed;
int16_t max5443_offset;
- uint8_t tls_enabled;
- uint16_t tls_clear_threshold;
-} settings;
+ uint8_t tcs_enabled;
+ uint16_t tcs_clear_threshold;
+};
+union {
+ struct settings_list settings;
+ char temp_char[EEPROM_PAGE_SIZE];
+} settings;
+void settings_handler(char command);
void settings_read_eeprom(void);
void settings_write_eeprom(void);
-
+void settings_restore_defaults(void);
#endif /* settings_h */
diff --git a/EEPROM init/EEPROM init.cproj b/EEPROM init/EEPROM init.cproj
deleted file mode 100644
index 4c3e7a4edd3d64a81e8114532ec3bdd5a923fadf..0000000000000000000000000000000000000000
--- a/EEPROM init/EEPROM init.cproj
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <SchemaVersion>2.0</SchemaVersion>
- <ProjectVersion>6.2</ProjectVersion>
- <ToolchainName>com.Atmel.AVRGCC8.C</ToolchainName>
- <ProjectGuid>{f03c750f-9f8b-4e91-9b72-83f6d7ce27f4}</ProjectGuid>
- <avrdevice>ATxmega256A3U</avrdevice>
- <avrdeviceseries>none</avrdeviceseries>
- <OutputType>Executable</OutputType>
- <Language>C</Language>
- <OutputFileName>$(MSBuildProjectName)</OutputFileName>
- <OutputFileExtension>.elf</OutputFileExtension>
- <OutputDirectory>$(MSBuildProjectDirectory)\$(Configuration)</OutputDirectory>
- <AssemblyName>EEPROM init</AssemblyName>
- <Name>EEPROM init</Name>
- <RootNamespace>EEPROM init</RootNamespace>
- <ToolchainFlavour>Native</ToolchainFlavour>
- <KeepTimersRunning>true</KeepTimersRunning>
- <OverrideVtor>false</OverrideVtor>
- <CacheFlash>true</CacheFlash>
- <ProgFlashFromRam>true</ProgFlashFromRam>
- <RamSnippetAddress />
- <UncachedRange />
- <OverrideVtorValue />
- <BootSegment>2</BootSegment>
- <eraseonlaunchrule>1</eraseonlaunchrule>
- <AsfFrameworkConfig>
- <framework-data>
- <options />
- <configurations />
- <files />
- <documentation help="" />
- <offline-documentation help="" />
- <dependencies>
- <content-extension eid="atmel.asf" uuidref="Atmel.ASF" version="3.6.0" />
- </dependencies>
- </framework-data>
- </AsfFrameworkConfig>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
- <ToolchainSettings>
- <AvrGcc>
- <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
- <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>
- <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
- <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
- <avrgcc.compiler.symbols.DefSymbols>
- <ListValues>
- <Value>NDEBUG</Value>
- </ListValues>
- </avrgcc.compiler.symbols.DefSymbols>
- <avrgcc.compiler.optimization.level>Optimize for size (-Os)</avrgcc.compiler.optimization.level>
- <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
- <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
- <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
- <avrgcc.linker.libraries.Libraries>
- <ListValues>
- <Value>libm</Value>
- </ListValues>
- </avrgcc.linker.libraries.Libraries>
- </AvrGcc>
- </ToolchainSettings>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
- <ToolchainSettings>
- <AvrGcc>
- <avrgcc.common.optimization.RelaxBranches>True</avrgcc.common.optimization.RelaxBranches>
- <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>
- <avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>True</avrgcc.compiler.general.ChangeDefaultCharTypeUnsigned>
- <avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>True</avrgcc.compiler.general.ChangeDefaultBitFieldUnsigned>
- <avrgcc.compiler.symbols.DefSymbols>
- <ListValues>
- <Value>DEBUG</Value>
- </ListValues>
- </avrgcc.compiler.symbols.DefSymbols>
- <avrgcc.compiler.optimization.level>Optimize (-O1)</avrgcc.compiler.optimization.level>
- <avrgcc.compiler.optimization.PackStructureMembers>True</avrgcc.compiler.optimization.PackStructureMembers>
- <avrgcc.compiler.optimization.AllocateBytesNeededForEnum>True</avrgcc.compiler.optimization.AllocateBytesNeededForEnum>
- <avrgcc.compiler.optimization.DebugLevel>Default (-g2)</avrgcc.compiler.optimization.DebugLevel>
- <avrgcc.compiler.warnings.AllWarnings>True</avrgcc.compiler.warnings.AllWarnings>
- <avrgcc.linker.libraries.Libraries>
- <ListValues>
- <Value>libm</Value>
- </ListValues>
- </avrgcc.linker.libraries.Libraries>
- <avrgcc.assembler.debugging.DebugLevel>Default (-Wa,-g)</avrgcc.assembler.debugging.DebugLevel>
- </AvrGcc>
- </ToolchainSettings>
- </PropertyGroup>
- <ItemGroup>
- <Compile Include="EEPROM_init.c">
- <SubType>compile</SubType>
- </Compile>
- </ItemGroup>
- <Import Project="$(AVRSTUDIO_EXE_PATH)\\Vs\\Compiler.targets" />
-</Project>
\ No newline at end of file
diff --git a/EEPROM init/EEPROM_init.c b/EEPROM init/EEPROM_init.c
deleted file mode 100644
index f77b7b6da752c223fe7e23b8227fac18f9e6527b..0000000000000000000000000000000000000000
--- a/EEPROM init/EEPROM_init.c
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * EEPROM_init.c
- *
- * Created: 29/04/2014 3:42:38 PM
- * Author: mdryden
- */
-
-#include <avr/eeprom.h>
-
-struct {
- char a[32];
- uint8_t max5443_offset;
-} eevars EEMEM = {
- {},
- 0
-};
-
-int main(void)
-{
-}
\ No newline at end of file
diff --git a/EEPROM init/Makefile b/EEPROM init/Makefile
deleted file mode 100644
index 564aa7fc5e742fbb23093201229b777b1598f878..0000000000000000000000000000000000000000
--- a/EEPROM init/Makefile
+++ /dev/null
@@ -1,495 +0,0 @@
-# List of available make goals:
-#
-# all Default target, builds the project
-# clean Clean up the project
-# rebuild Rebuild the project
-#
-# doc Build the documentation
-# cleandoc Clean up the documentation
-# rebuilddoc Rebuild the documentation
-#
-#
-# Copyright (c) 2009 - 2013 Atmel Corporation. All rights reserved.
-#
-# \asf_license_start
-#
-# \page License
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# 3. The name of Atmel may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# 4. This software may only be redistributed and used in connection with an
-# Atmel microcontroller product.
-#
-# THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
-# EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# \asf_license_stop
-#
-
-# Include the config.mk file from the current working path, e.g., where the
-# user called make.
-include config.mk
-
-# Tool to use to generate documentation from the source code
-DOCGEN ?= doxygen
-
-# Look for source files relative to the top-level source directory
-VPATH := $(PRJ_PATH)
-
-# Output target file
-target := $(TARGET)
-
-# Output project name (target name minus suffix)
-project := $(basename $(target))
-
-# Output target file (typically ELF or static library)
-ifeq ($(suffix $(target)),.a)
-target_type := lib
-else
-ifeq ($(suffix $(target)),.elf)
-target_type := elf
-else
-$(error "Target type $(target_type) is not supported")
-endif
-endif
-
-# Allow override of operating system detection. The user can add OS=Linux or
-# OS=Windows on the command line to explicit set the host OS.
-#
-# This allows to work around broken uname utility on certain systems.
-ifdef OS
- ifeq ($(strip $(OS)), Linux)
- os_type := Linux
- endif
- ifeq ($(strip $(OS)), Windows)
- os_type := windows32_64
- endif
-endif
-
-os_type ?= $(strip $(shell uname))
-
-ifeq ($(os_type),windows32)
-os := Windows
-else
-ifeq ($(os_type),windows64)
-os := Windows
-else
-ifeq ($(os_type),windows32_64)
-os ?= Windows
-else
-ifeq ($(os_type),)
-os := Windows
-else
-# Default to Linux style operating system. Both Cygwin and mingw are fully
-# compatible (for this Makefile) with Linux.
-os := Linux
-endif
-endif
-endif
-endif
-
-# Output documentation directory and configuration file.
-docdir := ./doxygen/
-doccfg := ./doxyfile
-
-CROSS ?= avr-
-AR := $(CROSS)ar
-AS := $(CROSS)as
-CC := $(CROSS)gcc
-CPP := $(CROSS)gcc -E
-CXX := $(CROSS)g++
-LD := $(CROSS)gcc
-NM := $(CROSS)nm
-OBJCOPY := $(CROSS)objcopy
-OBJDUMP := $(CROSS)objdump
-SIZE := $(CROSS)size
-
-RM := rm
-ifeq ($(os),Windows)
-RMDIR := rmdir /S /Q
-else
-RMDIR := rm -df || true
-endif
-
-# On Windows, we need to override the shell to force the use of cmd.exe
-ifeq ($(os),Windows)
-SHELL := cmd
-endif
-
-# Strings for beautifying output
-MSG_CLEAN_FILES = "RM *.o *.d"
-MSG_CLEAN_DIRS = "RMDIR $(strip $(clean-dirs))"
-MSG_CLEAN_DOC = "RMDIR $(docdir)"
-MSG_MKDIR = "MKDIR $(dir $@)"
-
-MSG_INFO = "INFO "
-MSG_PREBUILD = "PREBUILD $(PREBUILD_CMD)"
-MSG_POSTBUILD = "POSTBUILD $(POSTBUILD_CMD)"
-
-MSG_ARCHIVING = "AR $@"
-MSG_ASSEMBLING = "AS $@"
-MSG_BINARY_IMAGE = "OBJCOPY $@"
-MSG_COMPILING = "CC $@"
-MSG_COMPILING_CXX = "CXX $@"
-MSG_EEPROM_IMAGE = "OBJCOPY $@"
-MSG_EXTENDED_LISTING = "OBJDUMP $@"
-MSG_IHEX_IMAGE = "OBJCOPY $@"
-MSG_LINKING = "LN $@"
-MSG_PREPROCESSING = "CPP $@"
-MSG_SIZE = "SIZE $@"
-MSG_SYMBOL_TABLE = "NM $@"
-
-MSG_GENERATING_DOC = "DOXYGEN $(docdir)"
-
-# Don't use make's built-in rules and variables
-MAKEFLAGS += -rR
-
-# Don't print 'Entering directory ...'
-MAKEFLAGS += --no-print-directory
-
-# Function for reversing the order of a list
-reverse = $(if $(1),$(call reverse,$(wordlist 2,$(words $(1)),$(1)))) $(firstword $(1))
-
-# Hide command output by default, but allow the user to override this
-# by adding V=1 on the command line.
-#
-# This is inspired by the Kbuild system used by the Linux kernel.
-ifdef V
- ifeq ("$(origin V)", "command line")
- VERBOSE = $(V)
- endif
-endif
-ifndef VERBOSE
- VERBOSE = 0
-endif
-
-ifeq ($(VERBOSE), 1)
- Q =
-else
- Q = @
-endif
-
-arflags-gnu-y := $(ARFLAGS)
-asflags-gnu-y := $(ASFLAGS)
-cflags-gnu-y := $(CFLAGS)
-cxxflags-gnu-y := $(CXXFLAGS)
-cppflags-gnu-y := $(CPPFLAGS)
-cpuflags-gnu-y :=
-dbgflags-gnu-y := $(DBGFLAGS)
-libflags-gnu-y := $(foreach LIB,$(LIBS),-l$(LIB))
-ldflags-gnu-y := $(LDFLAGS)
-flashflags-gnu-y := $(FLASHFLAGS)
-eepromflags-gnu-y := $(EEPROMFLAGS)
-clean-files :=
-clean-dirs :=
-
-clean-files += $(wildcard $(target) $(project).map)
-clean-files += $(wildcard $(project).hex $(project).eep)
-clean-files += $(wildcard $(project).lss $(project).sym)
-clean-files += $(wildcard $(build))
-
-# Use pipes instead of temporary files for communication between processes
-cflags-gnu-y += -pipe
-asflags-gnu-y += -pipe
-ldflags-gnu-y += -pipe
-
-# Archiver flags.
-arflags-gnu-y += rcs
-
-# Always enable warnings. And be very careful about implicit
-# declarations.
-cflags-gnu-y += -Wall -Wstrict-prototypes -Wmissing-prototypes
-cflags-gnu-y += -Werror-implicit-function-declaration
-cxxflags-gnu-y += -Wall
-# IAR doesn't allow arithmetic on void pointers, so warn about that.
-cflags-gnu-y += -Wpointer-arith
-cxxflags-gnu-y += -Wpointer-arith
-
-# Preprocessor flags.
-cppflags-gnu-y += $(foreach INC,$(addprefix $(PRJ_PATH),$(INC_PATH)),-I$(INC))
-asflags-gnu-y += $(foreach INC,$(addprefix $(PRJ_PATH),$(INC_PATH)),'-Wa,-I$(INC)')
-
-# CPU specific flags.
-cpuflags-gnu-y += -mmcu=$(MCU)
-
-# Dependency file flags.
-depflags = -MD -MP -MQ $@
-
-# Debug specific flags.
-ifdef BUILD_DEBUG_LEVEL
-dbgflags-gnu-y += -g$(BUILD_DEBUG_LEVEL)
-else
-dbgflags-gnu-y += -gdwarf-2
-endif
-
-# Optimization specific flags.
-ifdef BUILD_OPTIMIZATION
-optflags-gnu-y = -O$(BUILD_OPTIMIZATION)
-else
-optflags-gnu-y = $(OPTIMIZATION)
-endif
-
-# Relax compilation and linking.
-cflags-gnu-y += -mrelax
-cxxflags-gnu-y += -mrelax
-asflags-gnu-y += -mrelax
-ldflags-gnu-y += -Wl,--relax
-
-# Always preprocess assembler files.
-asflags-gnu-y += -x assembler-with-cpp
-# Compile C files using the GNU99 standard.
-cflags-gnu-y += -std=gnu99
-# Compile C++ files using the GNU++98 standard.
-cxxflags-gnu-y += -std=gnu++98
-
-# Use unsigned character type when compiling.
-cflags-gnu-y += -funsigned-char
-cxxflags-gnu-y += -funsigned-char
-
-# Don't use strict aliasing (very common in embedded applications).
-cflags-gnu-y += -fno-strict-aliasing
-cxxflags-gnu-y += -fno-strict-aliasing
-
-# Separate each function and data into its own separate section to allow
-# garbage collection of unused sections.
-cflags-gnu-y += -ffunction-sections -fdata-sections
-cxxflags-gnu-y += -ffunction-sections -fdata-sections
-
-# Garbage collect unreferred sections when linking.
-ldflags-gnu-y += -Wl,--gc-sections
-
-# Output a link map file and a cross reference table
-ldflags-gnu-y += -Wl,-Map=$(project).map,--cref
-
-# Add library search paths relative to the top level directory.
-ldflags-gnu-y += $(foreach _LIB_PATH,$(addprefix $(PRJ_PATH),$(LIB_PATH)),-L$(_LIB_PATH))
-
-a_flags = $(cpuflags-gnu-y) $(depflags) $(cppflags-gnu-y) $(asflags-gnu-y) -D__ASSEMBLY__
-c_flags = $(cpuflags-gnu-y) $(dbgflags-gnu-y) $(depflags) $(optflags-gnu-y) $(cppflags-gnu-y) $(cflags-gnu-y)
-cxx_flags= $(cpuflags-gnu-y) $(dbgflags-gnu-y) $(depflags) $(optflags-gnu-y) $(cppflags-gnu-y) $(cxxflags-gnu-y)
-l_flags = $(cpuflags-gnu-y) $(optflags-gnu-y) $(ldflags-gnu-y)
-ar_flags = $(arflags-gnu-y)
-
-# Intel Hex file production flags
-flashflags-gnu-y += -R .eeprom -R .usb_descriptor_table
-
-# Eeprom file production flags
-eepromflags-gnu-y += -j .eeprom
-eepromflags-gnu-y += --set-section-flags=.eeprom="alloc,load"
-eepromflags-gnu-y += --change-section-lma .eeprom=0
-
-# Source files list and part informations must already be included before
-# running this makefile
-
-# If a custom build directory is specified, use it -- force trailing / in directory name.
-ifdef BUILD_DIR
- build-dir := $(dir $(BUILD_DIR))$(if $(notdir $(BUILD_DIR)),$(notdir $(BUILD_DIR))/)
-else
- build-dir =
-endif
-
-# Create object files list from source files list.
-obj-y := $(addprefix $(build-dir), $(addsuffix .o,$(basename $(CSRCS) $(ASSRCS))))
-
-# Create dependency files list from source files list.
-dep-files := $(wildcard $(foreach f,$(obj-y),$(basename $(f)).d))
-
-clean-files += $(wildcard $(obj-y))
-clean-files += $(dep-files)
-
-clean-dirs += $(call reverse,$(sort $(wildcard $(dir $(obj-y)))))
-
-# Default target.
-.PHONY: all
-ifeq ($(target_type),lib)
-all: $(target) $(project).lss $(project).sym
-else
-ifeq ($(target_type),elf)
-all: prebuild $(target) $(project).eep postbuild
-endif
-endif
-
-prebuild:
-ifneq ($(strip $(PREBUILD_CMD)),)
- @echo $(MSG_PREBUILD)
- $(Q)$(PREBUILD_CMD)
-endif
-
-postbuild:
-ifneq ($(strip $(POSTBUILD_CMD)),)
- @echo $(MSG_POSTBUILD)
- $(Q)$(POSTBUILD_CMD)
-endif
-
-# Clean up the project.
-.PHONY: clean
-clean:
- @$(if $(strip $(clean-files)),echo $(MSG_CLEAN_FILES))
- $(if $(strip $(clean-files)),$(Q)$(RM) $(clean-files),)
- @$(if $(strip $(clean-dirs)),echo $(MSG_CLEAN_DIRS))
-# Remove created directories, and make sure we only remove existing
-# directories, since recursive rmdir might help us a bit on the way.
-ifeq ($(os),Windows)
- $(Q)$(if $(strip $(clean-dirs)), \
- $(RMDIR) $(strip $(subst /,\,$(clean-dirs))))
-else
- $(Q)$(if $(strip $(clean-dirs)), \
- for directory in $(strip $(clean-dirs)); do \
- if [ -d "$$directory" ]; then \
- $(RMDIR) $$directory; \
- fi \
- done \
- )
-endif
-
-# Rebuild the project.
-.PHONY: rebuild
-rebuild: clean all
-
-.PHONY: objfiles
-objfiles: $(obj-y)
-
-# Create object files from C source files.
-$(build-dir)%.o: %.c $(MAKEFILE_PATH) config.mk
- $(Q)test -d $(dir $@) || echo $(MSG_MKDIR)
-ifeq ($(os),Windows)
- $(Q)test -d $(patsubst %/,%,$(dir $@)) || mkdir $(subst /,\,$(dir $@))
-else
- $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-endif
- @echo $(MSG_COMPILING)
- $(Q)$(CC) $(c_flags) -c $< -o $@
-
-# Create object files from C++ source files.
-$(build-dir)%.o: %.cpp $(MAKEFILE_PATH) config.mk
- $(Q)test -d $(dir $@) || echo $(MSG_MKDIR)
-ifeq ($(os),Windows)
- $(Q)test -d $(patsubst %/,%,$(dir $@)) || mkdir $(subst /,\,$(dir $@))
-else
- $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-endif
- @echo $(MSG_COMPILING_CXX)
- $(Q)$(CXX) $(cxx_flags) -c $< -o $@
-
-# Preprocess and assemble: create object files from assembler source files.
-$(build-dir)%.o: %.s $(MAKEFILE_PATH) config.mk
- $(Q)test -d $(dir $@) || echo $(MSG_MKDIR)
-ifeq ($(os),Windows)
- $(Q)test -d $(patsubst %/,%,$(dir $@)) || mkdir $(subst /,\,$(dir $@))
-else
- $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-endif
- @echo $(MSG_ASSEMBLING)
- $(Q)$(CC) $(a_flags) -c $< -o $@
-
-# Preprocess and assemble: create object files from assembler source files.
-$(build-dir)%.o: %.S $(MAKEFILE_PATH) config.mk
- $(Q)test -d $(dir $@) || echo $(MSG_MKDIR)
-ifeq ($(os),Windows)
- $(Q)test -d $(patsubst %/,%,$(dir $@)) || mkdir $(subst /,\,$(dir $@))
-else
- $(Q)test -d $(dir $@) || mkdir -p $(dir $@)
-endif
- @echo $(MSG_ASSEMBLING)
- $(Q)$(CC) $(a_flags) -c $< -o $@
-
-# Include all dependency files to add depedency to all header files in use.
-include $(dep-files)
-
-ifeq ($(target_type),lib)
-# Archive object files into an archive
-$(target): $(MAKEFILE_PATH) config.mk $(obj-y)
- @echo $(MSG_ARCHIVING)
- $(Q)$(AR) $(ar_flags) $@ $(obj-y)
- @echo $(MSG_SIZE)
- $(Q)$(SIZE) -Bxt $@
-else
-ifeq ($(target_type),elf)
-# Link the object files into an ELF file. Also make sure the target is rebuilt
-# if the common Makefile.avr.in or project config.mk is changed.
-$(target): $(MAKEFILE_PATH) config.mk $(obj-y)
- @echo $(MSG_LINKING)
- $(Q)$(LD) $(l_flags) $(obj-y) $(libflags-gnu-y) -o $@
- @echo $(MSG_SIZE)
- $(Q)$(SIZE) -Ax $@
- $(Q)$(SIZE) -Bx $@
-endif
-endif
-
-# Create extended function listing from target output file.
-%.lss: $(target)
- @echo $(MSG_EXTENDED_LISTING)
- $(Q)$(OBJDUMP) -h -S $< > $@
-
-# Create symbol table from target output file.
-%.sym: $(target)
- @echo $(MSG_SYMBOL_TABLE)
- $(Q)$(NM) -n $< > $@
-
-# Create Intel HEX image from ELF output file.
-%.hex: $(target)
- @echo $(MSG_IHEX_IMAGE)
- $(Q)$(OBJCOPY) -O ihex $(flashflags-gnu-y) $< $@
-
-# Create EEPROM Intel HEX image from ELF output file.
-%.eep: $(target)
- @echo $(MSG_EEPROM_IMAGE)
- $(Q)$(OBJCOPY) $(eepromflags-gnu-y) -O ihex $< $@ || exit 0
-
-# Create binary image from ELF output file.
-%.bin: $(target)
- @echo $(MSG_BINARY_IMAGE)
- $(Q)$(OBJCOPY) -O binary $< $@
-
-# Provide information about the detected host operating system.
-.SECONDARY: info-os
-info-os:
- @echo $(MSG_INFO)$(os) build host detected
-
-# Build Doxygen generated documentation.
-.PHONY: doc
-doc:
- @echo $(MSG_GENERATING_DOC)
- $(Q)cd $(dir $(doccfg)) && $(DOCGEN) $(notdir $(doccfg))
-
-# Clean Doxygen generated documentation.
-.PHONY: cleandoc
-cleandoc:
- @$(if $(wildcard $(docdir)),echo $(MSG_CLEAN_DOC))
- $(Q)$(if $(wildcard $(docdir)),$(RM) -r $(docdir))
-
-# Rebuild the Doxygen generated documentation.
-.PHONY: rebuilddoc
-rebuilddoc: cleandoc doc
-
-# Program to µC
-.PHONY: program
-program: all flash
-
-# Flash µC - flash and disables JTAG
-AVRDUDE_FLAGS = -p x256a3u -c $(AVRDUDE_PROG) -P $(AVRDUDE_PORT) -U eeprom:w:dstat-firmware-eeprom.eep:i
-
-flash: $(TARGET).hex
- avrdude $(AVRDUDE_FLAGS)
-
-
diff --git a/EEPROM init/config.mk b/EEPROM init/config.mk
deleted file mode 100644
index b456f84d0e43e9a4307124c310fe31402ebc726b..0000000000000000000000000000000000000000
--- a/EEPROM init/config.mk
+++ /dev/null
@@ -1,113 +0,0 @@
-#
-# Copyright (c) 2010 Atmel Corporation. All rights reserved.
-#
-# \asf_license_start
-#
-# \page License
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#
-# 1. Redistributions of source code must retain the above copyright notice,
-# this list of conditions and the following disclaimer.
-#
-# 2. Redistributions in binary form must reproduce the above copyright notice,
-# this list of conditions and the following disclaimer in the documentation
-# and/or other materials provided with the distribution.
-#
-# 3. The name of Atmel may not be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# 4. This software may only be redistributed and used in connection with an
-# Atmel microcontroller product.
-#
-# THIS SOFTWARE IS PROVIDED BY ATMEL "AS IS" AND ANY EXPRESS OR IMPLIED
-# WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT ARE
-# EXPRESSLY AND SPECIFICALLY DISCLAIMED. IN NO EVENT SHALL ATMEL BE LIABLE FOR
-# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
-# STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN
-# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
-# POSSIBILITY OF SUCH DAMAGE.
-#
-# \asf_license_stop
-#
-
-PRJ_PATH =
-BUILD_DIR =
-
-# Microcontroller: atxmega128a1, atmega128, attiny261, etc.
-MCU = atxmega256a3u
-F_CPU = 20000000
-
-# Programming settings
-AVRDUDE_PROG = avrispmkII
-AVRDUDE_PORT = usb
-
-# Application target name. Given with suffix .a for library and .elf for a
-# standalone application.
-TARGET = dstat-firmware-eeprom.elf
-
-# C source files located from the top-level source directory
-CSRCS = ${shell find . -type f -name "*.c" -print}
-
-# Assembler source files located from the top-level source directory
-ASSRCS = ${shell find . -type f -name "*.s" -print}
-
-# Include path located from the top-level source directory
-INC_PATH = ${shell find . -type d -print}
-
-# Library paths from the top-level source directory
-LIB_PATH =
-
-# Libraries to link with the project
-LIBS =
-
-# Additional options for debugging. By default the common Makefile.in will
-# add -gdwarf-2.
-DBGFLAGS =
-
-# Optimization settings
-OPTIMIZATION = -Os
-
-# Extra flags used when creating an EEPROM Intel HEX file. By default the
-# common Makefile.in will add -j .eeprom
-# --set-section-flags=.eeprom="alloc,load" --change-section-lma .eeprom=0.
-EEPROMFLAGS =
-
-# Extra flags used when creating an Intel HEX file. By default the common
-# Makefile.in will add -R .eeprom -R .usb_descriptor_table.
-FLASHFLAGS =
-
-# Extra flags to use when archiving.
-ARFLAGS =
-
-# Extra flags to use when assembling.
-ASFLAGS =
-
-# Extra flags to use when compiling.
-CFLAGS =
-
-# Extra flags to use when preprocessing.
-#
-# Preprocessor symbol definitions
-# To add a definition use the format "-D name[=definition]".
-# To cancel a definition use the format "-U name".
-#
-# The most relevant symbols to define for the preprocessor are:
-# BOARD Target board in use, see boards/board.h for a list.
-# EXT_BOARD Optional extension board in use, see boards/board.h for a list.
-CPPFLAGS = \
- -D BOARD=USER_BOARD \
- -D IOPORT_XMEGA_COMPAT \
- -D F_CPU=$(F_CPU)UL
-
-# Extra flags to use when linking
-LDFLAGS = -Wl,-u,vfprintf -lprintf_flt -Wl,-u,vfscanf -lscanf_flt
-
-# Pre- and post-build commands
-PREBUILD_CMD =
-POSTBUILD_CMD =
\ No newline at end of file