Skip to content

Commit

Permalink
chore: prepare version 5.8.8-alpha-1
Browse files Browse the repository at this point in the history
  • Loading branch information
ozyx committed Dec 4, 2023
1 parent 1630738 commit 8131f55
Show file tree
Hide file tree
Showing 61 changed files with 11,755 additions and 64,011 deletions.
2 changes: 1 addition & 1 deletion dist/yamcsProto.cjs

Large diffs are not rendered by default.

74,105 changes: 10,835 additions & 63,270 deletions dist/yamcsProto.d.ts

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
{
"name": "yamcs-protobufjs-static",
"version": "5.8.8-alpha-0",
"version": "5.8.8-alpha-1",
"description": "Compiled protobufjs static module for Yamcs",
"main": "dist/yamcsProto.cjs",
"scripts": {
"clean": "npx rimraf compiled.js node_modules/ dist/",
"build": "npx pbjs --package=protobufjs-cli -t static-module -w es6 -o compiled.js **/*.proto && npx webpack --mode=production && npx pbts -o dist/yamcsProto.d.ts compiled.js",
"build": "npx pbjs --package=protobufjs-cli -t static-module -w es6 -o compiled.js **/*.proto && npx webpack --mode=production && npx pbts --no-comments -o dist/yamcsProto.d.ts compiled.js",
"test": "echo \"Error: no test specified\" && exit 1"
},
"type": "module",
Expand Down
File renamed without changes.
File renamed without changes.
File renamed without changes.
34 changes: 34 additions & 0 deletions proto/api.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
syntax = "proto3";

package google.protobuf;

import "google/protobuf/source_context.proto";
import "google/protobuf/type.proto";

message Api {

string name = 1;
repeated Method methods = 2;
repeated Option options = 3;
string version = 4;
SourceContext source_context = 5;
repeated Mixin mixins = 6;
Syntax syntax = 7;
}

message Method {

string name = 1;
string request_type_url = 2;
bool request_streaming = 3;
string response_type_url = 4;
bool response_streaming = 5;
repeated Option options = 6;
Syntax syntax = 7;
}

message Mixin {

string name = 1;
string root = 2;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
15 changes: 15 additions & 0 deletions proto/cmdhistory.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
syntax = "proto2";

option java_package = "org.yamcs.cmdhistory.protobuf";

import "yamcs/protobuf/yamcs.proto";

message AssignmentInfo {
repeated Assignment assignment = 1;
}

message Assignment {
optional string name = 1;
optional yamcs.protobuf.Value value = 2;
optional bool userInput = 3;
}
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
66 changes: 66 additions & 0 deletions proto/db.proto
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
syntax = "proto2";

option java_package = "org.yamcs.yarch.protobuf";

import "yamcs/protobuf/yamcs.proto";
import "yamcs/protobuf/events/events.proto";
import "yamcs/protobuf/pvalue/pvalue.proto";
import "yamcs/protobuf/mdb/mdb.proto";


//this message has been copied in Yamcs 5 from pvalue.proto
// and is used when storing parameter values in tables (ParameterValueColumnSerializer.java).
//
// if the name of the parameter is the same with the column name, it is not stored.
// For compatiblity with Yamcs 4, the protobuf field numbers are kept unchanged
message ParameterValue {
optional string name = 1;
optional yamcs.protobuf.Value rawValue = 2;
optional yamcs.protobuf.Value engValue = 3;
optional int64 acquisitionTime = 4;
optional int64 generationTime = 5;
optional yamcs.protobuf.pvalue.AcquisitionStatus acquisitionStatus = 6;
optional bool processingStatus = 7;
optional yamcs.protobuf.pvalue.MonitoringResult monitoringResult = 8;
optional yamcs.protobuf.pvalue.RangeCondition rangeCondition = 9;

// Context-dependent ranges
repeated yamcs.protobuf.mdb.AlarmRange alarmRange = 25;

// How long (in milliseconds) this parameter value is valid
// Note that there is an option when subscribing to parameters to get
// updated when the parameter values expire.
optional int64 expireMillis = 26;
}

message Event {
optional string source = 1;
optional int64 generationTime = 2;
optional int64 receptionTime = 3;
optional int32 seqNumber = 4;
optional string type = 5;
required string message = 6;
optional yamcs.protobuf.events.Event.EventSeverity severity = 7[default=INFO];

// Set by API when event was posted by a user
optional string createdBy = 10;

// Additional properties
map<string, string> extra = 11;
}

enum ProtoDataType {
//error in replay
DT_ERROR = 1;

//the replay status has changed (e.g. stopped or closed) the body contains a ReplayStatus
STATE_CHANGE = 2;

TM_PACKET = 3;
PP = 4;
EVENT = 5;
ARCHIVE_INDEX = 6;
ARCHIVE_TAG = 7;
PARAMETER = 8;
CMD_HISTORY = 9;
}
Loading

0 comments on commit 8131f55

Please sign in to comment.