Merge pull request #515 from udo-munk/dev

merge dev
udo-munk · Jan 13, 2025 · bd954d3 · bd954d3
2 parents 07bb305 + 471bffa
commit bd954d3
Show file tree

Hide file tree

Showing 8 changed files with 13 additions and 13 deletions.
diff --git a/altairsim/conf/panel.conf b/altairsim/conf/panel.conf
@@ -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
diff --git a/cromemcosim/conf_2d/panel.conf b/cromemcosim/conf_2d/panel.conf
@@ -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
diff --git a/cromemcosim/conf_3d/panel.conf b/cromemcosim/conf_3d/panel.conf
@@ -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
diff --git a/frontpanel/lp_switch.h b/frontpanel/lp_switch.h
@@ -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 {

diff --git a/imsaisim/conf_2d/panel.conf b/imsaisim/conf_2d/panel.conf
@@ -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
diff --git a/imsaisim/conf_3d/panel.conf b/imsaisim/conf_3d/panel.conf
@@ -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
diff --git a/intelmdssim/conf/panel.conf b/intelmdssim/conf/panel.conf
@@ -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
diff --git a/iodevices/proctec-vdm.c b/iodevices/proctec-vdm.c
@@ -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);
@@ -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