add command code constants, send header
This commit is contained in:
parent
f193c659b9
commit
ce70ecd9e2
12 changed files with 141 additions and 60 deletions
|
@ -9,7 +9,7 @@ use std::ptr::NonNull;
|
|||
///
|
||||
/// # Examples
|
||||
/// ```C
|
||||
/// UdpConnection connection = sp_connection_open("127.0.0.1:2342");
|
||||
/// UdpConnection connection = sp_udp_open("127.0.0.1:2342");
|
||||
/// if (connection == NULL)
|
||||
/// return 1;
|
||||
///
|
||||
|
@ -18,7 +18,7 @@ use std::ptr::NonNull;
|
|||
/// sp_brightness_grid_set(grid, 1, 1, 10);
|
||||
///
|
||||
/// TypedCommand command = sp_command_char_brightness(grid);
|
||||
/// sp_connection_free(connection);
|
||||
/// sp_udp_free(connection);
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_brightness_grid_new(
|
||||
|
@ -167,5 +167,5 @@ pub unsafe extern "C" fn sp_brightness_grid_unsafe_data_ref(
|
|||
const _: () = assert!(size_of::<Brightness>() == 1);
|
||||
|
||||
let data = unsafe { (*brightness_grid.as_ptr()).data_ref_mut() };
|
||||
unsafe { ByteSlice::from_slice(transmute(data)) }
|
||||
unsafe { ByteSlice::from_slice(transmute::<&mut [Brightness], &mut [u8]>(data)) }
|
||||
}
|
||||
|
|
|
@ -24,7 +24,7 @@ impl ByteSlice {
|
|||
unsafe { std::slice::from_raw_parts(self.start.as_ptr(), self.length) }
|
||||
}
|
||||
|
||||
pub(crate) unsafe fn as_slice_mut(&self) -> &mut [u8] {
|
||||
pub(crate) unsafe fn as_slice_mut(&mut self) -> &mut [u8] {
|
||||
unsafe {
|
||||
std::slice::from_raw_parts_mut(self.start.as_ptr(), self.length)
|
||||
}
|
||||
|
|
3
src/commands/mod.rs
Normal file
3
src/commands/mod.rs
Normal file
|
@ -0,0 +1,3 @@
|
|||
mod typed;
|
||||
|
||||
pub use typed::*;
|
|
@ -40,7 +40,7 @@ pub unsafe extern "C" fn sp_command_clone(
|
|||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// sp_connection_send_command(connection, sp_command_clear());
|
||||
/// sp_udp_send_command(connection, sp_command_clear());
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_command_clear() -> NonNull<TypedCommand> {
|
||||
|
@ -115,10 +115,6 @@ pub unsafe extern "C" fn sp_command_bitvec(
|
|||
operation: BinaryOperation,
|
||||
) -> *mut TypedCommand {
|
||||
let bit_vec = unsafe { *Box::from_raw(bit_vec.as_ptr()) };
|
||||
let compression = match compression.try_into() {
|
||||
Ok(compression) => compression,
|
||||
Err(_) => return std::ptr::null_mut(),
|
||||
};
|
||||
let command = servicepoint::BitVecCommand {
|
||||
offset,
|
||||
operation,
|
||||
|
@ -182,10 +178,6 @@ pub unsafe extern "C" fn sp_command_bitmap(
|
|||
compression: CompressionCode,
|
||||
) -> *mut TypedCommand {
|
||||
let bitmap = unsafe { *Box::from_raw(bitmap.as_ptr()) };
|
||||
let compression = match compression.try_into() {
|
||||
Ok(compression) => compression,
|
||||
Err(_) => return std::ptr::null_mut(),
|
||||
};
|
||||
let command = servicepoint::BitmapCommand {
|
||||
origin: servicepoint::Origin::new(x, y),
|
||||
bitmap,
|
|
@ -1,5 +1,5 @@
|
|||
use crate::{heap_drop, heap_move};
|
||||
use servicepoint::{Connection, Packet, TypedCommand, UdpConnection};
|
||||
use servicepoint::{Connection, Header, Packet, TypedCommand, UdpConnection};
|
||||
use std::ffi::{c_char, CStr};
|
||||
use std::net::{Ipv4Addr, SocketAddrV4};
|
||||
use std::ptr::NonNull;
|
||||
|
@ -11,9 +11,9 @@ use std::ptr::NonNull;
|
|||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// UdpConnection connection = sp_connection_open("172.23.42.29:2342");
|
||||
/// UdpConnection connection = sp_udp_open("172.23.42.29:2342");
|
||||
/// if (connection != NULL)
|
||||
/// sp_connection_send_command(connection, sp_command_clear());
|
||||
/// sp_udp_send_command(connection, sp_command_clear());
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_udp_open(
|
||||
|
@ -37,9 +37,9 @@ pub unsafe extern "C" fn sp_udp_open(
|
|||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// UdpConnection connection = sp_connection_open_ipv4(172, 23, 42, 29, 2342);
|
||||
/// UdpConnection connection = sp_udp_open_ipv4(172, 23, 42, 29, 2342);
|
||||
/// if (connection != NULL)
|
||||
/// sp_connection_send_command(connection, sp_command_clear());
|
||||
/// sp_udp_send_command(connection, sp_command_clear());
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_udp_open_ipv4(
|
||||
|
@ -80,8 +80,7 @@ pub unsafe extern "C" fn sp_udp_send_packet(
|
|||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// sp_connection_send_command(connection, sp_command_clear());
|
||||
/// sp_connection_send_command(connection, sp_command_brightness(5));
|
||||
/// sp_udp_send_command(connection, sp_command_brightness(5));
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_udp_send_command(
|
||||
|
@ -92,6 +91,27 @@ pub unsafe extern "C" fn sp_udp_send_command(
|
|||
unsafe { connection.as_ref().send(command) }.is_ok()
|
||||
}
|
||||
|
||||
/// Sends a [Header] to the display using the [UdpConnection].
|
||||
///
|
||||
/// returns: true in case of success
|
||||
///
|
||||
/// # Examples
|
||||
///
|
||||
/// ```C
|
||||
/// sp_udp_send_header(connection, sp_command_brightness(5));
|
||||
/// ```
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_udp_send_header(
|
||||
udp_connection: NonNull<UdpConnection>,
|
||||
header: Header,
|
||||
) -> bool {
|
||||
let packet = Packet {
|
||||
header,
|
||||
payload: vec![],
|
||||
};
|
||||
unsafe { udp_connection.as_ref() }.send(packet).is_ok()
|
||||
}
|
||||
|
||||
/// Closes and deallocates a [UdpConnection].
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_udp_free(connection: NonNull<UdpConnection>) {
|
||||
|
|
11
src/lib.rs
11
src/lib.rs
|
@ -9,7 +9,7 @@
|
|||
//! #include "servicepoint.h"
|
||||
//!
|
||||
//! int main(void) {
|
||||
//! UdpConnection *connection = sp_connection_open("172.23.42.29:2342");
|
||||
//! UdpConnection *connection = sp_udp_open("172.23.42.29:2342");
|
||||
//! if (connection == NULL)
|
||||
//! return 1;
|
||||
//!
|
||||
|
@ -17,10 +17,10 @@
|
|||
//! sp_bitmap_fill(pixels, true);
|
||||
//!
|
||||
//! TypedCommand *command = sp_command_bitmap_linear_win(0, 0, pixels, Uncompressed);
|
||||
//! while (sp_connection_send_command(connection, sp_command_clone(command)));
|
||||
//! while (sp_udp_send_command(connection, sp_command_clone(command)));
|
||||
//!
|
||||
//! sp_command_free(command);
|
||||
//! sp_connection_free(connection);
|
||||
//! sp_udp_free(connection);
|
||||
//! return 0;
|
||||
//! }
|
||||
//! ```
|
||||
|
@ -30,10 +30,11 @@ pub use crate::bitvec::*;
|
|||
pub use crate::brightness_grid::*;
|
||||
pub use crate::byte_slice::*;
|
||||
pub use crate::char_grid::*;
|
||||
pub use crate::command::*;
|
||||
pub use crate::commands::*;
|
||||
pub use crate::connection::*;
|
||||
pub use crate::cp437_grid::*;
|
||||
pub use crate::packet::*;
|
||||
pub use servicepoint::CommandCode;
|
||||
use std::ptr::NonNull;
|
||||
|
||||
mod bitmap;
|
||||
|
@ -41,7 +42,7 @@ mod bitvec;
|
|||
mod brightness_grid;
|
||||
mod byte_slice;
|
||||
mod char_grid;
|
||||
mod command;
|
||||
mod commands;
|
||||
mod connection;
|
||||
mod cp437_grid;
|
||||
mod packet;
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
use crate::{heap_drop, heap_move, heap_move_nonnull, ByteSlice};
|
||||
use servicepoint::{Header, Packet, TypedCommand};
|
||||
use servicepoint::{CommandCode, Header, Packet, TypedCommand};
|
||||
use std::ptr::NonNull;
|
||||
|
||||
/// Turns a [TypedCommand] into a [Packet].
|
||||
|
@ -65,7 +65,7 @@ pub unsafe extern "C" fn sp_packet_get_header(
|
|||
pub unsafe extern "C" fn sp_packet_get_payload(
|
||||
packet: NonNull<Packet>,
|
||||
) -> ByteSlice {
|
||||
unsafe { ByteSlice::from_slice(&mut *(*packet.as_ptr()).payload) }
|
||||
unsafe { ByteSlice::from_slice(&mut (*packet.as_ptr()).payload) }
|
||||
}
|
||||
|
||||
/// Sets the payload of the provided packet to the provided data.
|
||||
|
@ -87,7 +87,7 @@ pub unsafe extern "C" fn sp_packet_set_payload(
|
|||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_packet_serialize_to(
|
||||
packet: NonNull<Packet>,
|
||||
buffer: ByteSlice,
|
||||
mut buffer: ByteSlice,
|
||||
) {
|
||||
unsafe {
|
||||
packet.as_ref().serialize_to(buffer.as_slice_mut());
|
||||
|
@ -107,3 +107,19 @@ pub unsafe extern "C" fn sp_packet_clone(
|
|||
pub unsafe extern "C" fn sp_packet_free(packet: NonNull<Packet>) {
|
||||
unsafe { heap_drop(packet) }
|
||||
}
|
||||
|
||||
#[no_mangle]
|
||||
pub unsafe extern "C" fn sp_u16_to_command_code(
|
||||
code: u16,
|
||||
result: *mut CommandCode,
|
||||
) -> bool {
|
||||
match CommandCode::try_from(code) {
|
||||
Ok(code) => {
|
||||
unsafe {
|
||||
*result = code;
|
||||
}
|
||||
true
|
||||
}
|
||||
Err(_) => false,
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue