diff options
| author | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-07-10 08:57:18 +0200 |
|---|---|---|
| committer | Matthias P. Braendli <matthias.braendli@mpb.li> | 2016-07-10 08:57:18 +0200 |
| commit | 16367c2a9da68c6c813537ea905a227864aec30f (patch) | |
| tree | c7b8a184bf9cbba7ff0646eb8780f7a6768d4e81 /src/simulator | |
| parent | ccecb8267756fbb63b1729193a0f87079f2d7896 (diff) | |
| download | glutte-o-matic-16367c2a9da68c6c813537ea905a227864aec30f.tar.gz glutte-o-matic-16367c2a9da68c6c813537ea905a227864aec30f.tar.bz2 glutte-o-matic-16367c2a9da68c6c813537ea905a227864aec30f.zip | |
Invert REPLIE signal in software
Diffstat (limited to 'src/simulator')
| -rw-r--r-- | src/simulator/src/GPIO/pio.c | 4 | ||||
| -rw-r--r-- | src/simulator/src/Gui/gui.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/simulator/src/GPIO/pio.c b/src/simulator/src/GPIO/pio.c index 4aa013b..a8622c2 100644 --- a/src/simulator/src/GPIO/pio.c +++ b/src/simulator/src/GPIO/pio.c @@ -35,7 +35,7 @@ extern int gui_in_1750_n; extern int gui_in_sq_n; extern int gui_in_u; extern int gui_in_d; -extern int gui_in_replie_n; +extern int gui_in_replie; extern int gui_in_fax_n; extern char led_gps; @@ -65,7 +65,7 @@ void pio_set_fsm_signals(struct fsm_input_signals_t* sig) { sig->sq = gui_in_sq_n ? 0 : 1; sig->discrim_u = gui_in_u ? 1 : 0; sig->discrim_d = gui_in_d ? 1 : 0; - sig->wind_generator_ok = gui_in_replie_n ? 1 : 0; + sig->wind_generator_ok = gui_in_replie ? 0 : 1; sig->sstv_mode = gui_in_fax_n ? 0 : 1; } diff --git a/src/simulator/src/Gui/gui.c b/src/simulator/src/Gui/gui.c index 457248f..2e5c3f0 100644 --- a/src/simulator/src/Gui/gui.c +++ b/src/simulator/src/Gui/gui.c @@ -152,8 +152,8 @@ int gui_in_1750_n = 1; int gui_in_sq_n = 1; int gui_in_u = 0; int gui_in_d = 0; -int gui_in_replie_n = 1; -static const char *replie_status[] = {"Replié", "In vent"}; +int gui_in_replie = 0; +static const char *replie_status[] = {"In vent", "Replié"}; int gui_in_fax_n = 1; int in_button = 0; @@ -830,15 +830,15 @@ void main_gui() { gui_in_fax_n = in_fax_n; } - if (gui_in_replie_n) { + if (gui_in_replie) { c = color_on; } else { c = color_off; } nk_layout_row_dynamic(ctx, 18, 2); - nk_label_colored(ctx, "REPLIE_n", NK_TEXT_LEFT, c); - gui_in_replie_n = nk_combo(ctx, replie_status, LEN(replie_status), gui_in_replie_n, 30); + nk_label_colored(ctx, "REPLIE", NK_TEXT_LEFT, c); + gui_in_replie = nk_combo(ctx, replie_status, LEN(replie_status), gui_in_replie, 30); nk_label_colored(ctx, "Voltage", NK_TEXT_LEFT, c); nk_property_float(ctx, "V", 0.0f, &gui_measured_voltage, 24.0f, 0.5f, 0.5f); |