Skip to content
GitLab
Projects
Groups
Topics
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Register
Sign in
Toggle navigation
Menu
dstat
dstat-firmware
Compare revisions
d7815483e2b81ab6b40c8c45b59ebbf6a0a67a42 to 50b0cddf6f108406e9e28ff6d6f7e7d2263599ba
Commits on Source (2)
· 08536618
Michael DM Dryden
authored
Nov 23, 2017
Cleanup
08536618
· 50b0cddf
Michael DM Dryden
authored
Jul 03, 2018
Prevent shorting CE/RE after experiment/during init.
50b0cddf
Hide whitespace changes
Inline
Side-by-side
src/experiment.c
View file @
50b0cddf
...
...
@@ -346,7 +346,7 @@ void pot_init(void){
#if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR == 2
ioport_set_port_dir
(
IOPORT_PORTB
,
PIN2_bm
|
PIN3_bm
|
PIN4_bm
|
PIN5_bm
|
PIN6_bm
|
PIN7_bm
,
IOPORT_DIR_OUTPUT
);
ioport_set_port_dir
(
IOPORT_PORTD
,
PIN4_bm
,
IOPORT_DIR_OUTPUT
);
ioport_set_port_level
(
IOPORT_PORTB
,
PIN2_bm
|
PIN3_bm
|
PIN4_bm
|
PIN5_bm
|
PIN6_bm
|
PIN7_bm
,
PIN3_bm
|
PIN6_bm
|
PIN7_bm
);
ioport_set_port_level
(
IOPORT_PORTB
,
PIN2_bm
|
PIN3_bm
|
PIN4_bm
|
PIN5_bm
|
PIN6_bm
|
PIN7_bm
,
PIN6_bm
|
PIN7_bm
);
ioport_set_port_level
(
IOPORT_PORTD
,
PIN4_bm
,
PIN4_bm
);
#endif
}
...
...
@@ -501,8 +501,6 @@ void volt_exp_stop(void){
delay_ms
(
100
);
// Make sure WE is last to disconnect
ioport_set_pin_level
(
PIN_POT_WE
,
0
);
ioport_set_pin_level
(
PIN_POT_2ELECTRODE
,
1
);
}
#if BOARD_VER_MAJOR == 1 && BOARD_VER_MINOR >= 2
...
...
@@ -1017,10 +1015,6 @@ void swv_experiment(uint16_t start, uint16_t stop, uint16_t step, uint16_t pulse
*/
uint8_t
direction
;
// uint16_t dacindex_start = ceil((start)*(65536/(double)3000))+32768;
// uint16_t dacindex_stop = ceil(stop*(65536/(double)3000))+32768;
// uint16_t dacindex_step = ceil(step*(65536/(double)3000));
// uint16_t dacindex_pulse_height = ceil(pulse_height*(65536/(double)3000));
uint32_t
period
;
if
(
start
<
stop
)
...
...