wn/SMPS2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

works so far

Browse Source
This commit is contained in:
hg 2015-03-04 21:42:12 +01:00
parent 55dcc6ebb0
commit 337eaa98e7
2 changed files with 71 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/hmi.cpp
View File

@ -72,16 +72,31 @@ void hmiInit() {
} }
void hmiExec() { void hmiExec() {
static float savedVoltage = 0.0;
static bool enabled = false;
if (switch1.get()) { if (switch1.get()) {
if (enabled) {
enabled = false;
setUDes(0); setUDes(0);
} else {
enabled = true;
setUDes(savedVoltage);
} }
if (switch2.get()) {
setUDes(getUDes() - 1.0);
} }
if (switch3.get()) { if (enabled && switch2.get()) {
setUDes(getUDes() + 1.0); savedVoltage = getUDes() - 1.0;
setUDes(savedVoltage);
}
if (enabled && switch3.get()) {
savedVoltage = getUDes() + 1.0;
setUDes(savedVoltage);
} }
dispSetFloat(0, getUDes()); static uint32_t cnt = 0;
dispSetFloat(1, getUCur()); cnt++;
if (cnt >= 10000) {
dispSetFloat(0, getUCur());
dispSetFloat(1, getUDes());
cnt = 0;
}
} }

2
src/pwm.cpp
View File

@ -16,7 +16,7 @@
volatile Control ctrl((float)PWM_MIN, (float)PWM_MAX, Ctrl_P, Ctrl_I, Ctrl_D); volatile Control ctrl((float)PWM_MIN, (float)PWM_MAX, Ctrl_P, Ctrl_I, Ctrl_D);
volatile float u_des = 5.0; volatile float u_des = 0.0;
volatile float u_curr = 0; volatile float u_curr = 0;
volatile uint16_t newPwm = 0; volatile uint16_t newPwm = 0;