Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge dev #515

Merged
merged 3 commits into from
Jan 13, 2025
Merged

merge dev #515

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c015543
update comments
udo-munk Jan 12, 2025
874cf7c
default to no fan sound, small bit of formatting
sneakywumpus Jan 12, 2025
471bffa
Merge pull request #514 from sneakywumpus/dev
udo-munk Jan 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion altairsim/conf/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,4 +224,4 @@ switch SW_PROTECT type=object operate=mom_off_mom onsound=switch_on.wav offsound
switch SW_INT type=object operate=mom_off_mom onsound=switch_on.wav offsound=switch_off.wav objects=sw_down,sw_up,sw_center pos=11.70,2.04,0. size=.6,.6
switch SW_AUX type=object operate=mom_off_mom onsound=switch_on.wav offsound=switch_off.wav objects=sw_down,sw_up,sw_center pos=13.00,2.04,0. size=.6,.6

fansound fan.wav
#fansound fan.wav
2 changes: 1 addition & 1 deletion cromemcosim/conf_2d/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,4 @@ light LED_INTEN pos=14.30,3.85
light LED_WAIT pos=15.50,3.85
light LED_HOLD pos=16.10,3.85

fansound fan.wav
#fansound fan.wav
2 changes: 1 addition & 1 deletion cromemcosim/conf_3d/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,6 @@ light LED_INTEN pos=14.034,3.85
light LED_WAIT pos=15.29,3.85
light LED_HOLD pos=15.94,3.85

fansound fan.wav
#fansound fan.wav

# end of file
10 changes: 5 additions & 5 deletions frontpanel/lp_switch.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,21 +31,21 @@
#include "lpanel.h"

enum lp_switch_states {
LP_SWITCH_DOWN = 0, // switch is down
LP_SWITCH_UP = 1, // switch is up
LP_SWITCH_CENTER = 2 // switch is centered (for momentary MOM_OFF_MOM
LP_SWITCH_DOWN = 0, // switch is down
LP_SWITCH_UP = 1, // switch is up
LP_SWITCH_CENTER = 2 // switch is centered (for momentary MOM_OFF_MOM)
};

enum lp_switch_operation {
LP_SWITCH_OP_ON_OFF = 0, // on/off operation
LP_SWITCH_OP_MOM_OFF_MOM = 1, // momentary down, centered, momentary up
LP_SWITCH_OP_MOM_OFF_MOM = 1, // momentary down, centered, momentary up
LP_SWITCH_OP_OFF_MOM = 2 // centered (down), momentary up
};

enum lp_switch_gfx_modes {
LP_SWITCH_GFX_TOGGLE = 0, // uses internal toggle switch graphics
LP_SWITCH_GFX_PADDLE = 1, // uses internal paddle switch graphics
LP_SWITCH_GFX_OBJECT_REF = 2 // uses a graphics 'object' from the config file
LP_SWITCH_GFX_OBJECT_REF = 2 // uses a graphics 'object' from the config file
};

enum lp_switch_datatypes {
Expand Down
2 changes: 1 addition & 1 deletion imsaisim/conf_2d/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,4 +231,4 @@ light LED_INTEN pos=14.30,3.85
light LED_WAIT pos=15.50,3.85
light LED_HOLD pos=16.10,3.85

fansound fan.wav
#fansound fan.wav
2 changes: 1 addition & 1 deletion imsaisim/conf_3d/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -574,6 +574,6 @@ light LED_INTEN pos=14.034,3.85
light LED_WAIT pos=15.29,3.85
light LED_HOLD pos=15.94,3.85

fansound fan.wav
#fansound fan.wav

# end of file
2 changes: 1 addition & 1 deletion intelmdssim/conf/panel.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -137,4 +137,4 @@ light LED_PWR pos=3.344,7.759
light LED_HALT pos=4.333,7.759
light LED_RUN pos=5.322,7.759

fansound fan.wav
#fansound fan.wav
4 changes: 2 additions & 2 deletions iodevices/proctec-vdm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ static int beg; /* beginning display line address */
static pthread_t thread;
#endif

/* create the SDL window for VDM display */
/* create the SDL2 or X11 window for VDM display */
static void open_display(void)
{
xsize = 576 + (XOFF * 2);
Expand Down Expand Up @@ -168,7 +168,7 @@ static void open_display(void)
#endif /* !WANT_SDL */
}

/* close the SDL window for VDM display */
/* close the SDL2 or X11 window for VDM display */
static void close_display(void)
{
#ifdef WANT_SDL
Expand Down
Loading