Skip to content

Commit c682fe6

Browse files
FozzTexxFozzTexx
authored
Remove fnUartBUS global so all bus IO goes through the systemBus (#1033)
1 parent 01a7597 commit c682fe6

File tree

26 files changed

+3026
-3066
lines changed

26 files changed

+3026
-3066
lines changed

‎include/debug.h‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -24,17 +24,17 @@
2424
#ifdef ESP_PLATFORM
2525
// Use FujiNet debug serial output
2626
#include "../lib/hardware/fnUART.h"
27-
#define Serial fnUartDebug
27+
#define Serial fnDebugConsole
2828
#if defined(PINMAP_RS232_S3) /*|| defined(PINMAP_ESP32S3_XDRIVE)*/
2929
#define Debug_print(...) printf( __VA_ARGS__ )
3030
#define Debug_printf(...) printf( __VA_ARGS__ )
3131
#define Debug_println(...) do { printf(__VA_ARGS__); printf("\n"); } while (0)
3232
#define Debug_printv(format, ...) {printf( ANSI_YELLOW "[%s:%u] %s(): " ANSI_GREEN_BOLD format ANSI_RESET "\r\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__);}
3333
#else
34-
#define Debug_print(...) fnUartDebug.print( __VA_ARGS__ )
35-
#define Debug_printf(...) fnUartDebug.printf( __VA_ARGS__ )
36-
#define Debug_println(...) fnUartDebug.println( __VA_ARGS__ )
37-
#define Debug_printv(format, ...) {fnUartDebug.printf( ANSI_YELLOW "[%s:%u] %s(): " ANSI_GREEN_BOLD format ANSI_RESET "\r\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__);}
34+
#define Debug_print(...) fnDebugConsole.print( __VA_ARGS__ )
35+
#define Debug_printf(...) fnDebugConsole.printf( __VA_ARGS__ )
36+
#define Debug_println(...) fnDebugConsole.println( __VA_ARGS__ )
37+
#define Debug_printv(format, ...) {fnDebugConsole.printf( ANSI_YELLOW "[%s:%u] %s(): " ANSI_GREEN_BOLD format ANSI_RESET "\r\n", __FILE__, __LINE__, __FUNCTION__, ##__VA_ARGS__);}
3838
#endif // PINMAP_RS232_S3
3939

4040
#define HEAP_CHECK(x) Debug_printf("HEAP CHECK %s " x "\r\n", heap_caps_check_integrity_all(true) ? "PASSED":"FAILED")
@@ -55,7 +55,7 @@
5555
#ifdef ESP_PLATFORM
5656
// Use FujiNet debug serial output
5757
#include "../lib/hardware/fnUART.h"
58-
#define Serial fnUartDebug
58+
#define Serial fnDebugConsole
5959
#endif
6060

6161
#define Debug_print(...)

‎lib/bus/adamnet/adamnet.cpp‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -78,24 +78,24 @@ uint8_t adamnet_checksum(uint8_t *buf, unsigned short len)
7878
void virtualDevice::adamnet_send(uint8_t b)
7979
{
8080
// Write the byte
81-
fnUartBUS.write(b);
82-
fnUartBUS.flush();
81+
SYSTEM_BUS.write(b);
82+
SYSTEM_BUS.flush();
8383
}
8484

8585
void virtualDevice::adamnet_send_buffer(uint8_t *buf, unsigned short len)
8686
{
87-
fnUartBUS.write(buf, len);
88-
fnUartBUS.flush();
87+
SYSTEM_BUS.write(buf, len);
88+
SYSTEM_BUS.flush();
8989
}
9090

9191
uint8_t virtualDevice::adamnet_recv()
9292
{
9393
uint8_t b;
9494

95-
while (fnUartBUS.available() <= 0)
95+
while (SYSTEM_BUS.available() <= 0)
9696
fnSystem.yield();
9797

98-
b = fnUartBUS.read();
98+
b = SYSTEM_BUS.read();
9999

100100
return b;
101101
}
@@ -108,17 +108,17 @@ bool virtualDevice::adamnet_recv_timeout(uint8_t *b, uint64_t dur)
108108
start = current = esp_timer_get_time();
109109
elapsed = 0;
110110

111-
while (fnUartBUS.available() <= 0)
111+
while (SYSTEM_BUS.available() <= 0)
112112
{
113113
current = esp_timer_get_time();
114114
elapsed = current - start;
115115
if (elapsed > dur)
116116
break;
117117
}
118118

119-
if (fnUartBUS.available() > 0)
119+
if (SYSTEM_BUS.available() > 0)
120120
{
121-
*b = (uint8_t)fnUartBUS.read();
121+
*b = (uint8_t)SYSTEM_BUS.read();
122122
timeout = false;
123123
} // else
124124
// Debug_printf("duration: %llu\n", elapsed);
@@ -143,7 +143,7 @@ void virtualDevice::adamnet_send_length(uint16_t l)
143143

144144
unsigned short virtualDevice::adamnet_recv_buffer(uint8_t *buf, unsigned short len)
145145
{
146-
return fnUartBUS.readBytes(buf, len);
146+
return SYSTEM_BUS.read(buf, len);
147147
}
148148

149149
uint32_t virtualDevice::adamnet_recv_blockno()
@@ -168,7 +168,7 @@ void virtualDevice::adamnet_response_ack(bool doNotWaitForIdle)
168168
{
169169
SYSTEM_BUS.wait_for_idle();
170170
}
171-
171+
172172
if (t < 300)
173173
{
174174
adamnet_send(0x90 | _devnum);
@@ -183,7 +183,7 @@ void virtualDevice::adamnet_response_nack(bool doNotWaitForIdle)
183183
{
184184
SYSTEM_BUS.wait_for_idle();
185185
}
186-
186+
187187
if (t < 300)
188188
{
189189
adamnet_send(0xC0 | _devnum);
@@ -203,12 +203,12 @@ void systemBus::wait_for_idle()
203203
do
204204
{
205205
// Wait for serial line to quiet down.
206-
while (fnUartBUS.available() > 0)
207-
fnUartBUS.read();
206+
while (_port.available() > 0)
207+
_port.read();
208208

209209
start = current = esp_timer_get_time();
210210

211-
while ((fnUartBUS.available() <= 0) && (isIdle == false))
211+
while ((_port.available() <= 0) && (isIdle == false))
212212
{
213213
current = esp_timer_get_time();
214214
dur = current - start;
@@ -221,7 +221,7 @@ void systemBus::wait_for_idle()
221221

222222
void virtualDevice::adamnet_process(uint8_t b)
223223
{
224-
fnUartDebug.printf("adamnet_process() not implemented yet for this device. Cmd received: %02x\n", b);
224+
fnDebugConsole.printf("adamnet_process() not implemented yet for this device. Cmd received: %02x\n", b);
225225
}
226226

227227
void virtualDevice::adamnet_control_status()
@@ -262,14 +262,14 @@ void virtualDevice::adamnet_idle()
262262

263263
//void virtualDevice::adamnet_status()
264264
//{
265-
// fnUartDebug.printf("adamnet_status() not implemented yet for this device.\n");
265+
// fnDebugConsole.printf("adamnet_status() not implemented yet for this device.\n");
266266
//}
267267

268268
void systemBus::_adamnet_process_cmd()
269269
{
270270
uint8_t b;
271271

272-
b = fnUartBUS.read();
272+
b = _port.read();
273273
start_time = esp_timer_get_time();
274274

275275
uint8_t d = b & 0x0F;
@@ -311,7 +311,7 @@ void systemBus::service()
311311
_adamnet_process_queue();
312312

313313
// Process anything waiting.
314-
if (fnUartBUS.available() > 0)
314+
if (_port.available() > 0)
315315
_adamnet_process_cmd();
316316
}
317317

@@ -332,7 +332,7 @@ void systemBus::setup()
332332
gpio_isr_handler_add((gpio_num_t)PIN_ADAMNET_RESET, adamnet_reset_isr_handler, (void *)PIN_CARD_DETECT_FIX);
333333

334334
// Set up UART
335-
fnUartBUS.begin(ADAMNET_BAUDRATE);
335+
_port.begin(ADAMNET_BAUDRATE);
336336
}
337337

338338
void systemBus::shutdown()

‎lib/bus/adamnet/adamnet.h‎

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
* AdamNet Routines
66
*/
77

8+
#include "fnUART.h"
89
#include <freertos/FreeRTOS.h>
910
#include <freertos/queue.h>
1011

@@ -178,7 +179,7 @@ class virtualDevice
178179
* @brief Do any tasks that can only be done when the bus is quiet
179180
*/
180181
virtual void adamnet_idle();
181-
182+
182183
/**
183184
* @brief send current status of device
184185
*/
@@ -193,7 +194,7 @@ class virtualDevice
193194
* @brief send status response
194195
*/
195196
virtual void adamnet_response_status();
196-
197+
197198
/**
198199
* @brief command frame, used by network protocol, ultimately
199200
*/
@@ -232,7 +233,7 @@ class virtualDevice
232233
*/
233234
uint8_t id() { return _devnum; }
234235

235-
236+
236237
};
237238

238239
/**
@@ -246,6 +247,8 @@ class systemBus
246247
adamFuji *_fujiDev = nullptr;
247248
adamPrinter *_printerDev = nullptr;
248249

250+
UARTManager _port = UARTManager(FN_UART_BUS);
251+
249252
void _adamnet_process_cmd();
250253
void _adamnet_process_queue();
251254

@@ -279,6 +282,18 @@ class systemBus
279282

280283
bool shuttingDown = false; // TRUE if we are in shutdown process
281284
bool getShuttingDown() { return shuttingDown; };
285+
286+
// Everybody thinks "oh I know how a serial port works, I'll just
287+
// access it directly and bypass the bus!" ಠ_ಠ
288+
size_t read(void *buffer, size_t length) { return _port.readBytes(buffer, length); }
289+
size_t read() { return _port.read(); }
290+
size_t write(const void *buffer, size_t length) { return _port.write(buffer, length); }
291+
size_t write(int n) { return _port.write(n); }
292+
size_t available() { return _port.available(); }
293+
void flush() { _port.flush(); }
294+
size_t print(int n, int base = 10) { return _port.print(n, base); }
295+
size_t print(const char *str) { return _port.print(str); }
296+
size_t print(const std::string &str) { return _port.print(str); }
282297
};
283298

284299
extern systemBus SYSTEM_BUS;

‎lib/bus/rs232/rs232.cpp‎

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,11 @@ void virtualDevice::bus_to_computer(uint8_t *buf, uint16_t len, bool err)
6868
rs232_complete();
6969

7070
// Write data frame
71-
fnUartBUS.write(buf, len);
71+
SYSTEM_BUS.write(buf, len);
7272
// Write checksum
73-
fnUartBUS.write(rs232_checksum(buf, len));
73+
SYSTEM_BUS.write(rs232_checksum(buf, len));
7474

75-
fnUartBUS.flush();
75+
SYSTEM_BUS.flush();
7676
}
7777

7878
/*
@@ -87,13 +87,13 @@ uint8_t virtualDevice::bus_to_peripheral(uint8_t *buf, unsigned short len)
8787
Debug_printf("<-RS232 read %hu bytes\n", len);
8888

8989
__BEGIN_IGNORE_UNUSEDVARS
90-
size_t l = fnUartBUS.readBytes(buf, len);
90+
size_t l = SYSTEM_BUS.read(buf, len);
9191
__END_IGNORE_UNUSEDVARS
9292

9393
// Wait for checksum
94-
while (fnUartBUS.available() <= 0)
94+
while (SYSTEM_BUS.available() <= 0)
9595
fnSystem.yield();
96-
uint8_t ck_rcv = fnUartBUS.read();
96+
uint8_t ck_rcv = SYSTEM_BUS.read();
9797

9898
uint8_t ck_tst = rs232_checksum(buf, len);
9999

@@ -120,33 +120,33 @@ uint8_t virtualDevice::bus_to_peripheral(uint8_t *buf, unsigned short len)
120120
// RS232 NAK
121121
void virtualDevice::rs232_nak()
122122
{
123-
fnUartBUS.write('N');
124-
fnUartBUS.flush();
123+
SYSTEM_BUS.write('N');
124+
SYSTEM_BUS.flush();
125125
Debug_println("NAK!");
126126
}
127127

128128
// RS232 ACK
129129
void virtualDevice::rs232_ack()
130130
{
131-
fnUartBUS.write('A');
131+
SYSTEM_BUS.write('A');
132132
fnSystem.delay_microseconds(DELAY_T5); //?
133-
fnUartBUS.flush();
133+
SYSTEM_BUS.flush();
134134
Debug_println("ACK!");
135135
}
136136

137137
// RS232 COMPLETE
138138
void virtualDevice::rs232_complete()
139139
{
140140
fnSystem.delay_microseconds(DELAY_T5);
141-
fnUartBUS.write('C');
141+
SYSTEM_BUS.write('C');
142142
Debug_println("COMPLETE!");
143143
}
144144

145145
// RS232 ERROR
146146
void virtualDevice::rs232_error()
147147
{
148148
fnSystem.delay_microseconds(DELAY_T5);
149-
fnUartBUS.write('E');
149+
SYSTEM_BUS.write('E');
150150
Debug_println("ERROR!");
151151
}
152152

@@ -166,14 +166,14 @@ void systemBus::_rs232_process_cmd()
166166
{
167167
_modemDev->modemActive = false;
168168
Debug_println("Modem was active - resetting RS232 baud");
169-
fnUartBUS.set_baudrate(_rs232Baud);
169+
_port.set_baudrate(_rs232Baud);
170170
}
171171

172172
// Read CMD frame
173173
cmdFrame_t tempFrame;
174174
memset(&tempFrame, 0, sizeof(tempFrame));
175175

176-
if (fnUartBUS.readBytes((uint8_t *)&tempFrame, sizeof(tempFrame)) != sizeof(tempFrame))
176+
if (_port.readBytes((uint8_t *)&tempFrame, sizeof(tempFrame)) != sizeof(tempFrame))
177177
{
178178
Debug_println("Timeout waiting for data after CMD pin asserted");
179179
return;
@@ -281,7 +281,7 @@ void systemBus::service()
281281
// Neither CMD nor active modem, so throw out any stray input data
282282
{
283283
//Debug_println("RS232 Srvc Flush");
284-
fnUartBUS.flush_input();
284+
_port.flush_input();
285285
}
286286

287287
// Handle interrupts from network protocols
@@ -298,7 +298,7 @@ void systemBus::setup()
298298
Debug_printf("RS232 SETUP: Baud rate: %u\n",Config.get_rs232_baud());
299299

300300
// Set up UART
301-
fnUartBUS.begin(Config.get_rs232_baud());
301+
_port.begin(Config.get_rs232_baud());
302302

303303
// // INT PIN
304304
// fnSystem.set_pin_mode(PIN_RS232_RI, gpio_mode_t::GPIO_MODE_OUTPUT_OD, SystemManager::pull_updown_t::PULL_UP);
@@ -326,7 +326,7 @@ void systemBus::setup()
326326
qRs232Messages = xQueueCreate(4, sizeof(rs232_message_t));
327327

328328
Debug_println("RS232 Setup Flush");
329-
fnUartBUS.flush_input();
329+
_port.flush_input();
330330
}
331331

332332
// Add device to RS232 bus
@@ -421,7 +421,7 @@ void systemBus::toggleBaudrate()
421421

422422
// Debug_printf("Toggling baudrate from %d to %d\n", _rs232Baud, baudrate);
423423
_rs232Baud = baudrate;
424-
fnUartBUS.set_baudrate(_rs232Baud);
424+
_port.set_baudrate(_rs232Baud);
425425
}
426426

427427
int systemBus::getBaudrate()
@@ -439,7 +439,7 @@ void systemBus::setBaudrate(int baud)
439439

440440
Debug_printf("Changing baudrate from %d to %d\n", _rs232Baud, baud);
441441
_rs232Baud = baud;
442-
fnUartBUS.set_baudrate(baud);
442+
_port.set_baudrate(baud);
443443
}
444444

445445
// Set HRS232 index. Sets high speed RS232 baud and also returns that value.

0 commit comments

Comments
 (0)