Skip to content

Commit abf3118

Browse files
FozzTexxFozzTexx
authored
Convert FUJICMD defines to enum (#1053)
1 parent d00361a commit abf3118

File tree

28 files changed

+646
-864
lines changed

28 files changed

+646
-864
lines changed

‎fujinet_pc.cmake‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -238,7 +238,6 @@ set(SOURCES src/main.cpp
238238
lib/network-protocol/SMB.h lib/network-protocol/SMB.cpp
239239
lib/network-protocol/SSH.h lib/network-protocol/SSH.cpp
240240
lib/network-protocol/SD.h lib/network-protocol/SD.cpp
241-
lib/fuji/fujiCmd.h
242241
lib/fuji/fujiHost.h lib/fuji/fujiHost.cpp
243242
lib/fuji/fujiDisk.h lib/fuji/fujiDisk.cpp
244243
lib/bus/bus.h

‎include/fujiCommandID.h‎

Lines changed: 137 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,137 @@
1+
#ifndef FUJI_COMMANDS_H
2+
#define FUJI_COMMANDS_H
3+
4+
/*
5+
* Fuji Device Command Definitions
6+
*/
7+
8+
enum fujiCommandID_t {
9+
FUJICMD_RESET = 0xFF,
10+
FUJICMD_SPECIAL_QUERY = 0xFF,
11+
FUJICMD_GET_SSID = 0xFE,
12+
FUJICMD_PASSWORD = 0xFE,
13+
FUJICMD_SCAN_NETWORKS = 0xFD,
14+
FUJICMD_USERNAME = 0xFD,
15+
FUJICMD_GET_SCAN_RESULT = 0xFC,
16+
FUJICMD_JSON = 0xFC,
17+
FUJICMD_SET_SSID = 0xFB,
18+
FUJICMD_GET_WIFISTATUS = 0xFA,
19+
FUJICMD_MOUNT_HOST = 0xF9,
20+
FUJICMD_MOUNT_IMAGE = 0xF8,
21+
FUJICMD_OPEN_DIRECTORY = 0xF7,
22+
FUJICMD_READ_DIR_ENTRY = 0xF6,
23+
FUJICMD_CLOSE_DIRECTORY = 0xF5,
24+
FUJICMD_READ_HOST_SLOTS = 0xF4,
25+
FUJICMD_WRITE_HOST_SLOTS = 0xF3,
26+
FUJICMD_READ_DEVICE_SLOTS = 0xF2,
27+
FUJICMD_WRITE_DEVICE_SLOTS = 0xF1,
28+
FUJICMD_ENABLE_UDPSTREAM = 0xF0,
29+
FUJICMD_SET_BAUDRATE = 0xEB,
30+
FUJICMD_GET_WIFI_ENABLED = 0xEA,
31+
FUJICMD_UNMOUNT_IMAGE = 0xE9,
32+
FUJICMD_GET_ADAPTERCONFIG = 0xE8,
33+
FUJICMD_NEW_DISK = 0xE7,
34+
FUJICMD_UNMOUNT_HOST = 0xE6,
35+
FUJICMD_GET_DIRECTORY_POSITION = 0xE5,
36+
FUJICMD_SET_DIRECTORY_POSITION = 0xE4,
37+
FUJICMD_SET_HSIO_INDEX = 0xE3,
38+
FUJICMD_SET_DEVICE_FULLPATH = 0xE2,
39+
FUJICMD_SET_HOST_PREFIX = 0xE1,
40+
FUJICMD_GET_HOST_PREFIX = 0xE0,
41+
FUJICMD_SET_SIO_EXTERNAL_CLOCK = 0xDF,
42+
FUJICMD_WRITE_APPKEY = 0xDE,
43+
FUJICMD_READ_APPKEY = 0xDD,
44+
FUJICMD_OPEN_APPKEY = 0xDC,
45+
FUJICMD_CLOSE_APPKEY = 0xDB,
46+
FUJICMD_GET_DEVICE_FULLPATH = 0xDA,
47+
FUJICMD_CONFIG_BOOT = 0xD9,
48+
FUJICMD_COPY_FILE = 0xD8,
49+
FUJICMD_MOUNT_ALL = 0xD7,
50+
FUJICMD_HRS232_WRITE = 0xD7,
51+
FUJICMD_SET_BOOT_MODE = 0xD6,
52+
FUJICMD_ENABLE_DEVICE = 0xD5,
53+
FUJICMD_DISABLE_DEVICE = 0xD4,
54+
FUJICMD_RANDOM_NUMBER = 0xD3,
55+
FUJICMD_HRS232_STATUS = 0xD3,
56+
FUJICMD_GET_TIME = 0xD2,
57+
FUJICMD_HRS232_READ = 0xD2,
58+
FUJICMD_DEVICE_ENABLE_STATUS = 0xD1,
59+
FUJICMD_BASE64_ENCODE_INPUT = 0xD0,
60+
FUJICMD_HRS232_PUT = 0xD0,
61+
FUJICMD_BASE64_ENCODE_COMPUTE = 0xCF,
62+
FUJICMD_BASE64_ENCODE_LENGTH = 0xCE,
63+
FUJICMD_BASE64_ENCODE_OUTPUT = 0xCD,
64+
FUJICMD_BASE64_DECODE_INPUT = 0xCC,
65+
FUJICMD_BASE64_DECODE_COMPUTE = 0xCB,
66+
FUJICMD_BASE64_DECODE_LENGTH = 0xCA,
67+
FUJICMD_BASE64_DECODE_OUTPUT = 0xC9,
68+
FUJICMD_HASH_INPUT = 0xC8,
69+
FUJICMD_HASH_COMPUTE = 0xC7,
70+
FUJICMD_HASH_LENGTH = 0xC6,
71+
FUJICMD_HASH_OUTPUT = 0xC5,
72+
FUJICMD_GET_ADAPTERCONFIG_EXTENDED = 0xC4,
73+
FUJICMD_HASH_COMPUTE_NO_CLEAR = 0xC3,
74+
FUJICMD_HASH_CLEAR = 0xC2,
75+
FUJICMD_GET_HEAP = 0xC1,
76+
FUJICMD_QRCODE_OUTPUT = 0xBF,
77+
FUJICMD_QRCODE_LENGTH = 0xBE,
78+
FUJICMD_QRCODE_ENCODE = 0xBD,
79+
FUJICMD_QRCODE_INPUT = 0xBC,
80+
FUJICMD_GET_DEVICE8_FULLPATH = 0xA7,
81+
FUJICMD_GET_DEVICE7_FULLPATH = 0xA6,
82+
FUJICMD_GET_DEVICE6_FULLPATH = 0xA5,
83+
FUJICMD_GET_DEVICE5_FULLPATH = 0xA4,
84+
FUJICMD_GET_DEVICE4_FULLPATH = 0xA3,
85+
FUJICMD_GET_DEVICE3_FULLPATH = 0xA2,
86+
FUJICMD_HRS232_FORMAT_MEDIUM = 0xA2,
87+
FUJICMD_GET_DEVICE2_FULLPATH = 0xA1,
88+
FUJICMD_HRS232_FORMAT = 0xA1,
89+
FUJICMD_GET_DEVICE1_FULLPATH = 0xA0,
90+
FUJICMD_GETTZTIME = 0x9A,
91+
FUJICMD_SETTZ = 0x99,
92+
FUJICMD_GETTIME = 0x93,
93+
FUJICMD_TIMER = 0x5A, // Z
94+
FUJICMD_STREAM = 0x58, // X
95+
FUJICMD_WRITE = 0x57, // W
96+
FUJICMD_TRANSLATION = 0x54, // T
97+
FUJICMD_STATUS = 0x53, // S
98+
FUJICMD_READ = 0x52, // R
99+
FUJICMD_QUERY = 0x51, // Q
100+
FUJICMD_PUT = 0x50, // P
101+
FUJICMD_PARSE = 0x50, // P
102+
FUJICMD_AUTOANSWER = 0x4F, // O
103+
FUJICMD_PERCOM_WRITE = 0x4F, // O
104+
FUJICMD_OPEN = 0x4F, // O
105+
FUJICMD_BAUDRATELOCK = 0x4E, // N
106+
FUJICMD_PERCOM_READ = 0x4E, // N
107+
FUJICMD_UNLISTEN = 0x4D, // M
108+
FUJICMD_LISTEN = 0x4C, // L
109+
FUJICMD_SET_DUMP = 0x44, // D
110+
FUJICMD_CLOSE = 0x43, // C
111+
FUJICMD_CONFIGURE = 0x42, // B
112+
FUJICMD_CONTROL = 0x41, // A
113+
FUJICMD_TYPE3_POLL = 0x40, // @
114+
FUJICMD_TYPE1_POLL = 0x3F,
115+
FUJICMD_HSIO_INDEX = 0x3F, // ?
116+
FUJICMD_GETCWD = 0x30, // 0
117+
FUJICMD_CHDIR = 0x2C, // ,
118+
FUJICMD_RMDIR = 0x2B, // +
119+
FUJICMD_MKDIR = 0x2A, // *
120+
FUJICMD_TELL = 0x26, // &
121+
FUJICMD_LOAD_HANDLER = 0x26, // &
122+
FUJICMD_SEEK = 0x25, // %
123+
FUJICMD_UNLOCK = 0x24, // $
124+
FUJICMD_LOCK = 0x23, // #
125+
FUJICMD_FORMAT_MEDIUM = 0x22, // "
126+
FUJICMD_DELETE = 0x21, // !
127+
FUJICMD_LOAD_RELOCATOR = 0x21, // !
128+
FUJICMD_FORMAT = 0x21, // !
129+
FUJICMD_RENAME = 0x20,
130+
FUJICMD_NAK = 0x15, // ASCII NAK
131+
FUJICMD_ACK = 0x06, // ASCII ACK
132+
FUJICMD_SEND_ERROR = 0x02,
133+
FUJICMD_SEND_RESPONSE = 0x01,
134+
FUJICMD_DEVICE_READY = 0x00,
135+
};
136+
137+
#endif /* FUJI_COMMANDS_H */

‎lib/device/adamnet/adamFuji.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef BUILD_ADAM
22

33
#include "fuji.h"
4+
#include "fujiCommandID.h"
45

56
#include <cstring>
67

‎lib/device/adamnet/adamFuji.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "fujiHost.h"
1111
#include "fujiDisk.h"
12-
#include "fujiCmd.h"
1312

1413
#define MAX_HOSTS 8
1514
#define MAX_DISK_DEVICES 8

‎lib/device/comlynx/lynxFuji.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
#include "fujiHost.h"
1111
#include "fujiDisk.h"
12-
#include "fujiCmd.h"
1312

1413
#define MAX_HOSTS 8
1514
#define MAX_DISK_DEVICES 8

‎lib/device/cx16_i2c/cx16Fuji.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include "fujiHost.h"
1313
#include "fujiDisk.h"
14-
#include "fujiCmd.h"
1514

1615
#define MAX_HOSTS 8
1716
#define MAX_DISK_DEVICES 8

‎lib/device/drivewire/drivewireFuji.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef BUILD_COCO
22

33
#include "fuji.h"
4+
#include "fujiCommandID.h"
45

56
#ifdef ESP_PLATFORM
67
#include <driver/ledc.h>

‎lib/device/drivewire/drivewireFuji.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111

1212
#include "fujiHost.h"
1313
#include "fujiDisk.h"
14-
#include "fujiCmd.h"
1514

1615
#include "hash.h"
1716

‎lib/device/h89/H89Fuji.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
#include "fujiHost.h"
1010
#include "fujiDisk.h"
11-
#include "fujiCmd.h"
1211

1312
#define MAX_HOSTS 8
1413
#define MAX_DISK_DEVICES 8

‎lib/device/iec/iecFuji.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
#ifdef BUILD_IEC
22

33
#include "fuji.h"
4+
#include "fujiCommandID.h"
45
#include "../../../include/cbm_defines.h"
56

67
#include <driver/ledc.h>

0 commit comments

Comments
 (0)