Skip to content

Feature/command id enum #6

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Feature/command id enum #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion fujinet_pc.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -238,7 +238,6 @@ set(SOURCES src/main.cpp
lib/network-protocol/SMB.h lib/network-protocol/SMB.cpp
lib/network-protocol/SSH.h lib/network-protocol/SSH.cpp
lib/network-protocol/SD.h lib/network-protocol/SD.cpp
lib/fuji/fujiCmd.h
lib/fuji/fujiHost.h lib/fuji/fujiHost.cpp
lib/fuji/fujiDisk.h lib/fuji/fujiDisk.cpp
lib/bus/bus.h
Expand Down
141 changes: 141 additions & 0 deletions include/fujiCommandID.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,141 @@
#ifndef FUJI_COMMANDS_H
#define FUJI_COMMANDS_H

/*
* Fuji Device Command Definitions
*/

enum fujiCommandID_t {
FUJICMD_SPECIAL_QUERY = 0xFF,
FUJICMD_RESET = 0xFF,
FUJICMD_PASSWORD = 0xFE,
FUJICMD_GET_SSID = 0xFE,
FUJICMD_USERNAME = 0xFD,
FUJICMD_SCAN_NETWORKS = 0xFD,
FUJICMD_JSON = 0xFC,
FUJICMD_GET_SCAN_RESULT = 0xFC,
FUJICMD_SET_SSID = 0xFB,
FUJICMD_GET_WIFISTATUS = 0xFA,
FUJICMD_MOUNT_HOST = 0xF9,
FUJICMD_MOUNT_IMAGE = 0xF8,
FUJICMD_OPEN_DIRECTORY = 0xF7,
FUJICMD_READ_DIR_ENTRY = 0xF6,
FUJICMD_CLOSE_DIRECTORY = 0xF5,
FUJICMD_READ_HOST_SLOTS = 0xF4,
FUJICMD_WRITE_HOST_SLOTS = 0xF3,
FUJICMD_READ_DEVICE_SLOTS = 0xF2,
FUJICMD_WRITE_DEVICE_SLOTS = 0xF1,
FUJICMD_ENABLE_UDPSTREAM = 0xF0,
FUJICMD_SET_BAUDRATE = 0xEB,
FUJICMD_GET_WIFI_ENABLED = 0xEA,
FUJICMD_UNMOUNT_IMAGE = 0xE9,
FUJICMD_GET_ADAPTERCONFIG = 0xE8,
FUJICMD_NEW_DISK = 0xE7,
FUJICMD_UNMOUNT_HOST = 0xE6,
FUJICMD_GET_DIRECTORY_POSITION = 0xE5,
FUJICMD_SET_DIRECTORY_POSITION = 0xE4,
FUJICMD_SET_HSIO_INDEX = 0xE3,
FUJICMD_SET_DEVICE_FULLPATH = 0xE2,
FUJICMD_SET_HOST_PREFIX = 0xE1,
FUJICMD_GET_HOST_PREFIX = 0xE0,
FUJICMD_SET_SIO_EXTERNAL_CLOCK = 0xDF,
FUJICMD_WRITE_APPKEY = 0xDE,
FUJICMD_READ_APPKEY = 0xDD,
FUJICMD_OPEN_APPKEY = 0xDC,
FUJICMD_CLOSE_APPKEY = 0xDB,
FUJICMD_GET_DEVICE_FULLPATH = 0xDA,
FUJICMD_CONFIG_BOOT = 0xD9,
FUJICMD_COPY_FILE = 0xD8,
FUJICMD_MOUNT_ALL = 0xD7,
FUJICMD_HRS232_WRITE = 0xD7,
FUJICMD_SET_BOOT_MODE = 0xD6,
FUJICMD_ENABLE_DEVICE = 0xD5,
FUJICMD_DISABLE_DEVICE = 0xD4,
FUJICMD_RANDOM_NUMBER = 0xD3,
FUJICMD_HRS232_STATUS = 0xD3,
FUJICMD_GET_TIME = 0xD2,
FUJICMD_HRS232_READ = 0xD2,
FUJICMD_DEVICE_ENABLE_STATUS = 0xD1,
FUJICMD_BASE64_ENCODE_INPUT = 0xD0,
FUJICMD_HRS232_PUT = 0xD0,
FUJICMD_BASE64_ENCODE_COMPUTE = 0xCF,
FUJICMD_BASE64_ENCODE_LENGTH = 0xCE,
FUJICMD_BASE64_ENCODE_OUTPUT = 0xCD,
FUJICMD_BASE64_DECODE_INPUT = 0xCC,
FUJICMD_BASE64_DECODE_COMPUTE = 0xCB,
FUJICMD_BASE64_DECODE_LENGTH = 0xCA,
FUJICMD_BASE64_DECODE_OUTPUT = 0xC9,
FUJICMD_HASH_INPUT = 0xC8,
FUJICMD_HASH_COMPUTE = 0xC7,
FUJICMD_HASH_LENGTH = 0xC6,
FUJICMD_HASH_OUTPUT = 0xC5,
FUJICMD_GET_ADAPTERCONFIG_EXTENDED = 0xC4,
FUJICMD_HASH_COMPUTE_NO_CLEAR = 0xC3,
FUJICMD_HASH_CLEAR = 0xC2,
FUJICMD_GET_HEAP = 0xC1,
FUJICMD_QRCODE_OUTPUT = 0xBF,
FUJICMD_QRCODE_LENGTH = 0xBE,
FUJICMD_QRCODE_ENCODE = 0xBD,
FUJICMD_QRCODE_INPUT = 0xBC,
FUJICMD_GET_DEVICE8_FULLPATH = 0xA7,
FUJICMD_GET_DEVICE7_FULLPATH = 0xA6,
FUJICMD_GET_DEVICE6_FULLPATH = 0xA5,
FUJICMD_GET_DEVICE5_FULLPATH = 0xA4,
FUJICMD_GET_DEVICE4_FULLPATH = 0xA3,
FUJICMD_GET_DEVICE3_FULLPATH = 0xA2,
FUJICMD_HRS232_FORMAT_MEDIUM = 0xA2,
FUJICMD_GET_DEVICE2_FULLPATH = 0xA1,
FUJICMD_HRS232_FORMAT = 0xA1,
FUJICMD_GET_DEVICE1_FULLPATH = 0xA0,
FUJICMD_APETIME_GETTZTIME = 0x9A,
FUJICMD_GETTZTIME = 0x9A,
FUJICMD_APETIME_SETTZ = 0x99,
FUJICMD_SETTZ = 0x99,
FUJICMD_APETIME_GETTIME = 0x93,
FUJICMD_GETTIME = 0x93,
FUJICMD_TIMER = 0x5A, // Z
FUJICMD_STREAM = 0x58, // X
FUJICMD_WRITE = 0x57, // W
FUJICMD_TRANSLATION = 0x54, // T
FUJICMD_STATUS = 0x53, // S
FUJICMD_READ = 0x52, // R
FUJICMD_QUERY = 0x51, // Q
FUJICMD_PUT = 0x50, // P
FUJICMD_PARSE = 0x50, // P
FUJICMD_AUTOANSWER = 0x4F, // O
FUJICMD_PERCOM_WRITE = 0x4F, // O
FUJICMD_OPEN = 0x4F, // O
FUJICMD_BAUDRATELOCK = 0x4E, // N
FUJICMD_PERCOM_READ = 0x4E, // N
FUJICMD_UNLISTEN = 0x4D, // M
FUJICMD_LISTEN = 0x4C, // L
FUJICMD_SET_DUMP = 0x44, // D
FUJICMD_CLOSE = 0x43, // C
FUJICMD_CONFIGURE = 0x42, // B
FUJICMD_CONTROL = 0x41, // A
FUJICMD_TYPE3_POLL = 0x40, // @
FUJICMD_HIGHSPEED = 0x3F, // ?
FUJICMD_HSIO_INDEX = 0x3F, // ?
FUJICMD_HRS232_INDEX = 0x3F, // ?
FUJICMD_GETCWD = 0x30, // 0
FUJICMD_CHDIR = 0x2C, // ,
FUJICMD_RMDIR = 0x2B, // +
FUJICMD_MKDIR = 0x2A, // *
FUJICMD_TELL = 0x26, // &
FUJICMD_LOAD_HANDLER = 0x26, // &
FUJICMD_SEEK = 0x25, // %
FUJICMD_UNLOCK = 0x24, // $
FUJICMD_LOCK = 0x23, // #
FUJICMD_FORMAT_MEDIUM = 0x22, // "
FUJICMD_DELETE = 0x21, // !
FUJICMD_LOAD_RELOCATOR = 0x21, // !
FUJICMD_FORMAT = 0x21, // !
FUJICMD_RENAME = 0x20,
FUJICMD_NAK = 0x15, // ASCII NAK
FUJICMD_ACK = 0x06, // ASCII ACK
FUJICMD_SEND_ERROR = 0x02,
FUJICMD_SEND_RESPONSE = 0x01,
FUJICMD_DEVICE_READY = 0x00,
};

#endif /* FUJI_COMMANDS_H */
1 change: 1 addition & 0 deletions lib/device/adamnet/adamFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifdef BUILD_ADAM

#include "fuji.h"
#include "fujiCommandID.h"

#include <cstring>

Expand Down
1 change: 0 additions & 1 deletion lib/device/adamnet/adamFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
1 change: 0 additions & 1 deletion lib/device/comlynx/lynxFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
1 change: 0 additions & 1 deletion lib/device/cx16_i2c/cx16Fuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
1 change: 1 addition & 0 deletions lib/device/drivewire/drivewireFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifdef BUILD_COCO

#include "fuji.h"
#include "fujiCommandID.h"

#ifdef ESP_PLATFORM
#include <driver/ledc.h>
Expand Down
1 change: 0 additions & 1 deletion lib/device/drivewire/drivewireFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#include "hash.h"

Expand Down
1 change: 0 additions & 1 deletion lib/device/h89/H89Fuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
1 change: 1 addition & 0 deletions lib/device/iec/iecFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifdef BUILD_IEC

#include "fuji.h"
#include "fujiCommandID.h"
#include "../../../include/cbm_defines.h"

#include <driver/ledc.h>
Expand Down
1 change: 0 additions & 1 deletion lib/device/iec/iecFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

#include "../fuji/fujiHost.h"
#include "../fuji/fujiDisk.h"
#include "../fuji/fujiCmd.h"

#include "hash.h"

Expand Down
2 changes: 1 addition & 1 deletion lib/device/iwm/iwmFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

#include "fuji.h"

#include "fujiCmd.h"
#include "fujiCommandID.h"
#include "httpService.h"
#include "fnSystem.h"
#include "fnConfig.h"
Expand Down
3 changes: 1 addition & 2 deletions lib/device/iwm/iwmFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

#include "../fuji/fujiHost.h"
#include "../fuji/fujiDisk.h"
#include "../fuji/fujiCmd.h"

#include "hash.h"
#include "../../qrcode/qrmanager.h"
Expand Down Expand Up @@ -103,7 +102,7 @@ class iwmFuji : public iwmDevice
//uint8_t response[1024]; // use packet_buffer instead
//uint16_t response_len;

// Response to SIO_FUJICMD_GET_SCAN_RESULT
// Response to FUJICMD_GET_SCAN_RESULT
struct
{
char ssid[MAX_SSID_LEN + 1];
Expand Down
3 changes: 1 addition & 2 deletions lib/device/mac/macFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@

#include "../fuji/fujiHost.h"
#include "../fuji/fujiDisk.h"
#include "../fuji/fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 5 // 4 DCD devices + 1 floppy devices
Expand Down Expand Up @@ -73,7 +72,7 @@ class macFuji : public macDevice
//uint8_t response[1024]; // use packet_buffer instead
//uint16_t response_len;

// Response to SIO_FUJICMD_GET_SCAN_RESULT
// Response to FUJICMD_GET_SCAN_RESULT
struct
{
char ssid[MAX_SSID_LEN + 1];
Expand Down
1 change: 0 additions & 1 deletion lib/device/rc2014/rc2014Fuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#include "hash.h"

Expand Down
1 change: 1 addition & 0 deletions lib/device/rs232/rs232Fuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#ifdef BUILD_RS232

#include "fuji.h"
#include "fujiCommandID.h"

#include <cstdint>
#include <cstring>
Expand Down
1 change: 0 additions & 1 deletion lib/device/rs232/rs232Fuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
1 change: 0 additions & 1 deletion lib/device/s100spi/s100spiFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#define MAX_HOSTS 8
#define MAX_DISK_DEVICES 8
Expand Down
2 changes: 1 addition & 1 deletion lib/device/sio/sioFuji.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
#include "../../../include/debug.h"

#include "directoryPageGroup.h"
#include "fujiCmd.h"
#include "fujiCommandID.h"
#include "httpService.h"
#include "fnSystem.h"
#include "fnConfig.h"
Expand Down
1 change: 0 additions & 1 deletion lib/device/sio/sioFuji.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

#include "fujiHost.h"
#include "fujiDisk.h"
#include "fujiCmd.h"

#include "hash.h"
#include "../../qrcode/qrmanager.h"
Expand Down
85 changes: 0 additions & 85 deletions lib/fuji/fujiCmd.h
View file
Open in desktop

This file was deleted.

Loading
Loading