more fixes

This commit is contained in:
2026-11-19 11:59:58 +03:00
parent 9dcfafa5e4
commit 01a8f232f7
10 changed files with 82 additions and 43 deletions

View File

@@ -33,7 +33,7 @@ release: LDFLAGS += -flto
release: TARGET := RELEASE release: TARGET := RELEASE
release: $(TARGFILE) $(CLIENT) $(SERVER) release: $(TARGFILE) $(CLIENT) $(SERVER)
debug: CFLAGS += -DEBUG -Werror debug: CFLAGS += -DEBUG -Werror -g
debug: TARGET := DEBUG debug: TARGET := DEBUG
debug: $(TARGFILE) $(CLIENT) $(SERVER) debug: $(TARGFILE) $(CLIENT) $(SERVER)

View File

@@ -125,7 +125,7 @@ treated as “nothing yet”.
## 6. Protocol ## 6. Protocol
Text, one message per line, `\n` terminator. Text, one message per line, `\n` terminator. It is unacceptable to end a message with `\r\n`.
### 6.1 Message forms ### 6.1 Message forms
@@ -449,7 +449,7 @@ the option tables are compiled conditionally.
| `SPEED_TOLERANCE` | 0.01 | rev/min | | `SPEED_TOLERANCE` | 0.01 | rev/min |
| `MAX_CURRENT` / `DEFAULT_CURRENT` | 15 / 10 | A | | `MAX_CURRENT` / `DEFAULT_CURRENT` | 15 / 10 | A |
| `LSpeed` / `MSpeed` / `HSpeed` | 71 / 350 / 610 | rev/min presets | | `LSpeed` / `MSpeed` / `HSpeed` | 71 / 350 / 610 | rev/min presets |
| `MODBUS_RESPONCE_TIMEOUT` | 100000 | µs | | `MODBUS_RESPONSE_TIMEOUT` | 100000 | µs |
| `EMUL_ACCEL` | 10000 | min⁻² | | `EMUL_ACCEL` | 10000 | min⁻² |
| `BACKLOG` | 10 | max simultaneous SSL clients | | `BACKLOG` | 10 | max simultaneous SSL clients |
| `IOBUF_LEN` / `SL_VAL_LEN` / `SL_KEY_LEN` | 256 / (external) | protocol buffer sizes | | `IOBUF_LEN` / `SL_VAL_LEN` / `SL_KEY_LEN` | 256 / (external) | protocol buffer sizes |

View File

@@ -177,6 +177,7 @@ static void stop_all(SSL *ssl){
}else{ }else{
Dome_Speed = D_Off; Dome_Speed = D_Off;
set_speed = 0.; set_speed = 0.;
speedSEWD = 0.;
} }
} }
@@ -211,15 +212,19 @@ static int check_motor(SSL *ssl, int motno){
if(motno != MOTORS_AMOUNT - 1) return ret; if(motno != MOTORS_AMOUNT - 1) return ret;
int status = 0, N = 0; // mean status is largest int status = 0, N = 0; // mean status is largest
double speed = 0., current = 0.; double speed = 0., current = 0.;
static int warnsent[MOTORS_AMOUNT] = {0}; // flag that error warning for this motor was sent
for(int i = 0; i < MOTORS_AMOUNT; ++i){ for(int i = 0; i < MOTORS_AMOUNT; ++i){
int s = MotorState[i].status; int s = MotorState[i].status;
if(s == MOT_OFF) continue; if(s == MOT_OFF) continue;
if(s == MOT_ERROR){ if(s == MOT_ERROR){
*msg = MesgWarn; if(!warnsent[i]){
sprintf(msg+1, "Dome: Error in motor %d!\n", i+1); *msg = MesgWarn;
SendMessage(msg); sprintf(msg+1, "Dome: Error in motor %d!\n", i+1);
SendMessage(msg);
warnsent[i] = 1;
}
s = MotorState[i].status = MOT_OFF; s = MotorState[i].status = MOT_OFF;
} }else warnsent[i] = 0;
if(status < s) status = s; if(status < s) status = s;
if(s == MOT_RUN){ if(s == MOT_RUN){
speed += MotorState[i].speed; speed += MotorState[i].speed;
@@ -260,7 +265,7 @@ static void chk_dome_speed(SSL *ssl){
if(sl_dtime() - tlast < G.speedchk_interval) return; if(sl_dtime() - tlast < G.speedchk_interval) return;
DBG("Time - tlast = %g", sl_dtime() - tlast); DBG("Time - tlast = %g", sl_dtime() - tlast);
tlast = sl_dtime(); tlast = sl_dtime();
if(fabs(CommonState.speed - fabs(set_speed)) < SPEED_TOLERANCE){ if(fabs(CommonState.speed - set_speed) < SPEED_TOLERANCE){
return; return;
} }
DBG("Speed set command still not sent"); DBG("Speed set command still not sent");
@@ -305,7 +310,11 @@ static void chk_dome_speed(SSL *ssl){
// SHM parser; return FALSE if SHM is in erroreous state // SHM parser; return FALSE if SHM is in erroreous state
static int process_system(SSL *ssl){ static int process_system(SSL *ssl){
static int curMotNo = 0; // current motor number (we'll scan all 10 motors by one) static int curMotNo = -1; // current motor number (we'll scan all 10 motors by one)
if(curMotNo == -1){ // pass first run, wait for M_time initialized
curMotNo = 0;
return TRUE;
}
double curtime = sl_dtime(); double curtime = sl_dtime();
// check time sync // check time sync
static int brokenshmctr = 0; static int brokenshmctr = 0;
@@ -429,6 +438,7 @@ void clientproc(SSL_CTX *ctx, int fd){
LOGDBG("Received: \"%s\"", buf); LOGDBG("Received: \"%s\"", buf);
}else if(bytes < 0){ }else if(bytes < 0){
LOGERR("Server disconnected or other error"); LOGERR("Server disconnected or other error");
break;
} }
usleep(100000); usleep(100000);
} }
@@ -454,8 +464,9 @@ void terminal(SSL_CTX *ctx, int fd){
if(sl_canread(0)){ if(sl_canread(0)){
ssize_t L = getline(&lptr, &N, stdin); ssize_t L = getline(&lptr, &N, stdin);
if(L < 0) break; // ctrl + D if(L < 0) break; // ctrl + D
if(L > (ssize_t)(sizeof(buf)-1)) WARNX("String too long!"); //if(L > (ssize_t)(sizeof(buf)-1)) WARNX("String too long!");
else if(L > 0){ //else
if(L > 0){
if(!write_string(ssl, lptr)) break; // error if(!write_string(ssl, lptr)) break; // error
} }
} }
@@ -473,5 +484,6 @@ void terminal(SSL_CTX *ctx, int fd){
} }
} }
FREE(lptr); FREE(lptr);
SSL_shutdown(ssl);
SSL_free(ssl); SSL_free(ssl);
} }

View File

@@ -43,7 +43,6 @@ typedef struct{
char *port; // port number char *port; // port number
int verbose; // logfile verbose level int verbose; // logfile verbose level
char *ca; // ca char *ca; // ca
char *conffile; // configuration file
#ifdef SERVER #ifdef SERVER
int serialspeed; // speed of serial device int serialspeed; // speed of serial device
char *serialpath; // path to RS-485 device char *serialpath; // path to RS-485 device

View File

@@ -18,6 +18,9 @@
#pragma once #pragma once
#include <stdint.h>
#include <math.h>
// Registers and their fields for ESQ-770 frequency converter // Registers and their fields for ESQ-770 frequency converter
// command register (rw) // command register (rw)

View File

@@ -210,7 +210,7 @@ void io_process(){
} }
#ifdef EBUG #ifdef EBUG
for(int i = 0; i < NADCCHNLS; ++i){ for(int i = 0; i < NADCCHNLS; ++i){
if(abs(adcbuf[i] - ADCBuf[i]) < ADCTHRESH) continue; if(abs((int)adcbuf[i] - (int)ADCBuf[i]) < ADCTHRESH) continue;
// GotNewADC = TRUE; break; // GotNewADC = TRUE; break;
printf("ADC input %d changed to %d\n", i, adcbuf[i]); printf("ADC input %d changed to %d\n", i, adcbuf[i]);

View File

@@ -104,7 +104,7 @@ static int motors_open_m(const char *path, int speed){
LOGERR("Can't open device %s @ %d", path, speed); LOGERR("Can't open device %s @ %d", path, speed);
return FALSE; return FALSE;
} }
modbus_set_response_timeout(modbus_ctx, 0, MODBUS_RESPONCE_TIMEOUT); // response timeout modbus_set_response_timeout(modbus_ctx, 0, MODBUS_RESPONSE_TIMEOUT); // response timeout
if(modbus_connect(modbus_ctx) < 0){ if(modbus_connect(modbus_ctx) < 0){
WARNX("Can't connect to device %s", path); WARNX("Can't connect to device %s", path);
LOGERR("Can't connect to device %s", path); LOGERR("Can't connect to device %s", path);
@@ -147,12 +147,14 @@ int motors_set_curntsetpoint(double val){
// get setpoint of speed // get setpoint of speed
double motors_get_speedsetpoint(){ double motors_get_speedsetpoint(){
return speedSet; pthread_mutex_lock(&statemutex);
double spd = speedSet;
pthread_mutex_unlock(&statemutex);
return spd;
} }
// set setpoint of speed (rev/min) // set setpoint of speed (rev/min)
sl_sock_hresult_e motors_set_speedsetpoint(double val){ sl_sock_hresult_e motors_set_speedsetpoint(double val){
double absval = fabs(val); if(fabs(val) > MAX_SPEED){
if(absval > MAX_SPEED){
DBG("Speed to large"); DBG("Speed to large");
return RESULT_BADVAL; return RESULT_BADVAL;
} }
@@ -258,10 +260,10 @@ static void motors_process_m(){
if(fabs(speedSet) < SPEED_TOLERANCE){ // stop motor if(fabs(speedSet) < SPEED_TOLERANCE){ // stop motor
modbus_write_register(modbus_ctx, REG_CMD, CMD_STOP); modbus_write_register(modbus_ctx, REG_CMD, CMD_STOP);
}else{ // send command "set speed" }else{ // send command "set speed"
uint16_t dir = (speedSet > 0.) ? CMD_FORWARD : CMD_REVERSE;
uint16_t freq = REVMIN2FREQ(fabs(speedSet)); uint16_t freq = REVMIN2FREQ(fabs(speedSet));
modbus_write_register(modbus_ctx, REG_CMD, dir);
modbus_write_register(modbus_ctx, REG_FREQ_SET, freq); modbus_write_register(modbus_ctx, REG_FREQ_SET, freq);
uint16_t dir = (speedSet > 0.) ? CMD_FORWARD : CMD_REVERSE;
modbus_write_register(modbus_ctx, REG_CMD, dir);
} }
flags.change_speed = 0; flags.change_speed = 0;
} }
@@ -293,9 +295,12 @@ static void motors_process_m(){
} }
DBG("motor %d; status: %x, extstatus: %x", curN, regs[0], regs[1]); DBG("motor %d; status: %x, extstatus: %x", curN, regs[0], regs[1]);
error_cnt[curN] = 0; error_cnt[curN] = 0;
double rotdir = 1.;
switch(regs[0]){ switch(regs[0]){
case STATUS_CW:
case STATUS_CCW: case STATUS_CCW:
rotdir = -1.;
// fallthrough
case STATUS_CW:
DBG("status: RUN"); DBG("status: RUN");
motstates[curN].status = MOT_RUN; motstates[curN].status = MOT_RUN;
break; break;
@@ -317,7 +322,7 @@ static void motors_process_m(){
} }
if(-1 == modbus_read_registers(modbus_ctx, REG_OUTPUT_FREQ, 1, &regs[0])) regs[0] = 0; if(-1 == modbus_read_registers(modbus_ctx, REG_OUTPUT_FREQ, 1, &regs[0])) regs[0] = 0;
if(-1 == modbus_read_registers(modbus_ctx, REG_OUTPUT_CURRENT, 1, &regs[1])) regs[1] = 0; if(-1 == modbus_read_registers(modbus_ctx, REG_OUTPUT_CURRENT, 1, &regs[1])) regs[1] = 0;
motstates[curN].speed = FREQ2REVMIN(regs[0]); motstates[curN].speed = rotdir * FREQ2REVMIN(regs[0]);
motstates[curN].current = ((double)regs[1]) / CURRENT_SCALE; motstates[curN].current = ((double)regs[1]) / CURRENT_SCALE;
// Logging // Logging
log_data(curN); log_data(curN);
@@ -346,6 +351,7 @@ static void motors_process_e(){
} }
flags.all = 0; flags.all = 0;
} }
// both curspeed and speedSet are signed
if(fabs(curspeed - speedSet) > SPEED_TOLERANCE){ // need to calculate new speed value if(fabs(curspeed - speedSet) > SPEED_TOLERANCE){ // need to calculate new speed value
double acceleration = (curspeed < speedSet) ? EMUL_ACCEL : -EMUL_ACCEL; double acceleration = (curspeed < speedSet) ? EMUL_ACCEL : -EMUL_ACCEL;
double newspeed = curspeed + acceleration * dt / 60.; // acceleration in min^{-2} double newspeed = curspeed + acceleration * dt / 60.; // acceleration in min^{-2}
@@ -364,10 +370,10 @@ static void motors_process_e(){
} }
t0 = curt; t0 = curt;
for(int i = 0; i < MOTORS_AMOUNT; ++i){ for(int i = 0; i < MOTORS_AMOUNT; ++i){
log_data(i);
motstates[i].status = curstatus; motstates[i].status = curstatus;
motstates[i].current = curcurrent; motstates[i].current = curcurrent;
motstates[i].speed = curspeed; motstates[i].speed = curspeed;
log_data(i);
} }
pthread_mutex_unlock(&statemutex); pthread_mutex_unlock(&statemutex);
} }
@@ -409,12 +415,12 @@ int start_log(){
for(int i = 0; i < MOTORS_AMOUNT; ++i){ for(int i = 0; i < MOTORS_AMOUNT; ++i){
if(logF[i]) fclose(logF[i]); if(logF[i]) fclose(logF[i]);
snprintf(buf, PATH_MAX, "%s/%s_%02d.log", G.motlogdir, logprefix, i); snprintf(buf, PATH_MAX, "%s/%s_%02d.log", G.motlogdir, logprefix, i);
logF[i] = fopen(buf, "a"); logF[i] = fopen(buf, "w");
if(!logF[i]) ++errctr; if(!logF[i]) ++errctr;
} }
pthread_mutex_unlock(&logmutex); pthread_mutex_unlock(&logmutex);
Tstart = sl_dtime();
if(errctr == MOTORS_AMOUNT) return FALSE; if(errctr == MOTORS_AMOUNT) return FALSE;
Tstart = sl_dtime();
return TRUE; return TRUE;
} }

View File

@@ -43,8 +43,8 @@
// log-file prefix length // log-file prefix length
#define MAX_LOGPREFIX_LEN 31 #define MAX_LOGPREFIX_LEN 31
// modbus responce timeout, ms // modbus response timeout, mks
#define MODBUS_RESPONCE_TIMEOUT 100000 #define MODBUS_RESPONSE_TIMEOUT 100000
// ID of first motor // ID of first motor
#define START_ID (1) #define START_ID (1)
@@ -60,9 +60,9 @@ enum{
}; };
typedef struct{ typedef struct{
int status; int status; // one of MOT_xxx statuses
double speed; double speed; // current speed with sign (RPM)
double current; double current; // current current (A)
} motor_state_t; } motor_state_t;
double motors_get_curntsetpoint(); double motors_get_curntsetpoint();

View File

@@ -72,7 +72,7 @@ static int handle_connection(SSL *ssl){
int r = read_string(ssl, buf, IOBUF_LEN); int r = read_string(ssl, buf, IOBUF_LEN);
if(r < 0) return 0; if(r < 0) return 0;
else if(r == 0) return 1; // nothing to read or buffer overflow else if(r == 0) return 1; // nothing to read or buffer overflow
LOGDBG("fd=%d, message=%s", SSL_get_fd(ssl), buf); LOGDBG("fd=%d, message: '%s'", SSL_get_fd(ssl), buf);
int got = sl_get_keyval(buf, key, val); int got = sl_get_keyval(buf, key, val);
if(got == 0){ if(got == 0){
DBG("Comment or empty string"); DBG("Comment or empty string");
@@ -93,7 +93,7 @@ static int handle_connection(SSL *ssl){
if(0 == strcmp(key, "help")){ if(0 == strcmp(key, "help")){
for(size_t i = 0; i < HANDLERS_AMOUNT; ++i){ for(size_t i = 0; i < HANDLERS_AMOUNT; ++i){
snprintf(buf, IOBUF_LEN-1, "%s: %s\n", command_list[i].command, command_list[i].helpstring); snprintf(buf, IOBUF_LEN-1, "%s: %s\n", command_list[i].command, command_list[i].helpstring);
write_string(ssl, buf); if(!write_string(ssl, buf)) return 0;
} }
return 1; return 1;
} }
@@ -101,7 +101,7 @@ static int handle_connection(SSL *ssl){
// now `val` is an answer or error code // now `val` is an answer or error code
if(result != RESULT_SILENCE) snprintf(buf, IOBUF_LEN-1, "%s\n", sl_sock_hresult2str(result)); if(result != RESULT_SILENCE) snprintf(buf, IOBUF_LEN-1, "%s\n", sl_sock_hresult2str(result));
else snprintf(buf, IOBUF_LEN-1, "%s=%s\n", key, val); else snprintf(buf, IOBUF_LEN-1, "%s=%s\n", key, val);
write_string(ssl, buf); if(!write_string(ssl, buf)) return 0;
return 1; return 1;
} }
@@ -117,12 +117,14 @@ static int timeouted_sslaccept(SSL *ssl){
if(x < 0){ if(x < 0){
int sslerr = SSL_get_error(ssl, x); int sslerr = SSL_get_error(ssl, x);
if(SSL_ERROR_WANT_READ == sslerr || if(SSL_ERROR_WANT_READ == sslerr ||
SSL_ERROR_WANT_WRITE == sslerr) continue; SSL_ERROR_WANT_WRITE == sslerr){
usleep(10000);
continue;
}
DBG("SSL error %d", sslerr); DBG("SSL error %d", sslerr);
return FALSE; return FALSE;
}else if(x == 1) return TRUE; }else if(x == 1) return TRUE;
// x == 0 -> unclosed connection else return FALSE; // x == 0 -> unclosed connection
usleep(10000);
} }
DBG("Timeout"); DBG("Timeout");
return FALSE; return FALSE;
@@ -197,6 +199,12 @@ void serverproc(SSL_CTX *ctx, int fd){
} }
} }
} }
if(nfd == 1){ // no clients -> stop dome
if(fabs(motors_get_speedsetpoint()) > SPEED_TOLERANCE){ // stop motors if speed setpoint > 0 when nobody connected
LOGERR("Stop motors: no clients connected!");
motors_stop();
}
}
// scan connections // scan connections
for(int fdidx = 1; fdidx < nfd; ++fdidx){ for(int fdidx = 1; fdidx < nfd; ++fdidx){
if((poll_set[fdidx].revents & POLLIN) == 0) continue; if((poll_set[fdidx].revents & POLLIN) == 0) continue;
@@ -219,7 +227,8 @@ void serverproc(SSL_CTX *ctx, int fd){
SSL_shutdown(ssls[i]); SSL_shutdown(ssls[i]);
SSL_free(ssls[i]); SSL_free(ssls[i]);
} }
motors_stop(); motors_stop(); // set stop flag
motors_process(); // send stop command
motors_close(); motors_close();
} }

View File

@@ -181,6 +181,8 @@ static int geterrcode(SSL *ssl, int errcode){
DBG("ERR: %d", sslerr); DBG("ERR: %d", sslerr);
if(SSL_ERROR_WANT_READ == sslerr || if(SSL_ERROR_WANT_READ == sslerr ||
SSL_ERROR_WANT_WRITE == sslerr) return 0; // empty call SSL_ERROR_WANT_WRITE == sslerr) return 0; // empty call
// don't log "zero return" when client disconnected
if(sslerr == SSL_ERROR_ZERO_RETURN) return -1;
int sd = SSL_get_fd(ssl); int sd = SSL_get_fd(ssl);
LOGERR("SSL error %d @client %d", sslerr, sd); LOGERR("SSL error %d @client %d", sslerr, sd);
WARNX("SSL error %d @client %d", sslerr, sd); WARNX("SSL error %d @client %d", sslerr, sd);
@@ -209,13 +211,20 @@ int read_string(SSL *ssl, char *buf, int l){
return 0; return 0;
} }
l = eol - buf + 1; l = eol - buf + 1;
bytes = SSL_read(ssl, buf, l); char *ptr = buf;
//DBG("Read: %d", bytes); int total = 0;
if(bytes < 1){ // error while(l){
return geterrcode(ssl, bytes); bytes = SSL_read(ssl, ptr, l);
//DBG("Read: %d", bytes);
if(bytes <= 0){ // error
return geterrcode(ssl, bytes);
}
l -= bytes;
ptr += bytes;
total += bytes;
} }
buf[bytes-1] = 0; // replace '\n' with 0 ptr[-1] = 0; // replace '\n' with 0
return bytes; return total;
} }
/** /**
@@ -227,11 +236,12 @@ int read_string(SSL *ssl, char *buf, int l){
int write_string(SSL *ssl, char *buf){ int write_string(SSL *ssl, char *buf){
double t0 = sl_dtime(); double t0 = sl_dtime();
int l = strlen(buf); int l = strlen(buf);
while(sl_dtime() - t0 < 1. && l > 0){ while(sl_dtime() - t0 < G.acc_timeout && l > 0){
int written = SSL_write(ssl, buf, l); int written = SSL_write(ssl, buf, l);
if(written <= 0){ if(written <= 0){
int err = SSL_get_error(ssl, written); int err = SSL_get_error(ssl, written);
if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE){ // try next time if(err == SSL_ERROR_WANT_READ || err == SSL_ERROR_WANT_WRITE){ // try next time
usleep(10000);
continue; continue;
} }
return FALSE; // error return FALSE; // error