Merge branch 'master' into pclink

FujiNetWIFI · Nov 8, 2023 · 16abbee · 16abbee
2 parents 34587f9 + a232440
commit 16abbee
Show file tree

Hide file tree

Showing 171 changed files with 10,043 additions and 1,105 deletions.
diff --git a/.github/workflows/autobuild.yml b/.github/workflows/autobuild.yml
@@ -43,6 +43,7 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
+        pip install setuptools
         pip install --upgrade platformio
         pip install Jinja2
         pip install pyyaml

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -41,6 +41,7 @@ jobs:
     - name: Install PlatformIO
       run: |
         python -m pip install --upgrade pip
+        pip install setuptools
         pip install --upgrade platformio
         pip install Jinja2
         pip install pyyaml

diff --git a/data/webui/config/fujiapple-rev0.yaml b/data/webui/config/fujiapple-rev0.yaml
@@ -16,4 +16,5 @@ components:
   disk_swap: true
   boot_settings: true
   apetime: false
+  cpm_settings: true
   pclink: false
diff --git a/data/webui/config/fujinet-atari-v1.yaml b/data/webui/config/fujinet-atari-v1.yaml
@@ -17,4 +17,5 @@ components:
   disk_swap: true
   boot_settings: true
   apetime: true
+  cpm_settings: true
   pclink: true
diff --git a/data/webui/config/nugget-iec.yaml b/data/webui/config/nugget-iec.yaml
@@ -0,0 +1,18 @@
+paths:
+  font_path: /file?
+  css_path: /file?css
+  js_path: /file?js
+components:
+  network: true
+  hardware: true
+  hosts_list: true
+  mount_list: true
+  printer_settings: true
+  modem_settings: false
+  hsio_settings: false
+  timezone: true
+  udp_stream: true
+  program_recorder: false
+  disk_swap: true
+  boot_settings: true
+  apetime: false
diff --git a/data/webui/device_specific/BUILD_ADAM/autorun.ddp b/data/webui/device_specific/BUILD_ADAM/autorun.ddp
diff --git a/data/webui/device_specific/BUILD_APPLE/autorun.po b/data/webui/device_specific/BUILD_APPLE/autorun.po
diff --git a/data/webui/device_specific/BUILD_ATARI/autorun.atr b/data/webui/device_specific/BUILD_ATARI/autorun.atr
diff --git a/data/webui/template/www/header.tmpl.html b/data/webui/template/www/header.tmpl.html
@@ -12,39 +12,39 @@
                 display: inline-block;
                 vertical-align: middle;
             }
-    
+
             @font-face {
                 font-family: 'Futura';
                 src: url('{{ paths.font_path }}/FuturaBT-Light.woff2') format('woff2');
                 font-weight: 300;
                 font-style: normal;
             }
-    
+
             @font-face {
                 font-family: 'Inconsolata';
                 src: url('{{ paths.font_path }}/Inconsolata-Light.woff2') format('woff2');
                 font-weight: 300;
                 font-style: normal;
             }
-    
+
             html {
                 max-width: 98%;
             }
-    
+
             .header {
                 width: 100%;
             }
-    
+
             .headerlogo {
                 width: 20rem;
                 margin: 0 auto;
             }
-    
+
             .formwrapper {
                 margin: auto;
                 text-align: center;
             }
-    
+
             .flexparent {
                 display: flex;
                 flex-wrap: wrap;
@@ -53,21 +53,21 @@
                 align-items: flex-start;
                 align-content: stretch;
             }
-    
+
             .flexchild {
                 border: 0.2rem solid #000;
                 width: 99%;
                 margin: 0.5rem;
             }
-    
+
             .flexchild header {
                 color: #fff;
                 border: 0.2rem solid #000;
                 background-color: #000;
                 padding: 0.2rem;
                 font-size: 1.5rem;
             }
-    
+
             .detline {
                 display: flex;
                 flex-wrap: wrap;
@@ -76,7 +76,7 @@
                 align-items: stretch;
                 align-content: stretch;
             }
-    
+
             .deth {
                 border-right: 0.2rem solid #999;
                 background-color: #cccccc;
@@ -86,11 +86,11 @@
                 padding: 0.1rem;
                 text-align: right;
             }
-    
+
             .detline.alt .deth {
                 background-color: #aaaaaa;
             }
-    
+
             .det {
                 font-family: Inconsolata, SFMono-Regular, Menlo, Monaco, Consolas, "Liberation Mono", "Courier New", monospace;
                 border: none;
@@ -104,45 +104,45 @@
             .detline.alt .det {
                 background-color: #eeeeee;
             }
-    
+
             .ra {
                 width: 6rem;
                 text-align: right
             }
-    
+
             .cicon {
                 border-right: 0.2rem solid #999;
                 background-color: #cccccc;
                 position: relative;
                 width: 38%;
                 padding: 0.5rem;
             }
-    
+
             .cform {
                 position: relative;
                 min-width: 55%;
                 max-width: 55%;
                 padding: 0.2rem;
             }
-    
+
             .svgicon {
                 width: 8rem;
                 min-height: 12rem;
                 margin: auto;
                 text-align: center;
                 color: #999999;
             }
-    
+
             .small {
                 font-size: smaller;
                 line-height: 1.5;
             }
-    
+
             .important {
                 color: #000;
                 font-weight: bolder;
             }
-    
+
             .fileflex {
                 display: flex;
                 flex-direction: row;
@@ -156,7 +156,7 @@
                 width: 99%;
                 margin: 0.5rem;
             }
-    
+
             .filechild header {
                 color: #fff;
                 border: 0.2rem solid #000;
@@ -174,28 +174,28 @@
             .abortline {
                 background-color: #aaaaaa;
             }
-    
+
             body {
                 font-family: Futura, -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif, "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji";
             }
-    
+
             html,
             input,
             optgroup {
                 /* font-size: 140% */
             }
-    
+
             @media only screen and (min-width: 720px) {
-    
+
                 html,
                 input,
                 optgroup {
                     /* font-size: 140%; */
                 }
             }
-    
+
             @media only screen and (min-width: 1024px) {
-    
+
                 html,
                 input,
                 optgroup {
@@ -204,35 +204,35 @@
                 .flexparent {
                     flex-direction: row;
                 }
-    
+
                 .flexchild {
                     width: 47.5%;
                 }
-    
+
             }
-    
+
             @media only screen and (min-width: 1280px) {
-    
+
                 html,
                 input,
                 optgroup {
                     /* font-size: 120%; */
                 }
-    
+
                 .flexparent {
                     flex-direction: row;
                 }
-    
+
                 .flexchild {
                     width: 47.5%;
                 }
-    
+
             }
             #txt_hostname
             {
                 text-align: right;
             }
-        </style>    
+        </style>
     </head>
     <body>
 		<div class="headerlogo">

diff --git a/data/webui/template/www/index.tmpl.html b/data/webui/template/www/index.tmpl.html
@@ -383,7 +383,7 @@ <h2 style="text-align: center;">Need help? Go to the <a href="https://github.com
 								</select>
 							</div>
 						</div>
-						
+
 						<script>
 							var current_printer_enabled = "<%FN_PRINTER_ENABLED%>";
 							var current_printer = "<%FN_PRINTER1_MODEL%>";
@@ -1164,7 +1164,80 @@ <h2 style="text-align: center;">Need help? Go to the <a href="https://github.com
 				</div>
 				</form>
 			</div>
-			{% endif %}			
+			{% endif %}
+			{% if components.cpm_settings %}
+			<div class="flexchild">
+				<form action="/config" method="post">
+				<div class="settings">
+					<div class="settings-header">
+						CP/M<span id="logowob"></span>Settings
+					</div>
+					<div class="settings-left">
+							<div class="svgicon">
+								<svg width="53.317mm" height="46.17mm" version="1.1" viewBox="0 0 53.317 46.17" xmlns="http://www.w3.org/2000/svg">
+								 <g transform="translate(-7.5798 -24.586)">
+								  <rect x="9.7771" y="26.784" width="48.922" height="41.775" ry="8.4013" fill="#454545" stroke="#000" stroke-width="3.9947"/>
+								  <g fill="#0f0">
+								   <g transform="matrix(1.5554 0 0 1.5554 -4.3212 -13.767)" stroke-width=".26458" aria-label="CP/M">
+									<path d="m11.825 31.973h0.79375v-0.79375h0.79375v-0.79375h3.175v0.79375h0.79375v1.5875h-0.79375v-0.79375h-0.79375v-0.79375h-1.5875v0.79375h-0.79375v4.7625h0.79375v0.79375h1.5875v-0.79375h0.79375v-0.79375h0.79375v1.5875h-0.79375v0.79375h-3.175v-0.79375h-0.79375v-0.79375h-0.79375z"/>
+									<path d="m18.439 30.385v0.79375h0.79375v6.35h-0.79375v0.79375h3.175v-0.79375h-0.79375v-3.175h2.3812v-0.79375h0.79375v-2.3812h-0.79375v-0.79375zm2.3812 0.79375h1.5875v2.3812h-1.5875z"/>
+									<path d="m25.054 38.323v-1.5875h0.79375v-0.79375h0.79375v-0.79375h0.79375v-0.79375h0.79375v-0.79375h0.79375v-0.79375h0.79375v-0.79375h0.79375v1.5875h-0.79375v0.79375h-0.79375v0.79375h-0.79375v0.79375h-0.79375v0.79375h-0.79375v0.79375h-0.79375v0.79375z"/>
+									<path d="m31.668 30.385v7.9375h1.5875v-4.7625h0.79375v0.79375h0.79375v-0.79375h0.79375v4.7625h1.5875v-7.9375h-1.5875v0.79375h-0.79375v0.79375h-0.79375v-0.79375h-0.79375v-0.79375z"/>
+								   </g>
+								   <g transform="matrix(1.5554 0 0 1.5554 -4.3212 -13.767)" stroke-width=".26458" aria-label="A0&gt;">
+									<path d="m16.217 48.336h-0.97014v-1.9403h-1.4552v1.9403h-0.97014v-3.3955h0.48507v-0.48507h0.48507v-0.48507h0.48507v-0.48507h0.48507v0.48507h0.48507v0.48507h0.48507v0.48507h0.48507zm-0.97014-2.4253v-0.97014h-0.48507v-0.48507h-0.48507v0.48507h-0.48507v0.97014z"/>
+									<path d="m16.966 47.366h0.48507v0.48507h0.48507v0.48507h1.4552v-0.48507h0.48507v-0.48507h0.48507v-2.9104h-0.48507v-0.48507h-0.48507v-0.48507h-1.4552v0.48507h-0.48507v0.48507h-0.48507zm1.9403-3.3955v0.48507h0.48507v2.9104h-0.48507v0.48507h-0.48507v-0.48507h-0.48507v-2.9104h0.48507v-0.48507zm-0.48507 1.4552h0.48507v0.97014h-0.48507z"/>
+									<path d="m24.507 46.396h-0.48507v0.48507h-0.48507v0.48507h-0.48507v0.48507h-0.48507v0.48507h-0.97014v-0.48507h0.48507v-0.48507h0.48507v-0.48507h0.48507v-0.48507h0.48507v-0.48507h-0.48507v-0.48507h-0.48507v-0.48507h-0.48507v-0.48507h-0.48507v-0.48507h0.97014v0.48507h0.48507v0.48507h0.48507v0.48507h0.48507v0.48507h0.48507z"/>
+								   </g>
+								   <rect x="36.147" y="54.021" width="5.191" height="7.6902" rx="0" ry="0"/>
+								  </g>
+								 </g>
+								</svg>
+							</div>
+					</div>
+					<div class="settings-content settings-55-45">
+						<div class="set">
+							<div class="settings-label">
+								<label>Use as virtual CP/M device</label>
+							</div>
+							<div class="settings-value">
+								<div class="radio-container">
+									<input checked="" id="cpm-virt-yes" name="cpm_enabled" type="radio" value="1">
+									<label for="cpm-virt-yes" class="r-yes-no">Yes</label>
+									<input checked="" id="cpm-virt-no" name="cpm_enabled" type="radio" value="0">
+									<label for="cpm-virt-no" class="r-yes-no">No</label>
+								</div>
+							</div>
+						</div>
+						<div class="set">
+							<div class="settings-label">
+								<label>Set custom Console Command Processor</label>
+							</div>
+							<div class="settings-value">
+								<input type="text" name="cpm_ccp" id="cpm_ccp" value="<%FN_CPM_CCP%>">
+							</div>
+						</div>
+						<hr>
+						<div class="settings-text">
+							<div>
+								Custom CCP must be a valid path on the SD Card<br>
+								Example: <strong>/some/directory/custom.ccp</strong><br>
+								Set CCP to <strong>$</strong> for default built-in CCP<br>
+							</div>
+						</div>
+						<script>
+							var current_cpm_enabled = "<%FN_CPM_ENABLED%>";
+						</script>
+					</div>
+					<div class="settings-footer">
+						<div class="save-button">
+							<button type="submit" value="Save">Save</button>
+						</div>
+					</div>
+				</div>
+				</form>
+			</div>
+			{% endif %}
 		</div>
 	</div>
 	<script type="text/javascript" src="{{ paths.js_path }}/settings.js"></script>

diff --git a/data/webui/template/www/js/settings.tmpl.js b/data/webui/template/www/js/settings.tmpl.js
@@ -18,7 +18,7 @@ function selectListValue(selectName, currentValue) {
 	if (mySelect == null) return;
 
 	var opts = mySelect.options;
-	
+
 	for (var opt, j = 0; opt = opts[j]; j++) {
 		if (opt.value == currentValue) {
 			mySelect.selectedIndex = j;
@@ -95,6 +95,11 @@ setInputValue(current_encrypt_passphrase_enabled == 1, "encrypt-passphrase-yes",
 setInputValue(current_apetime == 1, "tz-apetime-yes", "tz-apetime-no");
 {% endif %}
 
+{% if components.cpm_settings %}
+setInputValue(current_cpm_enabled == 1, "cpm-virt-yes", "cpm-virt-no");
+{% endif %}
+
+
 {% if components.pclink %}
 setInputValue(current_pclink == 1, "pclink-yes", "pclink-no");
 {% endif %}