From 45c4f7e97f9f16d1e317faa3979f66e7f1be9b6f Mon Sep 17 00:00:00 2001 From: Edward Kisiel Date: Fri, 31 May 2024 16:36:27 -0400 Subject: [PATCH] added cnano-avr128da48, adjustments to cs-solarmeter and updated sbc_model_framework --- SBC_Model_Framework | 2 +- sbc_case_builder.json | 10 +++++----- sbc_case_builder.scad | 4 ++-- sbc_case_builder_accessories.cfg | 6 ++++++ 4 files changed, 14 insertions(+), 8 deletions(-) diff --git a/SBC_Model_Framework b/SBC_Model_Framework index 15b092d..8489bf8 160000 --- a/SBC_Model_Framework +++ b/SBC_Model_Framework @@ -1 +1 @@ -Subproject commit 15b092dd54013c65d9671055eeafa1bccf1b44f2 +Subproject commit 8489bf8c0f1afef2f787630eb0e3e834c4df518c diff --git a/sbc_case_builder.json b/sbc_case_builder.json index 08a9704..707649d 100644 --- a/sbc_case_builder.json +++ b/sbc_case_builder.json @@ -6817,7 +6817,7 @@ "access_panel_rotation": "0", "access_panel_size": "[70, 30]", "accessory_highlight": "false", - "accessory_name": "none", + "accessory_name": "cs_solarmeter", "adj": "0.01", "bend_allowance": "1", "bottom_access_panel_enable": "false", @@ -6916,7 +6916,7 @@ "material_thickness": "0.5", "move_front": "0", "move_leftside": "0", - "move_rear": "0", + "move_rear": "-1", "move_rightside": "0", "multipcb_bottom_front_left_adjust": "0", "multipcb_bottom_front_left_enable": "true", @@ -6955,7 +6955,7 @@ "multipcb_top_rear_right_adjust": "0", "multipcb_top_rear_right_enable": "true", "multipcb_top_rear_right_support": "rear", - "multipcb_top_sidewall_support": "false", + "multipcb_top_sidewall_support": "true", "multipcb_top_standoff_diameter": "5.75", "multipcb_top_standoff_hole_size": "2.75", "multipcb_top_standoff_insert": "false", @@ -6965,7 +6965,7 @@ "multipcb_top_standoff_reverse": "true", "multipcb_top_standoff_size": "m2.5", "multipcb_top_standoff_support_height": "4", - "multipcb_top_standoff_support_size": "7", + "multipcb_top_standoff_support_size": "8", "multipcb_top_standoff_type": "blind", "multipcb_top_standoffs": "true", "pcb_loc_x": "0", @@ -6997,7 +6997,7 @@ "top_rear_right_adjust": "0", "top_rear_right_enable": "true", "top_rear_right_support": "rear", - "top_sidewall_support": "false", + "top_sidewall_support": "true", "top_standoff_diameter": "5.75", "top_standoff_hole_size": "2.75", "top_standoff_insert": "false", diff --git a/sbc_case_builder.scad b/sbc_case_builder.scad index 87ccc0b..1ca3499 100644 --- a/sbc_case_builder.scad +++ b/sbc_case_builder.scad @@ -29,7 +29,7 @@ include <./sbc_case_builder_accessories.cfg>; view = "model"; // [model, platter, part] individual_part = "bottom"; // [top, bottom, right, left, front, rear, io_shield, accessories] // single board computer model -sbc_model = "c1+"; // ["c1+", "c2", "c4", "hc4", "xu4", "xu4q", "mc1", "hc1", "n1", "n2", "n2+", "n2l", "n2lq", "m1", "m1s", "h2", "h2+", "h3", "h3+", "h4", "h4+", "h4_ultra", "show2", "rpipico", "rpipicow", "rpicm4+ioboard", "rpicm1", "rpicm3", "rpicm3l", "rpicm3+", "rpicm4s", "rpicm4", "rpicm4l", "rpizero", "rpizerow", "rpizero2w", "rpi1a+", "rpi1b+", "rpi2b", "rpi3a+", "rpi3b", "rpi3b+", "rpi4b", "rpi5", "rock64", "rockpro64", "quartz64a", "quartz64b", "h64b", "star64", "rock4a", "rock4b", "rock4a+", "rock4b+", "rock4c", "rock4c+", "rock5b-v1.3", "rock5b", "rock5bq", "nio12l", "vim1", "vim2", "vim3", "vim3l", "vim4", "tinkerboard", "tinkerboard-s", "tinkerboard-2", "tinkerboard-2s", "tinkerboard-r2", "tinkerboard-r2s", "opizero", "opizero2", "opir1plus_lts", "opir1", "opi5", "jetsonnano", "lepotato", "sweetpotato", "tritium-h2+", "tritium-h3", "tritium-h5", "solitude", "alta", "atomicpi", "visionfive2", "visionfive2q", "licheerv+dock", "rak19007", "nodemcu-32s", "cs-solarmeter", "ssi-eeb", "ssi-ceb", "atx", "micro-atx", "dtx", "flex-atx", "mini-dtx", "mini-itx", "mini-itx_thin", "mini-stx", "mini-stx_thin", "nano-itx", "nuc", "pico-itx"] +sbc_model = "c1+"; // ["c1+", "c2", "c4", "hc4", "xu4", "xu4q", "mc1", "hc1", "n1", "n2", "n2+", "n2l", "n2lq", "m1", "m1s", "h2", "h2+", "h3", "h3+", "h4", "h4+", "h4_ultra", "show2", "rpipico", "rpipicow", "rpicm4+ioboard", "rpicm1", "rpicm3", "rpicm3l", "rpicm3+", "rpicm4s", "rpicm4", "rpicm4l", "rpizero", "rpizerow", "rpizero2w", "rpi1a+", "rpi1b+", "rpi2b", "rpi3a+", "rpi3b", "rpi3b+", "rpi4b", "rpi5", "rock64", "rockpro64", "quartz64a", "quartz64b", "h64b", "star64", "rock4a", "rock4b", "rock4a+", "rock4b+", "rock4c", "rock4c+", "rock5b-v1.3", "rock5b", "rock5bq", "nio12l", "vim1", "vim2", "vim3", "vim3l", "vim4", "tinkerboard", "tinkerboard-s", "tinkerboard-2", "tinkerboard-2s", "tinkerboard-r2", "tinkerboard-r2s", "opizero", "opizero2", "opir1plus_lts", "opir1", "opi5", "jetsonnano", "lepotato", "sweetpotato", "tritium-h2+", "tritium-h3", "tritium-h5", "solitude", "alta", "atomicpi", "visionfive2", "visionfive2q", "licheerv+dock", "rak19007", "cnano-avr128da48", "nodemcu-32s", "cs-solarmeter", "ssi-eeb", "ssi-ceb", "atx", "micro-atx", "dtx", "flex-atx", "mini-dtx", "mini-itx", "mini-itx_thin", "mini-stx", "mini-stx_thin", "nano-itx", "nuc", "pico-itx"] // sbc off in model view sbc_off = false; @@ -125,7 +125,7 @@ uart_opening = "default"; // [default,none,open,knockout] // enable indentations around io openings indents = true; // case accessory group to load -accessory_name = "none"; // ["none", "hk_uart", "c4_shell_boombox", "c4_desktop_lcd3.5", "c4_deskboom_lcd3.5", "c4_panel_boombox", "c4_panel_lcd3.5", "c4_tray_boombox", "c4_round", "c4_hex", "xu4_keyhole", "hc4_shell_drivebox2.5", "hc4_shell_drivebox2.5v", "hc4_shell_drivebox3.5", "hc4_tray_drivebox2.5", "m1s_shell_nvme", "m1s_shell_ups", "m1s_tray_nvme", "m1_tray_ssd", "m1_fitted_pizzabox2.5", "m1_fitted_pizzabox3.5", "h3_shell", "h3_shell_router", "h3_lowboy", "h3_lowboy_router", "h3_ultimate", "h3_ultimate2", "show2_shell", "rpi5_m2hat","adapter_mini-stx_m1s"] +accessory_name = "none"; // ["none", "hk_uart", "c4_shell_boombox", "c4_desktop_lcd3.5", "c4_deskboom_lcd3.5", "c4_panel_boombox", "c4_panel_lcd3.5", "c4_tray_boombox", "c4_round", "c4_hex", "xu4_keyhole", "hc4_shell_drivebox2.5", "hc4_shell_drivebox2.5v", "hc4_shell_drivebox3.5", "hc4_tray_drivebox2.5", "m1s_shell_nvme", "m1s_shell_ups", "m1s_tray_nvme", "m1_tray_ssd", "m1_fitted_pizzabox2.5", "m1_fitted_pizzabox3.5", "h3_shell", "h3_shell_router", "h3_lowboy", "h3_lowboy_router", "h3_ultimate", "h3_ultimate2", "show2_shell", "rpi5_m2hat", "cs_solarmeter", "adapter_mini-stx_m1s"] // sbc information text color text_color = "Green"; // [Green, Black, Dimgrey, White, Yellow, Orange, Red, DarkbBlue] // sbc information text font diff --git a/sbc_case_builder_accessories.cfg b/sbc_case_builder_accessories.cfg index 3e2f89b..4299788 100644 --- a/sbc_case_builder_accessories.cfg +++ b/sbc_case_builder_accessories.cfg @@ -447,6 +447,12 @@ accessory_data = [ "add2","standoff",113,125,0,"bottom",[0,0,0],["sbc",false,false,false],[0,0,0],[["custom",5.75,5,3.6,10,4,"countersunk","hex",false,false,4.5,5.1]],[true,10,2,"default"], "model","hk_m1s_ups",2,97,5,"bottom",[0,0,0],["sbc",false,false,false],[0,0,0],[0],[true,110,2,"default"]], + + // circuitsetup solar energy meter + ["cs_solarmeter", + "sub","slot",-3,47,10.1,"top",[0,90,0],["sbc",true,true,true],[1.6,4.5,4],[[0]],[false,10,2,"default"]], + + // environmental sensors ["env_sensors", // i2c radial hub holder