static ip tests

Paciente8159 · Sep 22, 2024 · 0b3c761 · 0b3c761
1 parent 7a7a153
commit 0b3c761
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 10 deletions.
diff --git a/uCNC/src/interface/serial.c b/uCNC/src/interface/serial.c
@@ -527,14 +527,18 @@ void print_fltarr(print_cb cb, float *arr, uint8_t count)
  }
 }
 
-void print_ip4(print_cb cb, int32_t num)
+void print_ipv4(print_cb cb, int32_t num)
 {
- uint8_t *ip = &num;
- print_int(cb, (uint32_t)ip[0]);
+ typedef union{
+ uint32_t ip;
+ uint8_t bytes[4];
+ } ipv4_t;
+ ipv4_t ip = { .ip = (uint32_t)num };
+ print_int(cb, (uint32_t)ip.bytes[0]);
  cb('.');
- print_int(cb, (uint32_t)ip[1]);
+ print_int(cb, (uint32_t)ip.bytes[1]);
  cb('.');
- print_int(cb, (uint32_t)ip[2]);
+ print_int(cb, (uint32_t)ip.bytes[2]);
  cb('.');
- print_int(cb, (uint32_t)ip[3]);
+ print_int(cb, (uint32_t)ip.bytes[3]);
 }
diff --git a/uCNC/src/interface/serial.h b/uCNC/src/interface/serial.h
@@ -80,7 +80,7 @@ extern "C"
  void print_fltunits(print_cb cb, float num);
  void print_intarr(print_cb cb, int32_t *arr, uint8_t count);
  void print_fltarr(print_cb cb, float *arr, uint8_t count);
- void print_ip4(print_cb cb, int32_t num)
+ void print_ipv4(print_cb cb, int32_t num);
 
 #define serial_print_str(__s) print_str(serial_putc, __s)
 #define serial_print_bytes(data, count) print_bytes(serial_putc, data, count)
@@ -89,7 +89,7 @@ extern "C"
 #define serial_print_fltunits(num) print_fltunits(serial_putc, num)
 #define serial_print_intarr(arr, count) print_intarr(serial_putc, arr, count)
 #define serial_print_fltarr(arr, count) print_fltarr(serial_putc, arr, count)
-#define serial_print_ip4(ip) print_ip4(serial_putc, ip)
+#define serial_print_ipv4(ip) print_ipv4(serial_putc, ip)
 
 #ifdef ENABLE_DEBUG_STREAM
 #ifndef DEBUG_STREAM

diff --git a/uCNC/src/modules/w5500_mogoose/mongoose_config.h b/uCNC/src/modules/w5500_mogoose/mongoose_config.h
@@ -15,5 +15,6 @@
 #define MG_ENABLE_CUSTOM_MILLIS 1
 #define mkdir(a, b) (-1)
 #define MG_IO_SIZE 128
+#define MG_ENABLE_ASSERT 1
 
 #endif
diff --git a/uCNC/src/modules/w5500_mogoose/w5500_mongoose.c b/uCNC/src/modules/w5500_mogoose/w5500_mongoose.c
@@ -130,7 +130,7 @@ void w5500_diagnostic(void *args)
 {
  MG_INFO(("ethernet: %s", mg_tcpip_driver_w5500.up(&mif) ? "up" : "down"));
  struct mg_tcpip_if *ifp = (struct mg_tcpip_if *) mgr.priv;
- serial_print_ip4(ifp->ip);
+ serial_print_ipv4(ifp->ip);
  serial_flush();
 }
 
@@ -152,7 +152,10 @@ DECL_MODULE(w5500_mongoose)
  mif.mac[3] = 0x0a;
  mif.mac[4] = 0x49;
  mif.mac[5] = 0xfb;
- mif.enable_dhcp_client = true;
+ // mif.enable_dhcp_client = true;
+ mif.gw = 0xfe01a8c0;
+ mif.ip = 0x7801a8c0;
+ mif.mask = 0x00ffffff;
 
  mif.driver = &mg_tcpip_driver_w5500;
  mif.driver_data = &spi; // network interface