sfja/h5-projekt-mst
1
0
Fork 0
mirror of https://github.com/Mercantec-GHC/h5-projekt-mst.git synced 2026-08-26 21:27:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

rename server2 -> server

Browse Source
This commit is contained in:
sfja 2026-04-09 15:21:43 +02:00
parent 5f231954ef
commit 3832482cd5
5 changed files with 11 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/src/main.cpp
View File

@ -1,6 +1,6 @@
#include "json.hpp" #include "json.hpp"
#include "mqtt.hpp" #include "mqtt.hpp"
#include "server2.hpp" #include "server.hpp"
#include <print> #include <print>
#include <stdexcept> #include <stdexcept>
#include <string_view> #include <string_view>
@ -29,7 +29,7 @@ int main(void)
auto mqtt_client = mst::mqtt::Client( auto mqtt_client = mst::mqtt::Client(
BACKEND_MQTT_HOST, BACKEND_MQTT_PORT, "test", "1234"); BACKEND_MQTT_HOST, BACKEND_MQTT_PORT, "test", "1234");
auto server = mst::server2::Server(); auto server = mst::server::Server();
mqtt_client.subscribe("/skateboard/update", [&](std::string_view text) { mqtt_client.subscribe("/skateboard/update", [&](std::string_view text) {
std::println("Skateboard sent: {}", text); std::println("Skateboard sent: {}", text);

7
backend/src/server2.cpp → backend/src/server.cpp
View File

@ -1,7 +1,6 @@
#include "server2.hpp" #include "server.hpp"
#include <algorithm> #include <algorithm>
#include <cerrno> #include <cerrno>
#include <cstdint>
#include <cstring> #include <cstring>
#include <format> #include <format>
#include <iterator> #include <iterator>
@ -16,7 +15,7 @@
#include <vector> #include <vector>
namespace { namespace {
using namespace mst::server2; using namespace mst::server;
struct ReqHeader { struct ReqHeader {
enum ReqTy { enum ReqTy {
@ -77,7 +76,7 @@ auto get_listener_socket() -> int
} }
namespace mst::server2 { namespace mst::server {
struct Server::State { struct Server::State {
std::mutex mx; std::mutex mx;

2
backend/src/server2.hpp → backend/src/server.hpp
View File

@ -3,7 +3,7 @@
#include <memory> #include <memory>
#include <stdexcept> #include <stdexcept>
namespace mst::server2 { namespace mst::server {
struct Error : public std::runtime_error { struct Error : public std::runtime_error {
using std::runtime_error::runtime_error; using std::runtime_error::runtime_error;

6
game/src/main.rs
View File

@ -1,7 +1,7 @@
#![allow(dead_code)] #![allow(dead_code)]
mod engine; mod engine;
mod server2; mod server;
use core::panic; use core::panic;
use std::{ use std::{
@ -14,7 +14,7 @@ use std::{
use crate::{ use crate::{
engine::{Color, Key, Renderer, Scene, Shape, V2, V3}, engine::{Color, Key, Renderer, Scene, Shape, V2, V3},
server2::Server2, server::Server,
}; };
struct Skateboard { struct Skateboard {
@ -388,7 +388,7 @@ impl ShapeGroup {
fn main() -> Result<(), Box<dyn std::error::Error>> { fn main() -> Result<(), Box<dyn std::error::Error>> {
let t = thread::spawn(|| { let t = thread::spawn(|| {
let mut server = Server2::new().unwrap(); let mut server = Server::new().unwrap();
server server
.subscribe(|measurement| { .subscribe(|measurement| {
println!("angle = {}", measurement.angle); println!("angle = {}", measurement.angle);

4
game/src/server2.rs → game/src/server.rs
View File

@ -21,11 +21,11 @@ pub struct Measurement {
pub angle: f64, pub angle: f64,
} }
pub struct Server2 { pub struct Server {
stream: TcpStream, stream: TcpStream,
} }
impl Server2 { impl Server {
pub fn new() -> io::Result<Self> { pub fn new() -> io::Result<Self> {
Ok(Self { Ok(Self {
stream: TcpStream::connect("127.0.0.1:8889")?, stream: TcpStream::connect("127.0.0.1:8889")?,