steffen
/
SimpleSkyCam
2
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

solving compiler warnings

Browse Source
master
Steffen Pohle 2 years ago
parent fd623c74c3 03b9395dd2
commit c6d7cd3310
3 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File

1
.gitignore vendored
Unescape View File

@ -12,3 +12,4 @@ gmon.out
*.log
*.exe
*.bz2
Makefile.config

5
Makefile.rules.windows
Unescape View File

@ -4,7 +4,12 @@ include Makefile.config
USE_VFW = 1
TARGET = $(APP).exe
CPP = g++
<<<<<<< HEAD
CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L -lucrtbase
=======
CPPFLAGS = -ggdb -Wall -O0 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L
#CPPFLAGS = -Wall -O3 `pkg-config --cflags gtk+-3.0 gmodule-export-2.0` -Wl,--export-dynamic -DBUILD_WINDOWS=1 -Wdeprecated -D_POSIX_C_SOURCE=200112L
>>>>>>> 03b9395dd2b60a5aa3d3ab81fdc39a20289fcfb1
INCLUDES =
LDFLAGS = -lws2_32 -ljpeg
LIBS = `pkg-config --libs gtk+-3.0 gmodule-export-2.0` -L/usr/lib -mwindows

20
posctl.cc
Unescape View File

@ -130,8 +130,8 @@ void cb_posctl_btn_axismove (GtkWidget *widget, gpointer data) {
printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
posctl.GetAxisParam(0, &ramin, &ramax, NULL, NULL, NULL);
posctl.GetAxisParam(1, &decmin, &decmax, NULL, NULL, NULL);
posctl.GetAxisParam(AXIS_RA, &ramin, &ramax, NULL, NULL, NULL);
posctl.GetAxisParam(AXIS_DEC, &decmin, &decmax, NULL, NULL, NULL);
if (widget == btn_ramin) posctl.OutputWriteValue(AXIS_RA, ramin);
else if (widget == btn_racenter) posctl.OutputWriteValue(AXIS_RA, (ramax-ramin)/2.0+ramin);
@ -163,8 +163,8 @@ void cb_posctl_change_entry (GtkWidget *widget, gpointer data) {
const char *s;
posctl.GetAxisParam(0, &ramin, &ramax, &rap, &rai, &rad);
posctl.GetAxisParam(1, &decmin, &decmax, &decp, &deci, &decd);
posctl.GetAxisParam(AXIS_RA, &ramin, &ramax, &rap, &rai, &rad);
posctl.GetAxisParam(AXIS_DEC, &decmin, &decmax, &decp, &deci, &decd);
printf ("%s:%d %s\n", __FILE__, __LINE__, __FUNCTION__);
s = gtk_entry_get_text(GTK_ENTRY(widget));
@ -184,8 +184,8 @@ void cb_posctl_change_entry (GtkWidget *widget, gpointer data) {
else if (dec_ki == widget) deci = atof(s);
else if (dec_kd == widget) decd = atof(s);
posctl.SetAxisParam(0, ramin, ramax, rap, rai, rad);
posctl.SetAxisParam(1, decmin, decmax, decp, deci, decd);
posctl.SetAxisParam(AXIS_RA, ramin, ramax, rap, rai, rad);
posctl.SetAxisParam(AXIS_DEC, decmin, decmax, decp, deci, decd);
posctl.UnLockMutex();
}
@ -544,7 +544,7 @@ void posctl_gui_update() {
strfromd (txt, sizeof(txt-1), (char *)"%f", posctl.axis_pv[1]);
gtk_label_set_text(GTK_LABEL(dec_pv), txt);
posctl.GetAxisParam(0, &mi, &ma, &kp, &ki, &kd);
posctl.GetAxisParam(AXIS_RA, &mi, &ma, &kp, &ki, &kd);
strfromd (txt, sizeof(txt-1), (char *)"%f", mi);
gtk_entry_set_text_nofocus (ra_min, txt);
strfromd (txt, sizeof(txt-1), (char *)"%f", ma);
@ -556,7 +556,7 @@ void posctl_gui_update() {
strfromd (txt, sizeof(txt-1), (char *)"%f", kd);
gtk_entry_set_text_nofocus (ra_kd, txt);
posctl.GetAxisParam(1, &mi, &ma, &kp, &ki, &kd);
posctl.GetAxisParam(AXIS_DEC, &mi, &ma, &kp, &ki, &kd);
strfromd (txt, sizeof(txt-1), (char *)"%f", mi);
gtk_entry_set_text_nofocus (dec_min, txt);
strfromd (txt, sizeof(txt-1), (char *)"%f", ma);
@ -732,8 +732,8 @@ void PosCtl::StartControl() {
printf ("%s:%d %s start controlling Target:%f , %f\n", __FILE__, __LINE__, __FUNCTION__,
target_pos.x, target_pos.y);
pid_axis[0].Start();
pid_axis[1].Start();
pid_axis[AXIS_RA].Start();
pid_axis[AXIS_DEC].Start();
mode = POSCTL_MODE_CONTROL;
NotifyGtk();
}

Write Preview
Loading…
Cancel
Save