Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Jan Kasprzak
tinyboard
Commits
ccfee457
Commit
ccfee457
authored
May 10, 2013
by
Jan Kasprzak
Browse files
Deeper sleep when idle
parent
e6421ff2
Changes
7
Show whitespace changes
Inline
Side-by-side
projects/step-up/adc.c
View file @
ccfee457
...
...
@@ -10,8 +10,9 @@
//#define NUM_ADCS ZERO_ADC
#define NUM_ADCS 2
volatile
static
unsigned
char
current_adc
;;
volatile
unsigned
char
need_battery_adc
;
volatile
static
unsigned
char
current_adc
;
volatile
unsigned
char
adc_enabled
;
volatile
unsigned
char
need_battery_adc
,
need_pwmled_adc
;
static
uint16_t
adc_sum
,
read_zero
,
drop_count
,
read_count
,
n_reads_log
;
volatile
uint16_t
jiffies
;
...
...
@@ -40,13 +41,23 @@ void start_next_adc()
drop_count
=
1
;
read_count
=
1
;
n_reads_log
=
0
;
}
else
{
}
else
if
(
need_pwmled_adc
)
{
current_adc
=
0
;
read_zero
=
0
;
drop_count
=
1
;
read_count
=
1
<<
PWMLED_ADC_SHIFT
;
n_reads_log
=
PWMLED_ADC_SHIFT
;
}
else
{
ADCSRA
&=
~
_BV
(
ADEN
);
power_adc_disable
();
adc_enabled
=
0
;
return
;
}
if
(
!
adc_enabled
)
{
power_adc_enable
();
ADCSRA
|=
_BV
(
ADEN
);
adc_enabled
=
1
;
}
adc_sum
=
0
;
...
...
@@ -95,7 +106,9 @@ static uint16_t read_adc_sync()
void
init_adc
()
{
need_battery_adc
=
0
;
need_pwmled_adc
=
0
;
current_adc
=
0
;
adc_enabled
=
1
;
power_adc_enable
();
ACSR
|=
_BV
(
ACD
);
// but disable the analog comparator
...
...
@@ -124,6 +137,8 @@ void susp_adc()
{
ADCSRA
=
0
;
DIDR0
=
0
;
power_adc_disable
();
adc_enabled
=
0
;
}
ISR
(
ADC_vect
)
{
// IRQ handler
...
...
projects/step-up/battery.c
View file @
ccfee457
...
...
@@ -77,8 +77,10 @@ unsigned char battery_gauge()
rv
=
7
;
}
#if 0
if (rv == 1 && !initial_readings)
set_error(ERR_BATTERY);
#endif
#if 0
log_byte(0xbb);
...
...
projects/step-up/lights.h
View file @
ccfee457
...
...
@@ -21,13 +21,14 @@ void inline log_word(uint16_t word) { }
/* adc.c */
#define PWMLED_ADC_SHIFT 1
/* 1<<1 measurements per single callback */
extern
volatile
unsigned
char
need_battery_adc
;
extern
volatile
unsigned
char
adc_running
;
extern
volatile
unsigned
char
need_pwmled_adc
;
extern
volatile
unsigned
char
adc_enabled
;
void
init_adc
();
void
susp_adc
();
/* pwm.c */
#define PWM_MAX 0xFF
extern
volatile
unsigned
char
pwm_
running
;
extern
volatile
unsigned
char
pwm_
enabled
;
void
init_pwm
();
void
susp_pwm
();
void
pwm_off
();
...
...
projects/step-up/main.c
View file @
ccfee457
...
...
@@ -72,13 +72,15 @@ int main(void)
#if 1
while
(
1
)
{
cli
();
if
(
pwm_
running
)
{
if
(
pwm_
enabled
)
{
set_sleep_mode
(
SLEEP_MODE_IDLE
);
}
else
if
(
adc_
running
)
{
}
else
if
(
adc_
enabled
)
{
set_sleep_mode
(
SLEEP_MODE_ADC
);
}
else
{
set_sleep_mode
(
SLEEP_MODE_PWR_DOWN
);
}
sleep_enable
();
// keep BOD active, no sleep_bod_disable();
sei
();
sleep_cpu
();
...
...
projects/step-up/pwm.c
View file @
ccfee457
...
...
@@ -11,7 +11,7 @@
* Counts from 0 to 0xFF, without OCR1C compare.
*/
st
ati
c
unsigned
char
pwm_enabled
;
vol
ati
le
unsigned
char
pwm_enabled
;
static
void
inline
enable_pll
()
{
...
...
@@ -57,6 +57,7 @@ void pwm_off()
DDRB
&=
~
_BV
(
PB4
);
PLLCSR
&=
~
(
_BV
(
PLLE
)
|
_BV
(
PCKE
));
power_timer1_disable
();
pwm_enabled
=
0
;
}
...
...
@@ -65,6 +66,7 @@ void pwm_set(uint8_t stride)
OCR1B
=
stride
;
if
(
!
pwm_enabled
)
{
power_timer1_enable
();
enable_pll
();
DDRB
|=
_BV
(
PB4
);
pwm_enabled
=
1
;
...
...
projects/step-up/pwmled.c
View file @
ccfee457
...
...
@@ -60,9 +60,11 @@ void pwmled_on_off(unsigned char mode)
if
(
mode
)
{
state
=
ST_ON
;
mode_changed
=
1
;
need_pwmled_adc
=
1
;
pwm_set
(
pwm_val
);
}
else
{
state
=
ST_OFF
;
need_pwmled_adc
=
0
;
pwm_off
();
}
}
...
...
@@ -113,6 +115,7 @@ void pwmled_adc(uint16_t adcval)
if
(
pwm_val
>=
PWM_MAX
||
(
pwm_val
>
(
2
*
PWM_MAX
/
3
)
&&
adcval
<
0x08
))
{
pwmled_err
();
need_pwmled_adc
=
0
;
return
;
}
...
...
projects/step-up/wdt.c
View file @
ccfee457
...
...
@@ -17,10 +17,16 @@ void susp_wdt()
ISR
(
WDT_vect
)
{
++
jiffies
;
if
(
pwm_enabled
)
{
need_pwmled_adc
=
1
;
}
if
(
jiffies
&
0x000F
)
{
need_battery_adc
=
1
;
// about every 1s
}
patterns_next_tick
();
timer_check_buttons
();
if
(
!
adc_enabled
)
start_next_adc
();
// only if not running
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment