Skip to content

Commit 338c73d

Browse files
tracy2995tracy2995
committed
Reverted to current firmware, New device code is on branch devel
1 parent 9e51c4f commit 338c73d

File tree

8 files changed

+1549
-1761
lines changed

8 files changed

+1549
-1761
lines changed

‎Firmware/Firmware.hex

Lines changed: 1483 additions & 1538 deletions
Large diffs are not rendered by default.

‎Firmware/Firmware.ino

Lines changed: 42 additions & 169 deletions
Large diffs are not rendered by default.

‎Firmware/MemoryFree.cpp

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎Firmware/MemoryFree.h

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Firmware/powerSleep.cpp

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,25 @@
1717
* Continue on wake-up
1818
* Return
1919
\***************************************/
20-
/*
20+
2121
void enterSleep()
2222
{
23+
/*** Setup Sleep options ***/
24+
2325
set_sleep_mode(SLEEP_MODE_STANDBY); // Lowest powerdown mode
2426
sleep_enable(); // Enable sleep
2527

28+
/*** Put processor to sleep ***/
29+
2630
sleep_mode();
31+
32+
/*** Continue ***/
2733

2834
sleep_disable();
2935

3036
return;
3137
}
32-
*/
38+
3339
/**********************************************\
3440
* Function Name: disableUnneededPeripherals
3541
* Purpose: Cut all power to peripherals
@@ -161,7 +167,6 @@ void serialPowerDown()
161167
* Outputs: None
162168
* pseudocode:
163169
* Power on the SPI interface
164-
* Enable power to the SD Card
165170
* Return
166171
\**********************************/
167172

@@ -180,7 +185,6 @@ void SDPowerUp()
180185
* Inputs: None
181186
* Outputs: None
182187
* pseudocode:
183-
* Cut power to the SD Card
184188
* Power down the SPI interface
185189
* Return
186190
\**********************************/

‎Firmware/powerSleep.h

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
#ifndef POWERSLEEP_H
2-
#define POWERSLEEP_H
3-
4-
#include <avr/sleep.h>
5-
#include <avr/power.h>
6-
7-
//void enterSleep();
8-
void disableUnneededPeripherals();
9-
void twiPowerUp();
10-
void twiPowerDown();
11-
void serialPowerUp();
12-
void serialPowerDown();
13-
void SDPowerUp();
14-
void SDPowerDown();
15-
16-
#endif
1+
#ifndef POWERSLEEP_H
2+
#define POWERSLEEP_H
3+
4+
#include <avr/sleep.h>
5+
#include <avr/power.h>
6+
7+
void enterSleep();
8+
void disableUnneededPeripherals();
9+
void twiPowerUp();
10+
void twiPowerDown();
11+
void serialPowerUp();
12+
void serialPowerDown();
13+
void SDPowerUp();
14+
void SDPowerDown();
15+
16+
#endif

‎Firmware/state.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ void resetState(volatile State_t* State)
1212
State->SDin = false;
1313
State->readMag = false;
1414
State->configured = false;
15-
State->rewrite = false;
1615

1716
return;
1817
}

‎Firmware/state.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ typedef struct
1919
volatile char meterSize;
2020
volatile bool configured;
2121
volatile char filename[13];
22-
volatile bool rewrite;
2322
} State_t;
2423

2524
// Signal State Struct

0 commit comments

Comments
 (0)