From f2e64ad11e9e8f734b55da7e23b3726019352f91 Mon Sep 17 00:00:00 2001 From: Rich Stephens Date: Mon, 22 Sep 2025 12:05:19 -0400 Subject: [PATCH 1/3] Fixes to coco wifi functions, and to allow compiling with the standard fujinet-fuji.h header in the release. --- coco/src/fn_fuji/fuji_get_wifi_enabled.c | 8 +++++++- coco/src/fn_fuji/fuji_set_ssid.c | 5 ++++- coco/src/include/stdbool-coco.h | 2 ++ fujinet-fuji.h | 9 ++++++++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/coco/src/fn_fuji/fuji_get_wifi_enabled.c b/coco/src/fn_fuji/fuji_get_wifi_enabled.c index 8e8cb1c..92d1265 100644 --- a/coco/src/fn_fuji/fuji_get_wifi_enabled.c +++ b/coco/src/fn_fuji/fuji_get_wifi_enabled.c @@ -23,5 +23,11 @@ bool fuji_get_wifi_enabled() if (fuji_get_error()) return false; - return fuji_get_response((uint8_t *)&enabled, sizeof(bool)); + if (fuji_get_response((uint8_t *)&enabled, sizeof(bool)) == BUS_ERROR) + { + // Set enabled = false on error + enabled = false; + } + + return enabled; } diff --git a/coco/src/fn_fuji/fuji_set_ssid.c b/coco/src/fn_fuji/fuji_set_ssid.c index 9644d34..77f1ee1 100644 --- a/coco/src/fn_fuji/fuji_set_ssid.c +++ b/coco/src/fn_fuji/fuji_set_ssid.c @@ -10,14 +10,17 @@ bool fuji_set_ssid(NetConfig *nc) { uint8_t opcode; uint8_t cmd; + char ssid[SSID_MAXLEN]; + char password[MAX_PASSWORD_LEN]; } ss; ss.opcode = OP_FUJI; ss.cmd = FUJICMD_SET_SSID; + memcpy(ss.ssid, nc->ssid, SSID_MAXLEN); + memcpy(ss.password, nc->password, MAX_PASSWORD_LEN); bus_ready(); dwwrite((uint8_t *)&ss, sizeof(ss)); - dwwrite((uint8_t *)&nc, sizeof(NetConfig)); return !fuji_get_error(); } diff --git a/coco/src/include/stdbool-coco.h b/coco/src/include/stdbool-coco.h index 00c5d77..2a829e4 100644 --- a/coco/src/include/stdbool-coco.h +++ b/coco/src/include/stdbool-coco.h @@ -3,8 +3,10 @@ #ifndef _STDBOOL_H #define _STDBOOL_H +#ifndef bool typedef unsigned char bool; #define true 1 #define false 0 +#endif /* bool */ #endif diff --git a/fujinet-fuji.h b/fujinet-fuji.h index cf48d8c..1d2e0a3 100644 --- a/fujinet-fuji.h +++ b/fujinet-fuji.h @@ -7,7 +7,14 @@ #ifdef _CMOC_VERSION_ #include - #include "stdbool-coco.h" + + #ifndef bool + #define bool _FNBool + typedef unsigned char _FNBool; + #endif /* bool */ + + #define true 1 + #define false 0 #else #include #include From 923e78966089a2a2e310c304988f0f3e73490e6a Mon Sep 17 00:00:00 2001 From: Rich Stephens Date: Mon, 22 Sep 2025 13:25:29 -0400 Subject: [PATCH 2/3] Removed stdbool-coco.h and references to it. --- coco/src/include/fujinet-fuji-coco.h | 2 +- coco/src/include/stdbool-coco.h | 12 ------------ 2 files changed, 1 insertion(+), 13 deletions(-) delete mode 100644 coco/src/include/stdbool-coco.h diff --git a/coco/src/include/fujinet-fuji-coco.h b/coco/src/include/fujinet-fuji-coco.h index 2eda281..1a72c1f 100644 --- a/coco/src/include/fujinet-fuji-coco.h +++ b/coco/src/include/fujinet-fuji-coco.h @@ -9,7 +9,7 @@ #ifndef FUJINET_FUJI_COCO_H #define FUJINET_FUJI_COCO_H -#include "stdbool-coco.h" +#include "fujinet-fuji.h" /** * @brief Error code for success diff --git a/coco/src/include/stdbool-coco.h b/coco/src/include/stdbool-coco.h deleted file mode 100644 index 2a829e4..0000000 --- a/coco/src/include/stdbool-coco.h +++ /dev/null @@ -1,12 +0,0 @@ -// Implement for CMOC. -// Follow the standard "ifndef _STDBOOL_H" check in case the project already does this. -#ifndef _STDBOOL_H -#define _STDBOOL_H - -#ifndef bool -typedef unsigned char bool; -#define true 1 -#define false 0 -#endif /* bool */ - -#endif From 74a54d215d47f64dc1514df1674634a2dfeb26ee Mon Sep 17 00:00:00 2001 From: Rich Stephens Date: Tue, 23 Sep 2025 08:57:53 -0400 Subject: [PATCH 3/3] Fixed missing include for coco --- fujinet-fuji.h | 1 + 1 file changed, 1 insertion(+) diff --git a/fujinet-fuji.h b/fujinet-fuji.h index 1d2e0a3..f7aeeac 100644 --- a/fujinet-fuji.h +++ b/fujinet-fuji.h @@ -7,6 +7,7 @@ #ifdef _CMOC_VERSION_ #include + #include #ifndef bool #define bool _FNBool